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 760dfeb commit c64f497
Show file tree
Hide file tree
Showing 38 changed files with 950 additions and 868 deletions.
10 changes: 9 additions & 1 deletion bugs/bug001/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,22 @@ THE POSSIBILITY OF SUCH DAMAGE.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.javacc.generator.java</groupId>
<artifactId>bugs</artifactId>
<version>1.0.0</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.javacc.generator.java.bugs</groupId>
<artifactId>bug001</artifactId>
<packaging>jar</packaging>

<name>JavaCC Java code generator / bug001</name>

<build>
<plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down Expand Up @@ -78,6 +84,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -132,6 +139,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
11 changes: 10 additions & 1 deletion bugs/bug002/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,22 @@ THE POSSIBILITY OF SUCH DAMAGE.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.javacc.generator.java</groupId>
<artifactId>bugs</artifactId>
<version>1.0.0</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.javacc.generator.java.bugs</groupId>
<artifactId>bug002</artifactId>
<packaging>jar</packaging>

<name>JavaCC Java code generator / bug002</name>

<build>
<plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand All @@ -62,6 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -91,6 +99,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
3 changes: 2 additions & 1 deletion bugs/invoker.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# A comma or space separated list of goals/phases to execute, may
# specify an empty list to execute the default goal of the IT project.
# Environment variables used by maven plugins can be added here
invoker.goals = clean verify
invoker.goals = clean verify
#invoker.debug = true
11 changes: 6 additions & 5 deletions bugs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,19 @@ THE POSSIBILITY OF SUCH DAMAGE.

<parent>
<groupId>org.javacc.generator.java</groupId>
<version>1.0.0</version>
<relativePath>../it</relativePath>
<artifactId>it</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../it</relativePath>
</parent>

<name>JavaCC Java examples</name>
<description>JavaCC Java examples</description>
<groupId>org.javacc.generator.java</groupId>
<artifactId>bugs</artifactId>
<packaging>pom</packaging>

<name>JavaCC Java code generator / bugs</name>

<modules>
<module>bug001</module>
<module>bug002</module>
</modules>

</project>
39 changes: 0 additions & 39 deletions examples/1.html

This file was deleted.

20 changes: 0 additions & 20 deletions examples/2.html

This file was deleted.

22 changes: 0 additions & 22 deletions examples/3.html

This file was deleted.

10 changes: 8 additions & 2 deletions examples/CORBA-IDL/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,22 @@ THE POSSIBILITY OF SUCH DAMAGE.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.javacc.generator.java</groupId>
<artifactId>examples</artifactId>
<version>1.0.0</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<name>JavaCC examples Java CORBA-IDL</name>

<groupId>org.javacc.generator.java.examples</groupId>
<artifactId>corba-idl</artifactId>
<packaging>jar</packaging>

<name>JavaCC Java code generator / examples / CORBA-IDL</name>

<build>
<plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand All @@ -61,6 +66,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</arguments>
</configuration>
</plugin>

</plugins>
</build>
</project>
48 changes: 48 additions & 0 deletions examples/GUIParsing/ParserVersion/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020-2024, Sreeni Viswanadha <sreeni@viswanadha.net>.
Copyright (c) 2024, Marc Mazas <mazas.marc@gmail.com>.
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 names of of the copyright holders 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.javacc.examples.java</groupId>
<artifactId>GUIParsing</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.javacc.examples.java.guiparsing</groupId>
<artifactId>ParserVersion</artifactId>
<packaging>jar</packaging>

<name>JavaCC C# code generator / examples / GUIParsing / ParserVersion</name>

</project>
49 changes: 0 additions & 49 deletions examples/GUIParsing/ParserVersion/pom.xmlmx

This file was deleted.

48 changes: 48 additions & 0 deletions examples/GUIParsing/TokenMgrVersion/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020-2024, Sreeni Viswanadha <sreeni@viswanadha.net>.
Copyright (c) 2024, Marc Mazas <mazas.marc@gmail.com>.
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 names of of the copyright holders 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.javacc.examples.java</groupId>
<artifactId>GUIParsing</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.javacc.examples.java.guiparsing</groupId>
<artifactId>TokenMgrVersion</artifactId>
<packaging>jar</packaging>

<name>JavaCC C# code generator / examples / GUIParsing / TokenMgrVersion</name>

</project>
Loading

0 comments on commit c64f497

Please sign in to comment.