You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2017/04/26 15:28:47 UTC
[1/2] beam git commit: Update maven surefire and failsafe plugins to
version 2.20
Repository: beam
Updated Branches:
refs/heads/master b29d1c83b -> c7eccbbde
Update maven surefire and failsafe plugins to version 2.20
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/ff0baa81
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/ff0baa81
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/ff0baa81
Branch: refs/heads/master
Commit: ff0baa81f484f7d80ed3f89061f56afa44f83a94
Parents: b29d1c8
Author: Isma�l Mej�a <ie...@apache.org>
Authored: Wed Apr 26 13:08:27 2017 +0200
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Apr 26 08:28:31 2017 -0700
----------------------------------------------------------------------
pom.xml | 8 +++++---
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../examples/src/main/resources/archetype-resources/pom.xml | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/ff0baa81/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dcca93b..52d2b40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,8 @@
<woodstox.version>4.4.1</woodstox.version>
<spring.version>4.3.5.RELEASE</spring.version>
<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>
<compiler.error.flag>-Werror</compiler.error.flag>
<compiler.default.pkginfo.flag>-Xpkginfo:always</compiler.default.pkginfo.flag>
@@ -1274,7 +1276,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${surefire-plugin.version}</version>
<configuration>
<useManifestOnlyJar>false</useManifestOnlyJar>
<trimStackTrace>false</trimStackTrace>
@@ -1285,7 +1287,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
- <version>2.19.1</version>
+ <version>${surefire-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1293,7 +1295,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${failsafe-plugin.version}</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
http://git-wip-us.apache.org/repos/asf/beam/blob/ff0baa81/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
index 8e45d4f..08c5b95 100644
--- a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
@@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${surefire-plugin.version}</version>
<configuration>
<parallel>all</parallel>
<threadCount>4</threadCount>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
- <version>2.19.1</version>
+ <version>${surefire-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/beam/blob/ff0baa81/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index 874678a..e0ac28e 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${surefire-plugin.version}</version>
<configuration>
<parallel>all</parallel>
<threadCount>4</threadCount>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
- <version>2.19.1</version>
+ <version>${surefire-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
[2/2] beam git commit: This closes #2701
Posted by dh...@apache.org.
This closes #2701
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c7eccbbd
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c7eccbbd
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c7eccbbd
Branch: refs/heads/master
Commit: c7eccbbde72babd456a5ecdfd6048e709b891a2e
Parents: b29d1c8 ff0baa8
Author: Dan Halperin <dh...@google.com>
Authored: Wed Apr 26 08:28:32 2017 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Apr 26 08:28:32 2017 -0700
----------------------------------------------------------------------
pom.xml | 8 +++++---
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../examples/src/main/resources/archetype-resources/pom.xml | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------