You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jb...@apache.org on 2017/08/01 06:30:14 UTC
[1/2] beam git commit: [BEAM-2530] Upgrade maven plugins to the
latest versions
Repository: beam
Updated Branches:
refs/heads/master 870551ccc -> 2816b15ee
[BEAM-2530] Upgrade maven plugins to the latest versions
This is part of the ongoing work to support java 9
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/42638e24
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/42638e24
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/42638e24
Branch: refs/heads/master
Commit: 42638e248f588d538367817a2cda3328c43d48a6
Parents: 870551c
Author: Ismaël Mejía <ie...@gmail.com>
Authored: Thu Jul 6 17:53:36 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Aug 1 07:31:31 2017 +0200
----------------------------------------------------------------------
pom.xml | 8 +++++---
sdks/java/io/hadoop/jdk1.8-tests/pom.xml | 1 -
.../src/test/resources/projects/basic/reference/pom.xml | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/42638e24/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e0ec136..8535574 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,10 +157,12 @@
<groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
<surefire-plugin.version>2.20</surefire-plugin.version>
<failsafe-plugin.version>2.20</failsafe-plugin.version>
- <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
+ <maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.0.1</maven-dependency-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
<maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+ <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
<maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
@@ -1389,7 +1391,7 @@
here, we leave things simple here. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>${maven-javadoc-plugin.version}</version>
<configuration>
<additionalparam>${beam.javadoc_opts}</additionalparam>
<windowtitle>Apache Beam SDK for Java, version ${project.version} API</windowtitle>
@@ -1780,7 +1782,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce</id>
http://git-wip-us.apache.org/repos/asf/beam/blob/42638e24/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop/jdk1.8-tests/pom.xml b/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
index 12944f4..8df2552 100644
--- a/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
+++ b/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
<executions>
<execution>
<id>enforce</id>
http://git-wip-us.apache.org/repos/asf/beam/blob/42638e24/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
index 6056fb0..91da6eb 100644
--- a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
+++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
@@ -27,9 +27,9 @@
<properties>
<beam.version>@project.version@</beam.version>
- <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
- <maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>
- <slf4j.version>1.7.14</slf4j.version>
+ <maven-compiler-plugin.version>@maven-compiler-plugin.version@</maven-compiler-plugin.version>
+ <maven-exec-plugin.version>@maven-exec-plugin.version@</maven-exec-plugin.version>
+ <slf4j.version>@slf4j.version@</slf4j.version>
</properties>
<repositories>
[2/2] beam git commit: [BEAM-2530] This closes #3665
Posted by jb...@apache.org.
[BEAM-2530] This closes #3665
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/2816b15e
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2816b15e
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2816b15e
Branch: refs/heads/master
Commit: 2816b15eef404420cf015a4345ddbe8e46867578
Parents: 870551c 42638e2
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Aug 1 07:31:53 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Aug 1 07:31:53 2017 +0200
----------------------------------------------------------------------
pom.xml | 8 +++++---
sdks/java/io/hadoop/jdk1.8-tests/pom.xml | 1 -
.../src/test/resources/projects/basic/reference/pom.xml | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------