Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JavaCC: add new CODE_GENERATOR option for the next new design of JavaCC as per version 8.0 #4

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open

JavaCC: add new CODE_GENERATOR option for the next new design of JavaCC as per version 8.0 #4

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
e63afd4
Add new JavaCC 8.0 option: CODE_GENERATOR=<Java|C++|C#>
zosrothko Oct 13, 2019
370b777
Change the JavaCC website reference
zosrothko Oct 13, 2019
7780a6e
Make scope of JavaCC & JTB as provided so that the user of the
zosrothko Oct 13, 2019
b6c899b
New parent pom for all integration tests pom that fixes the
zosrothko Oct 13, 2019
e2f6cde
Add org.codehaus.mojo.javacc:it:1.0-SNAPSHOT as parent pom for getting
zosrothko Oct 13, 2019
3e4e499
Ignore Eclipse files
zosrothko Oct 13, 2019
6d6510e
Unset default value "Java"
zosrothko Oct 22, 2019
51f782e
Use Suffix enum
zosrothko Oct 22, 2019
1c12aee
Log the generated arguments of the JavaCC command.
zosrothko Oct 22, 2019
dacdf03
New Suffix enume that gives the file suffix of the generated parser
zosrothko Oct 22, 2019
c6ebaec
Switch to 3.0.0-SNAPSHOT, refactor versions, add codertura:2.1.1
zosrothko Oct 22, 2019
acbab4e
Use StringUtils
zosrothko Oct 22, 2019
bca2613
Update cobertura to avoid CNFE
zosrothko Oct 22, 2019
3be8e03
Use @sitePluginVersion@ as maven-site-plugin version
zosrothko Oct 22, 2019
9b97e7b
Add CODE_GENERATOR option for JavaCC 8.0 upcoming version
zosrothko Oct 26, 2019
24313f7
Use maven-javadoc-plugin with <doclint>none</doclint> to avoid warning
zosrothko Oct 26, 2019
38e4df9
Add NODE_DIRECTORY
zosrothko Dec 31, 2019
4b5c201
Upgrade maven plugins version
zosrothko Dec 31, 2019
3d5ce7a
Removed
zosrothko Dec 31, 2019
f06db23
Revert "Removed"
zosrothko Jan 4, 2020
a6cb4ac
Avoid failing the build if it fail until a solution is found
zosrothko Jan 6, 2020
b5d2c98
Rename org.codehaus.mojo to org.javacc.plugin
zosrothko Feb 11, 2020
fe0a100
Update References items. Remove <menu><item name="Changes"
zosrothko Feb 11, 2020
159b149
Reemove cobertura dependency
zosrothko Feb 11, 2020
871d03c
Change <scm>. Change <issueManagement>. Exclude <com.sun:tools:jar:0>
zosrothko Feb 11, 2020
8b88fbf
Fix <distributionManagement>
zosrothko Feb 11, 2020
c9f4133
Remove <build> & deploy replacement
zosrothko Feb 11, 2020
fe324d2
ADd <doclint>none</doclint> when using JDK 1.8
zosrothko Feb 11, 2020
dff9da4
Add profile doclint-java8-disable
zosrothko Feb 11, 2020
25da689
Restore it/**/pom.xml
zosrothko Feb 11, 2020
9809a73
Fix failed merges
zosrothko Feb 12, 2020
3cba5e1
Use a parent pom to fix the javacc & jtb artifact
zosrothko Feb 17, 2020
3298d73
Removed
zosrothko Feb 17, 2020
bec1004
it tests parent pom
zosrothko Feb 17, 2020
9fba8cf
Fix cobertura & small reformat
zosrothko Feb 17, 2020
0c12aae
Fix cobertura CNFE
zosrothko Feb 18, 2020
04f3a64
Reformat
zosrothko Feb 18, 2020
3d59bd0
Switch to org.javacc.plugin
zosrothko Feb 18, 2020
ce0bb6c
[maven-release-plugin] prepare release javacc-maven-plugin-3.0.0
zosrothko Feb 18, 2020
980807f
rollback to 3.0.0-SNAPSHOT
zosrothko Feb 18, 2020
f18ac8b
Restore <developerConnection>
zosrothko Feb 18, 2020
bef2b9e
Fix deploy target
zosrothko Feb 18, 2020
7506ed1
Use javacc 7.0.5
zosrothko Feb 20, 2020
c509f26
Define <javacc> as the used version
zosrothko Feb 20, 2020
bbc56e6
Fix typo
zosrothko Feb 20, 2020
e71840e
[maven-release-plugin] prepare release javacc-maven-plugin-3.0.0
zosrothko Mar 5, 2020
f56f026
[maven-release-plugin] rollback the release of javacc-maven-plugin-3.0.0
zosrothko Mar 5, 2020
3f53cbc
[maven-release-plugin] prepare release javacc-maven-plugin-3.0.0
zosrothko Mar 5, 2020
c19d240
[maven-release-plugin] rollback the release of javacc-maven-plugin-3.0.0
zosrothko Mar 5, 2020
a472701
use git//github.com/javacc/javacc-maven-plugin.git
zosrothko Mar 5, 2020
4871947
[maven-release-plugin] rollback the release of javacc-maven-plugin-3.0.0
zosrothko Mar 5, 2020
9f5b8c9
Rollback from failed release:prepare
zosrothko Mar 5, 2020
220d38d
Rollback from failed release:prepare
zosrothko Mar 5, 2020
61e61d8
[maven-release-plugin] prepare release javacc-maven-plugin-3.0.0
zosrothko Mar 5, 2020
e0ecdcc
maven:prepare
zosrothko Mar 5, 2020
0c0dd66
Merge branch 'master' of
zosrothko Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
target/

# Eclipse generated files
bin/
.settings/
.classpath
.project
339 changes: 170 additions & 169 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,169 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<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>
<artifactId>mojo-parent</artifactId>
<groupId>org.codehaus.mojo</groupId>
<version>50</version>
</parent>

<artifactId>javacc-maven-plugin</artifactId>
<version>2.7-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>JavaCC Maven Plugin</name>
<description>Maven 2 Plugin for processing JavaCC grammar files.</description>
<url>http://mojo.codehaus.org/javacc-maven-plugin/</url>
<inceptionYear>2005</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<prerequisites>
<maven>2.0.6</maven>
</prerequisites>

<scm>
<connection>scm:git:https://github.com/mojohaus/javacc-maven-plugin.git</connection>
<developerConnection>scm:git:ssh://[email protected]/mojohaus/javacc-maven-plugin.git</developerConnection>
<url>https://github.com/mojohaus/javacc-maven-plugin</url>
</scm>
<issueManagement>
<system>JIRA</system>
<url>http://jira.codehaus.org/browse/MJAVACC</url>
</issueManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
<version>5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.5.6</version>
</dependency>
<dependency>
<groupId>edu.ucla.cs.compilers</groupId>
<artifactId>jtb</artifactId>
<version>1.3.2</version>
<!--
NOTE: Only reflectively accessed to avoid dependency on Java 1.5 for compilation.
-->
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.0-alpha-9</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>1.0-alpha-7</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>run-its</id>
<activation>
<property>
<name>maven.test.skip</name>
<value>!true</value>
</property>
</activation>
<properties>
<sitePluginVersion>3.3</sitePluginVersion>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<settingsFile>src/it/settings.xml</settingsFile>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<debug>true</debug>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<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>
<artifactId>mojo-parent</artifactId>
<groupId>org.codehaus.mojo</groupId>
<version>50</version>
</parent>

<artifactId>javacc-maven-plugin</artifactId>
<version>2.7-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>JavaCC Maven Plugin</name>
<description>Maven 2 Plugin for processing JavaCC grammar files.</description>
<url>http://mojo.codehaus.org/javacc-maven-plugin/</url>
<inceptionYear>2005</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<prerequisites>
<maven>2.0.6</maven>
</prerequisites>

<scm>
<connection>scm:git:https://github.com/mojohaus/javacc-maven-plugin.git</connection>
<developerConnection>scm:git:ssh://[email protected]/mojohaus/javacc-maven-plugin.git</developerConnection>
<url>https://github.com/mojohaus/javacc-maven-plugin</url>
</scm>
<issueManagement>
<system>JIRA</system>
<url>http://jira.codehaus.org/browse/MJAVACC</url>
</issueManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
<version>5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.5.6</version>
</dependency>
<dependency>
<groupId>edu.ucla.cs.compilers</groupId>
<artifactId>jtb</artifactId>
<version>1.3.2</version>
<!--
NOTE: Only reflectively accessed to avoid dependency on Java 1.5 for compilation.
-->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.0-alpha-9</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>1.0-alpha-7</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>run-its</id>
<activation>
<property>
<name>maven.test.skip</name>
<value>!true</value>
</property>
</activation>
<properties>
<sitePluginVersion>3.3</sitePluginVersion>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<settingsFile>src/it/settings.xml</settingsFile>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<debug>true</debug>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
14 changes: 12 additions & 2 deletions src/it/explicit-parameter-values/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.codehaus.mojo.javacc</groupId>
<parent>
<groupId>org.codehaus.mojo.javacc</groupId>
<artifactId>it</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>it-test</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Integration Test</name>
<url>http://maven.apache.org</url>
<description>
Expand All @@ -19,6 +22,13 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>@pom.version@</version>
<dependencies>
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
<version>5.0</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>javacc</id>
Expand Down
5 changes: 5 additions & 0 deletions src/it/javacc-absent-source-directory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.codehaus.mojo.javacc</groupId>
<artifactId>it</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.codehaus.mojo.javacc</groupId>
<artifactId>it-test</artifactId>
<version>1.0-SNAPSHOT</version>
Expand Down
Loading