Skip to content

Commit

Permalink
Poms' cleansing (common / standard structure, artifacts & versions
Browse files Browse the repository at this point in the history
updates, special profiles for c++ & c#, integration tests successful on
bugs/examples/grammars)

Signed-off-by: mmazas <mmazas@ITEM-S104678.emea.msad.sopra>
  • Loading branch information
mmazas authored and mmazas committed Jul 19, 2024
1 parent ec22bfc commit b937c6f
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 49 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/GUIParsing/TokenMgrVersion/CalcInput.jj
Original file line number Diff line number Diff line change
Expand Up @@ -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).
*/
<OP_OR_OPERAND, OPERAND, OPTIONAL_DIGIT, OP_LOOP> SKIP:
Expand Down
29 changes: 1 addition & 28 deletions examples/JJTreeExamples/java/ASTMyID.java
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion javacc-7/examples/GUIParsing/TokenMgrVersion/CalcInput.jj
Original file line number Diff line number Diff line change
Expand Up @@ -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).
*/
<OP_OR_OPERAND, OPERAND, OPTIONAL_DIGIT, OP_LOOP> SKIP:
Expand Down
15 changes: 7 additions & 8 deletions javacc-7/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,12 @@ THE POSSIBILITY OF SUCH DAMAGE.
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
<plugin>
--> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.1.0</version>
Expand Down Expand Up @@ -286,7 +286,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<forkMode>once</forkMode>
<includes>
<include>**/*Test.java</include>
</includes>
Expand Down Expand Up @@ -647,7 +646,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
</plugin>
<plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<executions>
Expand All @@ -658,7 +657,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
</plugin>
<plugin>
--> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -687,7 +686,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<minmemory>128m</minmemory>
<maxmemory>512m</maxmemory>
<level>protected</level>
<doclint>none</doclint>
<doclint>${javadoc.doclint}</doclint>
<quiet>true</quiet>
</configuration>
</plugin>
Expand Down Expand Up @@ -778,11 +777,11 @@ THE POSSIBILITY OF SUCH DAMAGE.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
<plugin>
--> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
Expand Down
22 changes: 16 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,34 @@ THE POSSIBILITY OF SUCH DAMAGE.
<parent>
<groupId>org</groupId>
<artifactId>javacc</artifactId>
<version>8.0.6</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<groupId>org.javacc</groupId>
<artifactId>core</artifactId>
<!-- <version>8.1.0-SNAPSHOT</version>-->
<packaging>jar</packaging>
<version>8.0.3-SNAPSHOT</version>

<name>JavaCC 8 Core</name>
<name>JavaCC Core</name>
<description>Core module of JavaCC</description>
<url>https://github.com/javacc/javacc-8-core</url>
<inceptionYear>1996</inceptionYear>

<organization>
<name>javacc.org</name>
<url>https://javacc.github.io/javacc/</url>
</organization>

<scm>
<url>https://github.com/javacc/javacc-8-core</url>
<connection>scm:git:https://github.com/javacc/javacc-8-core.git</connection>
<developerConnection>scm:git:ssh://git@github.com/javacc/javacc-8-core.git</developerConnection>
<tag>HEAD</tag>
</scm>
<properties>
<root>${basedir}/..</root>
</properties>

<!-- <properties>-->
<!-- <root>${basedir}/..</root>-->
<!-- </properties>-->

<dependencies>
<dependency>
Expand Down

0 comments on commit b937c6f

Please sign in to comment.