Repository: tinkerpop Updated Branches: refs/heads/tp32 e6ddba1f7 -> 9af4cce35
Clean up the poms a bit Bumped some versions of maven plugins. Added maven prerequisite to enforce the maven version. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9af4cce3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9af4cce3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9af4cce3 Branch: refs/heads/tp32 Commit: 9af4cce35c6784e5bd71ef5125448b3e5f450f52 Parents: e6ddba1 Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Jun 19 09:10:03 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Jun 19 09:10:03 2017 -0400 ---------------------------------------------------------------------- giraph-gremlin/pom.xml | 3 +- gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +- .../gremlin-archetype-server/pom.xml | 2 +- .../gremlin-archetype-tinkergraph/pom.xml | 2 +- gremlin-archetype/pom.xml | 3 +- gremlin-benchmark/pom.xml | 1 - gremlin-console/pom.xml | 2 +- gremlin-driver/pom.xml | 2 +- gremlin-server/pom.xml | 2 +- gremlin-shaded/pom.xml | 1 - hadoop-gremlin/pom.xml | 3 +- neo4j-gremlin/pom.xml | 1 - pom.xml | 45 ++++++++++++++------ spark-gremlin/pom.xml | 3 +- tinkergraph-gremlin/pom.xml | 1 - 15 files changed, 43 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/giraph-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml index 55404ff..19f1caf 100644 --- a/giraph-gremlin/pom.xml +++ b/giraph-gremlin/pom.xml @@ -196,8 +196,8 @@ limitations under the License. </testResources> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> <executions> <execution> <id>build-detached-assemblies</id> @@ -231,7 +231,6 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> <configuration> <archive> <manifestEntries> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/gremlin-archetype-dsl/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml index 55e3efd..7224a09 100644 --- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml +++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml @@ -31,8 +31,8 @@ limitations under the License. <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-archetype-plugin</artifactId> - <version>2.4</version> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/gremlin-archetype-server/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml index 998f1b6..faadc86 100644 --- a/gremlin-archetype/gremlin-archetype-server/pom.xml +++ b/gremlin-archetype/gremlin-archetype-server/pom.xml @@ -31,8 +31,8 @@ limitations under the License. <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-archetype-plugin</artifactId> - <version>2.4</version> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml index 37813db..5b59efe 100644 --- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml +++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml @@ -31,8 +31,8 @@ limitations under the License. <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-archetype-plugin</artifactId> - <version>2.4</version> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml index a99f4c8..944ec00 100644 --- a/gremlin-archetype/pom.xml +++ b/gremlin-archetype/pom.xml @@ -37,8 +37,9 @@ limitations under the License. <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-archetype-plugin</artifactId> - <version>2.4</version> + <version>3.0.1</version> <executions> <execution> <phase>integration-test</phase> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-benchmark/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml index aee2a09..a2d411a 100644 --- a/gremlin-benchmark/pom.xml +++ b/gremlin-benchmark/pom.xml @@ -105,7 +105,6 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.2</version> <executions> <execution> <phase>package</phase> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-console/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml index aee35bb..31a9281 100644 --- a/gremlin-console/pom.xml +++ b/gremlin-console/pom.xml @@ -173,8 +173,8 @@ limitations under the License. <artifactId>maven-failsafe-plugin</artifactId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> <executions> <execution> <phase>package</phase> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-driver/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml index 0b69bce..0450fcc 100644 --- a/gremlin-driver/pom.xml +++ b/gremlin-driver/pom.xml @@ -110,8 +110,8 @@ limitations under the License. </testResources> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> <executions> <execution> <phase>package</phase> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-server/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml index 18f2740..aafac6c 100644 --- a/gremlin-server/pom.xml +++ b/gremlin-server/pom.xml @@ -124,8 +124,8 @@ limitations under the License. </testResources> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> <executions> <execution> <phase>package</phase> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/gremlin-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml index edb5deb..0323992 100644 --- a/gremlin-shaded/pom.xml +++ b/gremlin-shaded/pom.xml @@ -60,7 +60,6 @@ limitations under the License. <plugins> <plugin> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> <executions> <execution> <id>shade-kryo</id> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/hadoop-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml index ec0e780..0e00751 100644 --- a/hadoop-gremlin/pom.xml +++ b/hadoop-gremlin/pom.xml @@ -172,7 +172,6 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> <configuration> <archive> <manifestEntries> @@ -191,8 +190,8 @@ limitations under the License. </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> <executions> <execution> <id>build-detached-assemblies</id> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/neo4j-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml index 8369695..f7a6981 100644 --- a/neo4j-gremlin/pom.xml +++ b/neo4j-gremlin/pom.xml @@ -97,7 +97,6 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> <configuration> <archive> <manifestEntries> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 22e0c9c..7b9c57a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>16</version> + <version>18</version> </parent> <groupId>org.apache.tinkerpop</groupId> <artifactId>tinkerpop</artifactId> @@ -109,6 +109,9 @@ limitations under the License. <url>https://github.com/twilmes</url> </contributor> </contributors> + <prerequisites> + <maven>3.0.5</maven> + </prerequisites> <modules> <module>gremlin-shaded</module> <module>gremlin-core</module> @@ -139,7 +142,7 @@ limitations under the License. <groovy.version>2.4.11</groovy.version> <hadoop.version>2.7.2</hadoop.version> <java.tuples.version>1.2</java.tuples.version> - <javadoc-plugin.version>2.10.1</javadoc-plugin.version> + <javadoc-plugin.version>2.10.4</javadoc-plugin.version> <jcabi.version>1.1</jcabi.version> <metrics.version>3.0.2</metrics.version> <netty.version>4.0.42.Final</netty.version> @@ -170,7 +173,7 @@ limitations under the License. </plugin> <plugin> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> + <version>1.4.1</version> <executions> <execution> <id>enforce-all</id> @@ -191,7 +194,7 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.2.1</version> + <version>3.0.1</version> <executions> <execution> <id>attach-sources</id> @@ -242,7 +245,7 @@ limitations under the License. <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.3</version> + <version>1.4</version> <executions> <execution> <goals> @@ -254,7 +257,7 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> + <version>3.0.2</version> <configuration> <archive> <manifestEntries> @@ -267,7 +270,7 @@ limitations under the License. <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.11</version> + <version>0.12</version> <executions> <execution> <id>rat-checks</id> @@ -345,12 +348,12 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> + <version>2.8.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> + <version>2.20</version> <configuration> <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true @@ -364,7 +367,7 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.17</version> + <version>2.20</version> <executions> <execution> <id>integration-test</id> @@ -431,16 +434,16 @@ limitations under the License. <plugin> <groupId>org.asciidoctor</groupId> <artifactId>asciidoctor-maven-plugin</artifactId> - <version>0.1.4</version> + <version>1.5.5</version> </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> + <version>3.0.2</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> + <version>1.0.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -470,6 +473,21 @@ limitations under the License. <invokeDynamic>true</invokeDynamic> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>3.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + </plugin> </plugins> </pluginManagement> </build> @@ -1311,6 +1329,7 @@ limitations under the License. <plugin> <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <version>1.6.0</version> <inherited>false</inherited> <executions> <execution> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/spark-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml index 6961ba6..05e0b2e 100644 --- a/spark-gremlin/pom.xml +++ b/spark-gremlin/pom.xml @@ -330,8 +330,8 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> <executions> <execution> <id>build-detached-assemblies</id> @@ -365,7 +365,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> <configuration> <archive> <manifestEntries> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9af4cce3/tinkergraph-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml index 4262ff8..a353811 100644 --- a/tinkergraph-gremlin/pom.xml +++ b/tinkergraph-gremlin/pom.xml @@ -89,7 +89,6 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> <configuration> <includes> <include>**/IoDataGenerationTest.java</include>
