Skip to content

Commit

Permalink
Updated Copyrights / licenses / encoding, and reformatted
Browse files Browse the repository at this point in the history
Signed-off-by: mmazas <[email protected]>
  • Loading branch information
mmazas authored and mmazas committed Jul 15, 2024
1 parent 02334d3 commit bba736e
Show file tree
Hide file tree
Showing 23 changed files with 2,205 additions and 1,398 deletions.
231 changes: 136 additions & 95 deletions bugs/bug001/pom.xml
Original file line number Diff line number Diff line change
@@ -1,96 +1,137 @@
<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.generator.java</groupId>
<artifactId>bugs</artifactId>
<version>1.0.0</version>
</parent>
<groupId>org.javacc.generator.java.bugs</groupId>
<artifactId>bug001</artifactId>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>clc1.test</id>
<phase>test</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>clc.ComplexLineComment</mainClass>
<arguments>
<argument>${project.basedir}/test/clc1.in</argument>
<argument>${project.basedir}/test/clc1.out</argument>
<argument>${project.basedir}/test/clc1.err</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>clc2.test</id>
<phase>test</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>clc.ComplexLineComment</mainClass>
<arguments>
<argument>${project.basedir}/test/clc2.in</argument>
<argument>${project.basedir}/test/clc2.out</argument>
<argument>${project.basedir}/test/clc2.err</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>compare-clc1</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration><skip>false</skip>
<target unless="maven.test.skip">
<available file="${project.basedir}/test/clc1.out" property="isActualAvailable" />
<fail unless="isActualAvailable" message="${project.basedir}/test/clc1.out does not exist!" />
<available file="${project.basedir}/test/clc1.ref" property="isExpectedAvailable" />
<fail unless="isExpectedAvailable" message="${project.basedir}/test/clc1.ref does not exist!" />
<condition property="files.match">
<filesmatch file1="${project.basedir}/test/clc1.out" file2="${project.basedir}/test/clc1.ref" textfile="true" />
</condition>
<fail unless="files.match" message="${project.basedir}/test/clc1.out does not match ${project.basedir}/test/clc1.ref!" />
</target>
</configuration>
</execution>
<execution>
<id>compare-clc2</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration><skip>false</skip>
<target unless="maven.test.skip">
<available file="${project.basedir}/test/clc2.out" property="isActualAvailable" />
<fail unless="isActualAvailable" message="${project.basedir}/test/clc2.out does not exist!" />
<available file="${project.basedir}/test/clc2.ref" property="isExpectedAvailable" />
<fail unless="isExpectedAvailable" message="${project.basedir}/test/clc2.ref does not exist!" />
<condition property="files.match">
<filesmatch file1="${project.basedir}/test/clc2.out" file2="${project.basedir}/test/clc2.ref" textfile="true" />
</condition>
<fail unless="files.match" message="${project.basedir}/test/clc2.out does not match ${project.basedir}/test/clc2.ref!" />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020-2024, Sreeni Viswanadha <[email protected]>.
Copyright (c) 2024, Marc Mazas <[email protected]>.
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.generator.java</groupId>
<artifactId>bugs</artifactId>
<version>1.0.0</version>
</parent>
<groupId>org.javacc.generator.java.bugs</groupId>
<artifactId>bug001</artifactId>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>clc1.test</id>
<phase>test</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>clc.ComplexLineComment</mainClass>
<arguments>
<argument>${project.basedir}/test/clc1.in</argument>
<argument>${project.basedir}/test/clc1.out</argument>
<argument>${project.basedir}/test/clc1.err</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>clc2.test</id>
<phase>test</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>clc.ComplexLineComment</mainClass>
<arguments>
<argument>${project.basedir}/test/clc2.in</argument>
<argument>${project.basedir}/test/clc2.out</argument>
<argument>${project.basedir}/test/clc2.err</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>compare-clc1</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<skip>false</skip>
<target unless="maven.test.skip">
<available file="${project.basedir}/test/clc1.out" property="isActualAvailable" />
<fail unless="isActualAvailable"
message="${project.basedir}/test/clc1.out does not exist!" />
<available file="${project.basedir}/test/clc1.ref" property="isExpectedAvailable" />
<fail unless="isExpectedAvailable"
message="${project.basedir}/test/clc1.ref does not exist!" />
<condition property="files.match">
<filesmatch file1="${project.basedir}/test/clc1.out"
file2="${project.basedir}/test/clc1.ref" textfile="true" />
</condition>
<fail unless="files.match"
message="${project.basedir}/test/clc1.out does not match ${project.basedir}/test/clc1.ref!" />
</target>
</configuration>
</execution>
<execution>
<id>compare-clc2</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<skip>false</skip>
<target unless="maven.test.skip">
<available file="${project.basedir}/test/clc2.out" property="isActualAvailable" />
<fail unless="isActualAvailable"
message="${project.basedir}/test/clc2.out does not exist!" />
<available file="${project.basedir}/test/clc2.ref" property="isExpectedAvailable" />
<fail unless="isExpectedAvailable"
message="${project.basedir}/test/clc2.ref does not exist!" />
<condition property="files.match">
<filesmatch file1="${project.basedir}/test/clc2.out"
file2="${project.basedir}/test/clc2.ref" textfile="true" />
</condition>
<fail unless="files.match"
message="${project.basedir}/test/clc2.out does not match ${project.basedir}/test/clc2.ref!" />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
138 changes: 87 additions & 51 deletions bugs/bug002/pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,36 @@
<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">
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020-2024, Sreeni Viswanadha <[email protected]>.
Copyright (c) 2024, Marc Mazas <[email protected]>.
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.generator.java</groupId>
Expand All @@ -7,54 +39,58 @@
</parent>
<groupId>org.javacc.generator.java.bugs</groupId>
<artifactId>bug002</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>bug.rub</id>
<phase>test</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>Bug</mainClass>
<arguments>
<argument>${project.basedir}/test/bug.in</argument>
<argument>${project.basedir}/test/bug.out</argument>
<argument>${project.basedir}/test/bug.err</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>compare-out</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target unless="maven.test.skip">
<available file="${project.basedir}/test/bug.out" property="isActualAvailable" />
<fail unless="isActualAvailable" message="${project.basedir}/test/bug.out does not exist!" />
<available file="${project.basedir}/test/bug.ref" property="isExpectedAvailable" />
<fail unless="isExpectedAvailable" message="${project.basedir}/test/bug.ref does not exist!" />
<condition property="files.match">
<filesmatch file1="${project.basedir}/test/bug.out" file2="${project.basedir}/test/bug.ref" textfile="true" />
</condition>
<fail unless="files.match" message="${project.basedir}/test/bug.out does not match ${project.basedir}/test/bug.ref!" />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>bug.rub</id>
<phase>test</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>Bug</mainClass>
<arguments>
<argument>${project.basedir}/test/bug.in</argument>
<argument>${project.basedir}/test/bug.out</argument>
<argument>${project.basedir}/test/bug.err</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>compare-out</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target unless="maven.test.skip">
<available file="${project.basedir}/test/bug.out" property="isActualAvailable" />
<fail unless="isActualAvailable"
message="${project.basedir}/test/bug.out does not exist!" />
<available file="${project.basedir}/test/bug.ref" property="isExpectedAvailable" />
<fail unless="isExpectedAvailable"
message="${project.basedir}/test/bug.ref does not exist!" />
<condition property="files.match">
<filesmatch file1="${project.basedir}/test/bug.out"
file2="${project.basedir}/test/bug.ref" textfile="true" />
</condition>
<fail unless="files.match"
message="${project.basedir}/test/bug.out does not match ${project.basedir}/test/bug.ref!" />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit bba736e

Please sign in to comment.