You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/06/03 16:04:42 UTC
[1/2] git commit: Upgrading some plugins
Repository: cxf-fediz
Updated Branches:
refs/heads/1.1.x-fixes 5c43fd239 -> 7506f31af
Upgrading some plugins
Conflicts:
services/sts/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/c83d42e6
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/c83d42e6
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/c83d42e6
Branch: refs/heads/1.1.x-fixes
Commit: c83d42e6cb598f63f356d807083e5be5f51132f0
Parents: 5c43fd2
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jun 3 14:45:54 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jun 3 14:49:56 2014 +0100
----------------------------------------------------------------------
plugins/pom.xml | 2 +-
pom.xml | 10 +++++-----
services/sts/pom.xml | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c83d42e6/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0c51204..6ccd1b7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c83d42e6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4d0fc65..8e0a512 100644
--- a/pom.xml
+++ b/pom.xml
@@ -377,7 +377,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -387,7 +387,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
</plugin>
<!-- TODO commented out for now
<plugin>
@@ -446,7 +446,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.11</version>
+ <version>2.12.1</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
@@ -481,7 +481,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
@@ -522,7 +522,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
<configuration>
<includes>
<include>**/*Test.java</include>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c83d42e6/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 528b8e4..3cea1b3 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -107,7 +107,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
<executions>
<execution>
<phase>generate-resources</phase>
[2/2] git commit: More plugin versions
Posted by co...@apache.org.
More plugin versions
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/7506f31a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/7506f31a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/7506f31a
Branch: refs/heads/1.1.x-fixes
Commit: 7506f31af3c3a785ba42858e5782642c22642b0d
Parents: c83d42e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jun 3 15:04:30 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jun 3 15:04:30 2014 +0100
----------------------------------------------------------------------
plugins/core/pom.xml | 2 +-
plugins/cxf/pom.xml | 4 ++--
plugins/jetty/pom.xml | 6 +++---
plugins/spring/pom.xml | 4 ++--
plugins/spring2/pom.xml | 4 ++--
services/sts/pom.xml | 8 ++++----
systests/jetty8/pom.xml | 8 ++++----
systests/spring/pom.xml | 8 ++++----
systests/tests/pom.xml | 2 +-
9 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/plugins/core/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml
index b48e9cf..95bce07 100644
--- a/plugins/core/pom.xml
+++ b/plugins/core/pom.xml
@@ -112,7 +112,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/plugins/cxf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index 9b7eda3..4264ec1 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>zip-file</id>
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/plugins/jetty/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jetty/pom.xml b/plugins/jetty/pom.xml
index 039e2d6..a094746 100644
--- a/plugins/jetty/pom.xml
+++ b/plugins/jetty/pom.xml
@@ -120,7 +120,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>zip-file</id>
@@ -139,7 +139,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -165,7 +165,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
<executions>
<execution>
<id>copy-idp-sts</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 70292ba..ccc41ba 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>zip-file</id>
@@ -91,7 +91,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/plugins/spring2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring2/pom.xml b/plugins/spring2/pom.xml
index ccbae81..f2731d7 100644
--- a/plugins/spring2/pom.xml
+++ b/plugins/spring2/pom.xml
@@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>zip-file</id>
@@ -95,7 +95,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 3cea1b3..0a68806 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -84,7 +84,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.3</version>
<configuration>
<webResources>
<resource>
@@ -163,7 +163,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<executions>
<execution>
<id>reserve-network-port</id>
@@ -230,7 +230,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.2</version>
+ <version>2.17</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -263,7 +263,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.14</version>
+ <version>2.17</version>
<executions>
<execution>
<id>default-test</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/systests/jetty8/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jetty8/pom.xml b/systests/jetty8/pom.xml
index be4e7f3..60cdba2 100644
--- a/systests/jetty8/pom.xml
+++ b/systests/jetty8/pom.xml
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<executions>
<execution>
<id>reserve-network-port</id>
@@ -133,7 +133,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
<executions>
<execution>
<id>copy-idp-sts</id>
@@ -186,7 +186,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.2</version>
+ <version>2.17</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -220,7 +220,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.17</version>
<inherited>true</inherited>
<configuration>
<excludes>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/systests/spring/pom.xml
----------------------------------------------------------------------
diff --git a/systests/spring/pom.xml b/systests/spring/pom.xml
index 2322897..6bd00c5 100644
--- a/systests/spring/pom.xml
+++ b/systests/spring/pom.xml
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<executions>
<execution>
<id>reserve-network-port</id>
@@ -121,7 +121,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
<executions>
<execution>
<id>copy-idp-sts</id>
@@ -171,7 +171,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.2</version>
+ <version>2.17</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -205,7 +205,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.17</version>
<inherited>true</inherited>
<configuration>
<excludes>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7506f31a/systests/tests/pom.xml
----------------------------------------------------------------------
diff --git a/systests/tests/pom.xml b/systests/tests/pom.xml
index 5a1ef71..e25fd81 100644
--- a/systests/tests/pom.xml
+++ b/systests/tests/pom.xml
@@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<executions>
<execution>
<goals>