From b937c6ff965a4887a96cad85d36e21048785b4ea Mon Sep 17 00:00:00 2001 From: mmazas Date: Fri, 19 Jul 2024 18:29:59 +0200 Subject: [PATCH] Poms' cleansing (common / standard structure, artifacts & versions updates, special profiles for c++ & c#, integration tests successful on bugs/examples/grammars) Signed-off-by: mmazas --- .github/workflows/maven.yml | 17 +++++++---- .../GUIParsing/TokenMgrVersion/CalcInput.jj | 2 +- examples/JJTreeExamples/java/ASTMyID.java | 29 +------------------ .../GUIParsing/TokenMgrVersion/CalcInput.jj | 2 +- javacc-7/pom.xml | 15 +++++----- pom.xml | 22 ++++++++++---- 6 files changed, 38 insertions(+), 49 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cfe3e128..1147e0b5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -47,17 +47,24 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' cache: 'maven' - - name: Build package on javacc-8-core - run: mvn -B -e package + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + +# - name: Build package on javacc-8-core +# run: mvn -B -e package - - name: Run install on javacc-8-java + - name: Run install on javacc-8-core run: mvn -B -e install diff --git a/examples/GUIParsing/TokenMgrVersion/CalcInput.jj b/examples/GUIParsing/TokenMgrVersion/CalcInput.jj index 1ea74486..88227bd1 100644 --- a/examples/GUIParsing/TokenMgrVersion/CalcInput.jj +++ b/examples/GUIParsing/TokenMgrVersion/CalcInput.jj @@ -109,7 +109,7 @@ TOKEN_MGR_DECLS: /** * You can get an operator at any time (in any lexical state), except when - * a digit is required (afdter a .). Then just go to a state where the next + * a digit is required (after a .). Then just go to a state where the next * operand is scanned (for that particular operator). */ SKIP: diff --git a/examples/JJTreeExamples/java/ASTMyID.java b/examples/JJTreeExamples/java/ASTMyID.java index 5c2d3992..70538b29 100644 --- a/examples/JJTreeExamples/java/ASTMyID.java +++ b/examples/JJTreeExamples/java/ASTMyID.java @@ -1,31 +1,4 @@ -/* Copyright (c) 2006, Sun Microsystems, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Sun Microsystems, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - +package c_jjtree_examples.java.eg3; /** * An ID. diff --git a/javacc-7/examples/GUIParsing/TokenMgrVersion/CalcInput.jj b/javacc-7/examples/GUIParsing/TokenMgrVersion/CalcInput.jj index 1ea74486..88227bd1 100644 --- a/javacc-7/examples/GUIParsing/TokenMgrVersion/CalcInput.jj +++ b/javacc-7/examples/GUIParsing/TokenMgrVersion/CalcInput.jj @@ -109,7 +109,7 @@ TOKEN_MGR_DECLS: /** * You can get an operator at any time (in any lexical state), except when - * a digit is required (afdter a .). Then just go to a state where the next + * a digit is required (after a .). Then just go to a state where the next * operand is scanned (for that particular operator). */ SKIP: diff --git a/javacc-7/pom.xml b/javacc-7/pom.xml index 05b174fc..8128ea36 100644 --- a/javacc-7/pom.xml +++ b/javacc-7/pom.xml @@ -208,12 +208,12 @@ THE POSSIBILITY OF SUCH DAMAGE. maven-surefire-plugin 2.22.2 - + org.apache.maven.plugins maven-source-plugin 3.1.0 @@ -286,7 +286,6 @@ THE POSSIBILITY OF SUCH DAMAGE. maven-surefire-plugin true - once **/*Test.java @@ -647,7 +646,7 @@ THE POSSIBILITY OF SUCH DAMAGE. - + org.apache.maven.plugins maven-source-plugin @@ -687,7 +686,7 @@ THE POSSIBILITY OF SUCH DAMAGE. 128m 512m protected - none + ${javadoc.doclint} true @@ -778,11 +777,11 @@ THE POSSIBILITY OF SUCH DAMAGE. org.apache.maven.plugins maven-jxr-plugin - + org.apache.maven.plugins maven-surefire-report-plugin diff --git a/pom.xml b/pom.xml index bae8cfea..6c3a503e 100644 --- a/pom.xml +++ b/pom.xml @@ -36,14 +36,23 @@ THE POSSIBILITY OF SUCH DAMAGE. org javacc - 8.0.6 + 8.1.0-SNAPSHOT + org.javacc core + jar - 8.0.3-SNAPSHOT - JavaCC 8 Core + JavaCC Core + Core module of JavaCC + https://github.com/javacc/javacc-8-core + 1996 + + + javacc.org + https://javacc.github.io/javacc/ + https://github.com/javacc/javacc-8-core @@ -51,9 +60,10 @@ THE POSSIBILITY OF SUCH DAMAGE. scm:git:ssh://git@github.com/javacc/javacc-8-core.git HEAD - - ${basedir}/.. - + + + +