You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2014/11/08 01:31:58 UTC
[1/7] servicemix git commit: SM-2399: Upgrade to Apache POM 15
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.4.x 11720ca69 -> 8c2343b35
SM-2399: Upgrade to Apache POM 15
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/61a2c3aa
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/61a2c3aa
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/61a2c3aa
Branch: refs/heads/servicemix-5.4.x
Commit: 61a2c3aa015d0138bb210678cefc01e4f1caccaf
Parents: 6b98dab
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Nov 7 22:23:01 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Nov 8 01:08:36 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/61a2c3aa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ab8e195..cd2e767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>14</version>
+ <version>15</version>
</parent>
<groupId>org.apache.servicemix</groupId>
[7/7] servicemix git commit: SM-2392: Upgrade to Pax Exam 4.3.0
Posted by ks...@apache.org.
SM-2392: Upgrade to Pax Exam 4.3.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/8c2343b3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8c2343b3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8c2343b3
Branch: refs/heads/servicemix-5.4.x
Commit: 8c2343b35f6215faac3698cb7b562c41fbca4472
Parents: 3e0032b
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Nov 8 01:00:23 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Nov 8 01:22:24 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8c2343b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 918a29e..b4980db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
<xerces.version>2.11.0</xerces.version>
<xml.api.version>2.11.0-20110622</xml.api.version>
<xalan.version>2.7.2</xalan.version>
- <pax.exam.version>4.2.0</pax.exam.version>
+ <pax.exam.version>4.3.0</pax.exam.version>
<pax.url.version>2.2.0</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
<slf4j.version>1.7.5</slf4j.version>
[6/7] servicemix git commit: SM-2400: Upgrade to Felix
maven-bundle-plugin 2.5.3
Posted by ks...@apache.org.
SM-2400: Upgrade to Felix maven-bundle-plugin 2.5.3
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c59c9d51
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c59c9d51
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c59c9d51
Branch: refs/heads/servicemix-5.4.x
Commit: c59c9d5168ccb7686d58d5f8cbb95acb73385370
Parents: 6206dbb
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Nov 8 00:04:04 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Nov 8 01:09:09 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c59c9d51/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8fe0f8b..862ee7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<!-- Maven Plugins -->
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
- <maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
+ <maven-bundle-plugin.version>2.5.3</maven-bundle-plugin.version>
<maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
[5/7] servicemix git commit: SM-2398: Upgrade maven plugins
Posted by ks...@apache.org.
SM-2398: Upgrade maven plugins
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/6206dbbc
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/6206dbbc
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/6206dbbc
Branch: refs/heads/servicemix-5.4.x
Commit: 6206dbbcd97d2c42202351d3ef5a82561497f0ec
Parents: 61a2c3a
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Nov 8 00:02:59 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Nov 8 01:09:09 2014 +0100
----------------------------------------------------------------------
pom.xml | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/6206dbbc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cd2e767..8fe0f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,13 +111,16 @@
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
<cobertura-maven-plugin.version>2.2</cobertura-maven-plugin.version>
<maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
- <exec-maven-plugin.version>1.1.1</exec-maven-plugin.version>
- <build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
+ <exec-maven-plugin.version>1.3.2</exec-maven-plugin.version>
+ <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
<maven-jxr-plugin.version>2.4</maven-jxr-plugin.version>
- <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
+ <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-scala-plugin.version>2.15.2</maven-scala-plugin.version>
- <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
+ <maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-release-plugin.version>2.5</maven-release-plugin.version>
+ <maven-assembly-plugin.version>2.4.1</maven-assembly-plugin.version>
+ <maven-dependency-plugin.version>2.9</maven-dependency-plugin.version>
+ <apache-rat-plugin.version>0.11</apache-rat-plugin.version>
<!-- Other Dependencies -->
<commons-fileupload.version>1.3.1</commons-fileupload.version>
@@ -334,6 +337,21 @@
<version>${maven-scala-plugin.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>${lifecycle-mapping-plugin.version}</version>
[2/7] servicemix git commit: Use xerces.version parameter while
defining xerces as plugin dependency
Posted by ks...@apache.org.
Use xerces.version parameter while defining xerces as plugin dependency
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/6b98dabf
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/6b98dabf
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/6b98dabf
Branch: refs/heads/servicemix-5.4.x
Commit: 6b98dabf075b3f4baa902299cf4d5bf0f782caf4
Parents: 11720ca
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Nov 7 22:18:10 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Nov 8 01:08:36 2014 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/6b98dabf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a0efcd..ab8e195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
+ <version>${xerces.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -646,7 +646,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
+ <version>${xerces.version}</version>
</dependency>
</dependencies>
</plugin>
[3/7] servicemix git commit: SM-2403: Upgrade to
maven-surefire-plugin 2.18
Posted by ks...@apache.org.
SM-2403: Upgrade to maven-surefire-plugin 2.18
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/574404f2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/574404f2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/574404f2
Branch: refs/heads/servicemix-5.4.x
Commit: 574404f2ac9dc52c75d6da9ba7d32fc20c9a939d
Parents: c59c9d5
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Nov 8 00:09:57 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Nov 8 01:09:09 2014 +0100
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/574404f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 862ee7a..fbe88bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,7 @@
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
<cobertura-maven-plugin.version>2.2</cobertura-maven-plugin.version>
+ <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
<exec-maven-plugin.version>1.3.2</exec-maven-plugin.version>
<build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
@@ -317,6 +318,11 @@
<version>${cobertura-maven-plugin.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
[4/7] servicemix git commit: SM-2402: Use correct cxf.codegen-plugin
version
Posted by ks...@apache.org.
SM-2402: Use correct cxf.codegen-plugin version
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/3e0032b5
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/3e0032b5
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/3e0032b5
Branch: refs/heads/servicemix-5.4.x
Commit: 3e0032b5918332da6965d7637089f9df2049a82f
Parents: 574404f
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Nov 8 00:59:04 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Nov 8 01:09:09 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 21 +++++++++++++++++++++
pom.xml | 44 --------------------------------------------
2 files changed, 21 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/3e0032b5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6e1206f..c3d4561 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
<activiti.version>5.15.1</activiti.version>
<camel.version>2.14.0</camel.version>
<cxf.version>3.0.2</cxf.version>
+ <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
<felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
<karaf.version>2.4.0</karaf.version>
@@ -405,4 +406,24 @@
</dependencies>
</dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.codegen-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/3e0032b5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fbe88bb..918a29e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,6 @@
</prerequisites>
<properties>
- <!-- CXF -->
- <cxf.codegen-plugin.version>2.4.4</cxf.codegen-plugin.version>
<!-- Geronimo -->
<geronimo-connector.version>2.1.3</geronimo-connector.version>
@@ -242,18 +240,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.codegen-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
@@ -647,36 +633,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- Need to add a xerces dependency to cxf-codegen-plugin when using
- the ibm jdk to work around error: org.apache.xerces.impl.dv.DVFactoryException:
- DTD factory class org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not
- extend from DTDDVFactory. Can remove this when we upgrade to a cxf.version
- which includes this in the cxf-codegen-plugin pom. -->
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>