From 8beec1828377a6c2d2b05445ca9b7c83fcc79a55 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 19 Apr 2015 13:24:07 -0400 Subject: [PATCH] Add Maven build Account for the following: - deploying snapshots to OSSRH - releasing to Maven Central - Shaded JAR including the treelayout dependency - OSGi manifest - remove Eclipse IDE metadata for clean import - remove IDEA IDE metadata for clean import --- .idea/artifacts/antlr4_jar.xml | 13 - .idea/codeStyleSettings.xml | 14 - .idea/compiler.xml | 23 - .idea/copyright/profiles_settings.xml | 3 - .idea/description.html | 1 - .idea/encodings.xml | 5 - .idea/misc.xml | 13 - .idea/modules.xml | 9 - .idea/project-template.xml | 3 - .idea/scopes/scope_settings.xml | 5 - .idea/uiDesigner.xml | 125 ----- .idea/vcs.xml | 7 - antlr4-maven-plugin/.classpath | 31 -- antlr4-maven-plugin/.project | 23 - .../org.eclipse.core.resources.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - antlr4-maven-plugin/pom.xml | 479 ++++++------------ .../org/antlr/mojo/antlr4/Antlr4ErrorLog.java | 1 - .../org/antlr/mojo/antlr4/Antlr4Mojo.java | 1 - antlr4-testgen-maven-plugin/pom.xml | 8 +- pom.xml | 121 +++++ runtime-testsuite/pom.xml | 78 ++- runtime/Java/pom.xml | 186 ++++--- tool/pom.xml | 205 +++----- 25 files changed, 458 insertions(+), 909 deletions(-) delete mode 100644 .idea/artifacts/antlr4_jar.xml delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/description.html delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/project-template.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml delete mode 100644 antlr4-maven-plugin/.classpath delete mode 100644 antlr4-maven-plugin/.project delete mode 100644 antlr4-maven-plugin/.settings/org.eclipse.core.resources.prefs delete mode 100644 antlr4-maven-plugin/.settings/org.eclipse.jdt.core.prefs delete mode 100644 antlr4-maven-plugin/.settings/org.eclipse.m2e.core.prefs create mode 100644 pom.xml diff --git a/.idea/artifacts/antlr4_jar.xml b/.idea/artifacts/antlr4_jar.xml deleted file mode 100644 index 3c19976e3..000000000 --- a/.idea/artifacts/antlr4_jar.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - /usr/local/lib - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index cab819f1e..000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af471a..000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf337..000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/description.html b/.idea/description.html deleted file mode 100644 index db5f12955..000000000 --- a/.idea/description.html +++ /dev/null @@ -1 +0,0 @@ -Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70d8..000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0412a13af..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 9773d8d54..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/project-template.xml b/.idea/project-template.xml deleted file mode 100644 index 1f08b8879..000000000 --- a/.idea/project-template.xml +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b84..000000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 3b0002030..000000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 275077f82..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/antlr4-maven-plugin/.classpath b/antlr4-maven-plugin/.classpath deleted file mode 100644 index d34255534..000000000 --- a/antlr4-maven-plugin/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/antlr4-maven-plugin/.project b/antlr4-maven-plugin/.project deleted file mode 100644 index 1aedcc067..000000000 --- a/antlr4-maven-plugin/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - antlr4-maven-plugin - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/antlr4-maven-plugin/.settings/org.eclipse.core.resources.prefs b/antlr4-maven-plugin/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index d4a56c43b..000000000 --- a/antlr4-maven-plugin/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 -encoding/resources=UTF-8 diff --git a/antlr4-maven-plugin/.settings/org.eclipse.jdt.core.prefs b/antlr4-maven-plugin/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b9..000000000 --- a/antlr4-maven-plugin/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/antlr4-maven-plugin/.settings/org.eclipse.m2e.core.prefs b/antlr4-maven-plugin/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/antlr4-maven-plugin/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/antlr4-maven-plugin/pom.xml b/antlr4-maven-plugin/pom.xml index 27afb667e..43d3e4b64 100644 --- a/antlr4-maven-plugin/pom.xml +++ b/antlr4-maven-plugin/pom.xml @@ -1,348 +1,151 @@ - - - + + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + + org.antlr + antlr4-master + 4.5.1-SNAPSHOT + + antlr4-maven-plugin + maven-plugin + ANTLR 4 Maven plugin + Maven plugin for ANTLR 4 grammars - 4.0.0 + + 3.0 + - org.antlr - antlr4-maven-plugin - 4.5 - maven-plugin + + 2009 - ANTLR 4 Maven plugin - Maven plugin for ANTLR 4 grammars - http://www.antlr.org + - - ANTLR - http://www.antlr.org - + + - - - The BSD License - http://www.antlr.org/license.html - repo - - + + + org.apache.maven + maven-plugin-api + 3.0.5 + compile + + + org.apache.maven + maven-project + 2.2.1 + + + org.codehaus.plexus + plexus-compiler-api + 2.2 + + + org.sonatype.plexus + plexus-build-api + 0.0.7 + + + + org.antlr + antlr4 + 4.6-SNAPSHOT + + + + junit + junit + 4.11 + test + + + org.apache.maven.shared + maven-plugin-testing-harness + 1.1 + test + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.2 + provided + + - - - Terence Parr - http://parrt.cs.usfca.edu - - Project lead - - + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.3 + + + true + + + + mojo-descriptor + + descriptor + + + + help-goal + + helpmojo + + + + + + - - Sam Harwell - http://tunnelvisionlabs.com - - Developer - Coauthor of tool, C# target - - - - - Eric Vergnaud - - Developer - JavaScript, C#, Python 2, Python 3 - - - - - Jim Idle - jimi@idle.ws - http://www.linkedin.com/in/jimidle - - Developer - Maven Plugin - - - - - - - antlr-discussion - https://groups.google.com/forum/?fromgroups#!forum/antlr-discussion - - - - - GitHub Issues - https://github.com/antlr/antlr4/issues - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - https://github.com/antlr/antlr4/tree/master - scm:git:git://github.com/antlr/antlr4.git - scm:git:git@github.com:antlr/antlr4.git - HEAD - - - - 3.0 - - - - 2009 - - - - - - - - - org.apache.maven - maven-plugin-api - 3.0.5 - compile - - - - org.apache.maven - maven-project - 2.2.1 - - - - org.codehaus.plexus - plexus-compiler-api - 2.2 - - - - org.sonatype.plexus - plexus-build-api - 0.0.7 - - - - - org.antlr - antlr4 - ${project.version} - - - - - - junit - junit - 4.11 - test - - - - - org.apache.maven.shared - maven-plugin-testing-harness - 1.1 - test - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.2 - provided - - - - - - - install - - - resources - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.3 - - - true - - - - mojo-descriptor - - descriptor - - - - help-goal - - helpmojo - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - true - true - 1.6 - 1.6 - - -Xlint - -Xlint:-serial - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - - org.apache.maven.plugins - maven-source-plugin - - 2.2.1 - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 2.9.1 - - true - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - ${gpg.keyname} - ${gpg.keyname} - - - - - - org.apache.maven.plugins - maven-release-plugin - - 2.4.2 - - -Psonatype-oss-release ${release.arguments} - - - - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.3 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - true - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.3 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + true + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java index 1d9c68799..b2518786e 100644 --- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java +++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java @@ -29,7 +29,6 @@ package org.antlr.mojo.antlr4; import org.antlr.v4.Tool; -import org.antlr.v4.runtime.misc.NotNull; import org.antlr.v4.tool.ANTLRMessage; import org.antlr.v4.tool.ANTLRToolListener; import org.apache.maven.plugin.logging.Log; diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java index 4255e13a8..e7eb2d87d 100644 --- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java +++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java @@ -32,7 +32,6 @@ package org.antlr.mojo.antlr4; import org.antlr.v4.Tool; import org.antlr.v4.codegen.CodeGenerator; import org.antlr.v4.runtime.misc.MultiMap; -import org.antlr.v4.runtime.misc.NotNull; import org.antlr.v4.runtime.misc.Utils; import org.antlr.v4.tool.Grammar; import org.apache.maven.plugin.AbstractMojo; diff --git a/antlr4-testgen-maven-plugin/pom.xml b/antlr4-testgen-maven-plugin/pom.xml index 2aa7308c7..993f3bbb4 100644 --- a/antlr4-testgen-maven-plugin/pom.xml +++ b/antlr4-testgen-maven-plugin/pom.xml @@ -36,9 +36,11 @@ 4.0.0 - - org.antlr - 4.5.1-SNAPSHOT + + org.antlr + antlr4-master + 4.5.1-SNAPSHOT + antlr4-testgen-maven-plugin maven-plugin diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..65f255396 --- /dev/null +++ b/pom.xml @@ -0,0 +1,121 @@ + + 4.0.0 + + org.sonatype.oss + oss-parent + 9 + + org.antlr + antlr4-master + 4.5.1-SNAPSHOT + pom + + ANTLR 4 + ANTLR 4 Master Build POM + http://www.antlr.org + 1992 + + ANTLR + http://www.antlr.org + + + + + The BSD License + http://www.antlr.org/license.html + repo + + + + + + Terence Parr + http://antlr.org/wiki/display/~admin/Home + + Project lead - ANTLR + + + + Sam Harwell + http://tunnelvisionlabs.com + + Developer + + + + Eric Vergnaud + + Developer - JavaScript, C#, Python 2, Python 3 + + + + Jim Idle + jimi@idle.ws + http://www.linkedin.com/in/jimidle + + Developer - Maven Plugin + + + + + + runtime/Java + tool + antlr4-maven-plugin + antlr4-testgen-maven-plugin + runtime-testsuite + + + + UTF-8 + UTF-8 + true + 1.6 + + + + + antlr-discussion + https://groups.google.com/forum/?fromgroups#!forum/antlr-discussion + + + + + GitHub Issues + https://github.com/antlr/antlr4/issues + + + + https://github.com/antlr/antlr4/tree/master + scm:git:git://github.com/antlr/antlr4.git + scm:git:git@github.com:antlr/antlr4.git + HEAD + + + + + + resources + + + test + + + test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + + diff --git a/runtime-testsuite/pom.xml b/runtime-testsuite/pom.xml index 7ec149914..85fde949e 100644 --- a/runtime-testsuite/pom.xml +++ b/runtime-testsuite/pom.xml @@ -1,57 +1,37 @@ - - - 4.0.0 + + 4.0.0 + org.antlr + antlr4-master 4.5.1-SNAPSHOT - runtime-testsuite - jar + + runtime-testsuite + ANTLR 4 Runtime Test Generator + A collection of tests for ANTLR 4 Runtime libraries. - ANTLR 4 Runtime Test Generator - A collection of tests for ANTLR 4 Runtime libraries. - http://www.antlr.org + + 3.0 + - - 3.0 - + 2009 - 2009 - - - UTF-8 - - - - - - org.antlr - ST4 - 4.0.8 - - - - junit - junit - 4.11 - test - - - - - - - src - install - - - resources - - - - - - - - + + + org.antlr + ST4 + 4.0.8 + + + junit + junit + 4.11 + test + + + + src + diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml index a0e8618ca..918673472 100644 --- a/runtime/Java/pom.xml +++ b/runtime/Java/pom.xml @@ -1,103 +1,91 @@ - 4.0.0 - - org.antlr - antlr4-runtime - 4.5 - jar - http://www.antlr.org - - ANTLR 4 Runtime - The ANTLR 4 Runtime - - - - BSD 3-Clause License - http://opensource.org/licenses/BSD-3-Clause - repo - - - - - - - Terence Parr - http://parrt.cs.usfca.edu - - Project lead - - - - - Sam Harwell - http://tunnelvisionlabs.com - - Developer - Coauthor of tool, C# target - - - - - Eric Vergnaud - - Developer - JavaScript, C#, Python 2, Python 3 - - - - - Jim Idle - jimi@idle.ws - http://www.linkedin.com/in/jimidle - - Developer - Maven Plugin - - - - - - - antlr-discussion - https://groups.google.com/forum/?fromgroups#!forum/antlr-discussion - - - - - GitHub Issues - https://github.com/antlr/antlr4/issues - - - - https://github.com/antlr/antlr4/tree/master - scm:git:git://github.com/antlr/antlr4.git - scm:git:git@github.com:antlr/antlr4.git - HEAD - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.abego.treelayout - org.abego.treelayout.core - 1.0.1 - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + + org.antlr + antlr4-master + 4.5.1-SNAPSHOT + ../../pom.xml + + antlr4-runtime + ANTLR 4 Runtime + The ANTLR 4 Runtime + + + org.abego.treelayout + org.abego.treelayout.core + 1.0.1 + + + + src + + + org.antlr + antlr4-maven-plugin + 4.5 + + + antlr + + src + + + antlr4 + + + + + + org.apache.felix + maven-bundle-plugin + 2.5.4 + + + bundle-manifest + process-classes + + + org.antlr.antlr4-runtime-osgi + ANTLR 4 Runtime + ANTLR + org.antlr + ${project.version} + + + + manifest + + + + + + maven-jar-plugin + 2.4 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + ${project.build.directory}/dependency-reduced-pom.xml + + + shade + + + + + + diff --git a/tool/pom.xml b/tool/pom.xml index c622c16af..00f88dccc 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -1,133 +1,78 @@ - - 4.0.0 - - org.antlr - antlr4 - 4.5 - jar - http://www.antlr.org - - ANTLR 4 Tool - The ANTLR 4 grammar compiler. - - - - BSD 3-Clause License - http://opensource.org/licenses/BSD-3-Clause - repo - - - - - - - - Terence Parr - http://parrt.cs.usfca.edu - - Project lead - - - - - Sam Harwell - http://tunnelvisionlabs.com - - Developer - Coauthor of tool, C# target - - - - - Eric Vergnaud - - Developer - JavaScript, C#, Python 2, Python 3 - - - - - Jim Idle - jimi@idle.ws - http://www.linkedin.com/in/jimidle - - Developer - Maven Plugin - - - - - - - antlr-discussion - https://groups.google.com/forum/?fromgroups#!forum/antlr-discussion - - - - - GitHub Issues - https://github.com/antlr/antlr4/issues - - - - https://github.com/antlr/antlr4/tree/master - scm:git:git://github.com/antlr/antlr4.git - scm:git:git@github.com:antlr/antlr4.git - HEAD - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - junit - junit - 4.11 - test - - - org.seleniumhq.selenium - selenium-java - 2.44.0 - test - - - org.eclipse.jetty - jetty-server - 8.1.16.v20140903 - test - - - org.antlr - antlr4-runtime - 4.5 - - - org.antlr - antlr-runtime - 3.5.2 - compile - - - org.antlr - ST4 - 4.0.8 - compile - - + + 4.0.0 + + org.antlr + antlr4-master + 4.5.1-SNAPSHOT + + antlr4 + ANTLR 4 Tool + The ANTLR 4 grammar compiler. + + + junit + junit + 4.11 + test + + + org.seleniumhq.selenium + selenium-java + 2.44.0 + test + + + org.eclipse.jetty + jetty-server + 8.1.16.v20140903 + test + + + org.antlr + antlr4-runtime + ${project.version} + + + org.antlr + antlr-runtime + 3.5.2 + compile + + + org.antlr + ST4 + 4.0.8 + compile + + + + src + test + + + test + + + + + org.antlr + antlr3-maven-plugin + 3.5.2 + + src + true + + + + + antlr + + + + + +