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 2015/12/02 22:57:16 UTC
[1/5] servicemix git commit: Upgrade to Activiti 5.19.0 (closes #33)
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.x 8b499f50e -> 316c9c465
Upgrade to Activiti 5.19.0 (closes #33)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/b08a3e2b
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/b08a3e2b
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/b08a3e2b
Branch: refs/heads/servicemix-5.x
Commit: b08a3e2b679def20d0eb8dfdf82ae23d72a219d0
Parents: 8b499f5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Nov 13 17:16:04 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 22:16:54 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/b08a3e2b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 05b1ec2..91ed28f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,7 +39,7 @@
<!-- Properties -->
<properties>
<activemq.version>5.12.1</activemq.version>
- <activiti.version>5.17.0</activiti.version>
+ <activiti.version>5.19.0</activiti.version>
<akka.version>2.3.9</akka.version>
<aries.blueprint.core.version>1.4.3</aries.blueprint.core.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
[3/5] servicemix git commit: SM-2700: Increase the java compilance
level to 1.7
Posted by ks...@apache.org.
SM-2700: Increase the java compilance level to 1.7
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c8da4124
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c8da4124
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c8da4124
Branch: refs/heads/servicemix-5.x
Commit: c8da41241ea1c17a767f8d066b5799500de4d6d6
Parents: 38b2aa3
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue Nov 3 22:32:35 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 22:34:30 2015 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c8da4124/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c2683cb..31fc552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,8 +72,8 @@
<!-- Maven Compiler Plugin -->
<maven.compiler.debug>true</maven.compiler.debug>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
<!-- Maven Plugins -->
<apache-rat-plugin.version>0.11</apache-rat-plugin.version>
[5/5] servicemix git commit: Upgrade to Apache Camel 2.16.1 and
Apache CXF 3.1.4
Posted by ks...@apache.org.
Upgrade to Apache Camel 2.16.1 and Apache CXF 3.1.4
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/316c9c46
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/316c9c46
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/316c9c46
Branch: refs/heads/servicemix-5.x
Commit: 316c9c465054d5ab2dade3f81736a7a8a7631e79
Parents: 6e6308c
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Dec 2 22:56:51 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 22:56:51 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/316c9c46/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b259881..40fe06c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,7 +81,7 @@
<pax.logging.version>1.8.3</pax.logging.version>
<pax.url.version>2.4.1</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
- <reflections.bundle.version>0.9.10.3</reflections.bundle.version>
+ <reflections.bundle.version>0.9.10_3</reflections.bundle.version>
<scala-2.10.version>2.10.4</scala-2.10.version>
<scala-xml.version>1.0.4</scala-xml.version>
<scala.version>2.11.7</scala.version>
[2/5] servicemix git commit: Upgrade to Apache Camel 2.16.1 and
Apache CXF 3.1.4
Posted by ks...@apache.org.
Upgrade to Apache Camel 2.16.1 and Apache CXF 3.1.4
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/38b2aa31
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/38b2aa31
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/38b2aa31
Branch: refs/heads/servicemix-5.x
Commit: 38b2aa31a8c8a178a505532549f3a8ec218e0bfa
Parents: b08a3e2
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Dec 2 22:26:05 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 22:26:05 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/38b2aa31/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 91ed28f..47a4e32 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -44,15 +44,15 @@
<aries.blueprint.core.version>1.4.3</aries.blueprint.core.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.util.version>1.1.0</aries.util.version>
- <camel.version>2.15.4</camel.version>
+ <camel.version>2.16.1</camel.version>
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version>
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
- <commons-lang3.version>3.3.2</commons-lang3.version>
- <cxf.version>3.0.6</cxf.version>
+ <commons-lang3.version>3.4</commons-lang3.version>
+ <cxf.version>3.1.4</cxf.version>
<derby.bundle.version>10.11.1.1_1</derby.bundle.version>
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
<drools.version>5.6.0.Final</drools.version>
@@ -69,7 +69,7 @@
<h2.version>1.3.170</h2.version>
<javassist.bundle.version>3.12.1.GA_3</javassist.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
- <jodatime2.bundle.version>2.6</jodatime2.bundle.version>
+ <jodatime2.bundle.version>2.9</jodatime2.bundle.version>
<jpa.version>2.1.0</jpa.version>
<json4s.bundle.version>3.2.11_1</json4s.bundle.version>
<karaf.version>2.4.3</karaf.version>
@@ -80,17 +80,17 @@
<pax.logging.version>1.8.3</pax.logging.version>
<pax.url.version>2.4.1</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
- <reflections.bundle.version>0.9.9_1</reflections.bundle.version>
+ <reflections.bundle.version>0.9.10.3</reflections.bundle.version>
<scala-2.10.version>2.10.4</scala-2.10.version>
<scala-xml.version>1.0.4</scala-xml.version>
- <scala.version>2.11.5</scala.version>
+ <scala.version>2.11.7</scala.version>
<servicemix.specs.version>2.5.0</servicemix.specs.version>
<slf4j.version>1.7.12</slf4j.version>
<spring.version>3.2.11.RELEASE_1</spring.version>
<swagger.bundle.version>1.3.12_1</swagger.bundle.version>
<swagger.core.bundle.version>1.3.12_2</swagger.core.bundle.version>
<swagger.version>1.3.12</swagger.version>
- <thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version>
+ <thoughtworks.paranamer.version>2.8</thoughtworks.paranamer.version>
<typesafe-config.version>1.2.0</typesafe-config.version>
<wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version>
<xalan.version>2.7.2</xalan.version>
[4/5] servicemix git commit: SM-2727: Upgrade to Jackson 2.6.2
Posted by ks...@apache.org.
SM-2727: Upgrade to Jackson 2.6.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/6e6308c7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/6e6308c7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/6e6308c7
Branch: refs/heads/servicemix-5.x
Commit: 6e6308c785f361f3d74df9e386ec311d6e4c79d3
Parents: c8da412
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Dec 2 22:34:56 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 22:34:56 2015 +0100
----------------------------------------------------------------------
.../filtered-resources/etc/overrides.properties | 27 ++++++++++++++++++++
.../src/main/filtered-resources/features.xml | 2 ++
parent/pom.xml | 3 ++-
3 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/6e6308c7/assembly/src/main/filtered-resources/etc/overrides.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/overrides.properties b/assembly/src/main/filtered-resources/etc/overrides.properties
new file mode 100644
index 0000000..164434c
--- /dev/null
+++ b/assembly/src/main/filtered-resources/etc/overrides.properties
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# workaround for SM-2727
+# Camel 2.16.x includes jackson in version 2.6.x but ActiveMQ and CXF still use the version 2.4.x. It makes
+# problems while resolving some bundles (see the issue for details). We should force usage of 2.6.x until
+# ActiveMQ and CXF upgrade to 2.6.x
+mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version};range="[2,3)"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/6e6308c7/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index 5848156..57767b3 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -105,12 +105,14 @@
<bundle dependency='true'>mvn:org.scala-lang/scala-reflect/${scala.version}</bundle>
<bundle dependency='true'>mvn:org.scala-lang.modules/scala-xml_2.11/${scala-xml.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google.guava.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-paranamer/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core_2.11/${swagger.core.bundle.version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/6e6308c7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 47a4e32..b259881 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<derby.bundle.version>10.11.1.1_1</derby.bundle.version>
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
<drools.version>5.6.0.Final</drools.version>
- <fasterxml.jackson.version>2.4.3</fasterxml.jackson.version>
+ <fasterxml.jackson.version>2.6.2</fasterxml.jackson.version>
<felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
<felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version>
<geronimo-atinject.version>1.0</geronimo-atinject.version>
@@ -68,6 +68,7 @@
<google.guava.version>15.0</google.guava.version>
<h2.version>1.3.170</h2.version>
<javassist.bundle.version>3.12.1.GA_3</javassist.bundle.version>
+ <javax-inject.bundle.version>1_2</javax-inject.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
<jodatime2.bundle.version>2.9</jodatime2.bundle.version>
<jpa.version>2.1.0</jpa.version>