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 2017/05/20 23:08:03 UTC
[1/5] servicemix git commit: SM-3268: Upgrade to Apache ActiveMQ
5.14.5
Repository: servicemix
Updated Branches:
refs/heads/master e9c185a62 -> c583569e0
SM-3268: Upgrade to Apache ActiveMQ 5.14.5
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/fbead885
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/fbead885
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/fbead885
Branch: refs/heads/master
Commit: fbead885f9624208c7b0634549280f01ae525fb4
Parents: e9c185a
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun May 21 00:08:14 2017 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun May 21 00:08:14 2017 +0200
----------------------------------------------------------------------
parent/assemblies-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fbead885/parent/assemblies-parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/assemblies-parent/pom.xml b/parent/assemblies-parent/pom.xml
index 3f55ff1..b730426 100644
--- a/parent/assemblies-parent/pom.xml
+++ b/parent/assemblies-parent/pom.xml
@@ -38,7 +38,7 @@
<properties>
<!-- Assembly properties -->
- <activemq.version>5.14.3</activemq.version>
+ <activemq.version>5.14.5</activemq.version>
<camel.version>2.16.5</camel.version>
<cxf.version>3.1.9</cxf.version>
<fasterxml.jackson.version>2.6.3</fasterxml.jackson.version>
[4/5] servicemix git commit: [SM-3358] Upgrade to maven-bundle-plugin
3.3.0
Posted by ks...@apache.org.
[SM-3358] Upgrade to maven-bundle-plugin 3.3.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/1660c5af
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/1660c5af
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/1660c5af
Branch: refs/heads/master
Commit: 1660c5aff22a466d004396a0d2aaad60d36ddbd9
Parents: 27f1858
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun May 21 00:28:00 2017 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun May 21 00:28:00 2017 +0200
----------------------------------------------------------------------
parent/assemblies-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/1660c5af/parent/assemblies-parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/assemblies-parent/pom.xml b/parent/assemblies-parent/pom.xml
index 3b74aa9..1b6d516 100644
--- a/parent/assemblies-parent/pom.xml
+++ b/parent/assemblies-parent/pom.xml
@@ -53,7 +53,7 @@
<xerces.version>2.11.0</xerces.version>
<depends-maven-plugin.version>1.4.0</depends-maven-plugin.version>
- <maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
+ <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
<maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
</properties>
[3/5] servicemix git commit: [SM-3357] Upgrade to
depends-maven-plugin 1.4.0
Posted by ks...@apache.org.
[SM-3357] Upgrade to depends-maven-plugin 1.4.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/27f18583
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/27f18583
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/27f18583
Branch: refs/heads/master
Commit: 27f185836a5565b20b4222e19d84546b0399b332
Parents: 2528571
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun May 21 00:21:40 2017 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun May 21 00:21:40 2017 +0200
----------------------------------------------------------------------
parent/assemblies-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/27f18583/parent/assemblies-parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/assemblies-parent/pom.xml b/parent/assemblies-parent/pom.xml
index eba5fc8..3b74aa9 100644
--- a/parent/assemblies-parent/pom.xml
+++ b/parent/assemblies-parent/pom.xml
@@ -52,7 +52,7 @@
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
<xerces.version>2.11.0</xerces.version>
- <depends-maven-plugin.version>1.3.1</depends-maven-plugin.version>
+ <depends-maven-plugin.version>1.4.0</depends-maven-plugin.version>
<maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
<maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
[5/5] servicemix git commit: [SM-3359] Upgrade maven plugin versions
and parent pom
Posted by ks...@apache.org.
[SM-3359] Upgrade maven plugin versions and parent pom
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c583569e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c583569e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c583569e
Branch: refs/heads/master
Commit: c583569e0f537495e8d602ac5760c6fe13c92bfa
Parents: 1660c5a
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun May 21 01:00:53 2017 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun May 21 01:00:53 2017 +0200
----------------------------------------------------------------------
pom.xml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c583569e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 313be3d..fef4470 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>18</version>
<relativePath />
</parent>
@@ -75,7 +75,7 @@
<appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>
- <exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
+ <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<maven-scala-plugin.version>2.15.2</maven-scala-plugin.version>
</properties>
@@ -126,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -141,17 +141,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
+ <version>2.10.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -198,7 +198,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.10</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.scala-tools</groupId>
@@ -208,7 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -246,7 +246,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -261,7 +261,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -392,7 +392,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
+ <version>2.10.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -402,7 +402,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.5</version>
+ <version>3.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -563,7 +563,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -576,7 +576,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
+ <version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
[2/5] servicemix git commit: SM-3264: Upgrade to Apache Karaf 4.0.9
Posted by ks...@apache.org.
SM-3264: Upgrade to Apache Karaf 4.0.9
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/2528571f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/2528571f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/2528571f
Branch: refs/heads/master
Commit: 2528571f5ad75bc4b61b3fb4f2808a8e662410f3
Parents: fbead88
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun May 21 00:19:28 2017 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun May 21 00:19:28 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/etc/org.ops4j.pax.url.mvn.cfg | 2 +-
parent/assemblies-parent/pom.xml | 4 ++--
parent/features-parent/pom.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/2528571f/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
index bb89da4..8dd1e3d 100644
--- a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -25,7 +25,7 @@
# If set to true, the following property will not allow any certificate to be used
# when accessing Maven repositories through SSL
#
-#org.ops4j.pax.url.mvn.certificateCheck=
+org.ops4j.pax.url.mvn.certificateCheck=true
#
# Path to the local Maven settings file.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/2528571f/parent/assemblies-parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/assemblies-parent/pom.xml b/parent/assemblies-parent/pom.xml
index b730426..eba5fc8 100644
--- a/parent/assemblies-parent/pom.xml
+++ b/parent/assemblies-parent/pom.xml
@@ -44,10 +44,10 @@
<fasterxml.jackson.version>2.6.3</fasterxml.jackson.version>
<geronimo-atinject.version>1.0</geronimo-atinject.version>
<jodatime2.bundle.version>2.9</jodatime2.bundle.version>
- <karaf.version>4.0.8</karaf.version>
+ <karaf.version>4.0.9</karaf.version>
<pax.exam.version>4.9.1</pax.exam.version>
<pax.logging.version>1.8.5</pax.logging.version>
- <servicemix.specs.version>2.7.0</servicemix.specs.version>
+ <servicemix.specs.version>2.8.0</servicemix.specs.version>
<xalan.bundle.version>2.7.2_3</xalan.bundle.version>
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
<xerces.version>2.11.0</xerces.version>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/2528571f/parent/features-parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/features-parent/pom.xml b/parent/features-parent/pom.xml
index 02458c8..cc35d36 100644
--- a/parent/features-parent/pom.xml
+++ b/parent/features-parent/pom.xml
@@ -43,7 +43,7 @@
<activiti.version>5.19.0.2</activiti.version>
<akka.version>2.3.9</akka.version>
<aries.blueprint.core.version>1.7.1</aries.blueprint.core.version>
- <aries.jpa.version>2.3.0</aries.jpa.version>
+ <aries.jpa.version>2.6.0</aries.jpa.version>
<aries.proxy.version>1.0.5</aries.proxy.version>
<aries.transaction.version>1.3.1</aries.transaction.version>
<aries.util.version>1.1.1</aries.util.version>
@@ -78,7 +78,7 @@
<scala-2.10.version>2.10.4</scala-2.10.version>
<scala-xml.version>1.0.4</scala-xml.version>
<slf4j.version>1.7.12</slf4j.version>
- <spring.version>3.2.17.RELEASE_1</spring.version>
+ <spring.version>3.2.18.RELEASE_1</spring.version>
<!-- spring-dm does not support spring 4.x so import-range must be 3.x for the -->
<!-- Karaf features file. -->
<spring-version-range-karaf>[3.2,4)</spring-version-range-karaf>