SM-2292 Upgrade to Camel 2.13.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/8ca299c5 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8ca299c5 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8ca299c5 Branch: refs/heads/master Commit: 8ca299c51e72224fbad1fdf7d98d3743cbc58d8c Parents: fb557e2 Author: Krzysztof Sobkowiak <[email protected]> Authored: Thu May 22 22:36:52 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Thu May 22 22:36:52 2014 +0200 ---------------------------------------------------------------------- activemq/activemq-camel/pom.xml | 2 +- activemq/activemq-service/pom.xml | 2 +- assembly/src/main/filtered-resources/features.xml | 1 + parent/pom.xml | 12 ++++++------ pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/8ca299c5/activemq/activemq-camel/pom.xml ---------------------------------------------------------------------- diff --git a/activemq/activemq-camel/pom.xml b/activemq/activemq-camel/pom.xml index 624ce41..fefd1e5 100644 --- a/activemq/activemq-camel/pom.xml +++ b/activemq/activemq-camel/pom.xml @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-osgi</artifactId> + <artifactId>activemq-camel</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/servicemix/blob/8ca299c5/activemq/activemq-service/pom.xml ---------------------------------------------------------------------- diff --git a/activemq/activemq-service/pom.xml b/activemq/activemq-service/pom.xml index 3eeb345..e052f46 100644 --- a/activemq/activemq-service/pom.xml +++ b/activemq/activemq-service/pom.xml @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-osgi</artifactId> + <artifactId>activemq-camel</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/servicemix/blob/8ca299c5/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 34fb47a..3df4e88 100644 --- a/assembly/src/main/filtered-resources/features.xml +++ b/assembly/src/main/filtered-resources/features.xml @@ -36,6 +36,7 @@ <feature name="activemq-service" version="${version}" resolver="(obr)" start-level="50"> <feature version="${activemq.version}">activemq-broker-noweb</feature> + <feature version="${activemq.version}">activemq-camel</feature> <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.service/${version}</bundle> <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.camel/${version}</bundle> </feature> http://git-wip-us.apache.org/repos/asf/servicemix/blob/8ca299c5/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index dd0dab4..c3102c0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -37,10 +37,10 @@ <!-- Properties --> <properties> - <activemq.version>5.9.0</activemq.version> + <activemq.version>5.9.1</activemq.version> <activiti.version>5.15.1</activiti.version> - <camel.version>2.13.0</camel.version> - <cxf.version>2.7.10</cxf.version> + <camel.version>2.13.1</camel.version> + <cxf.version>2.7.11</cxf.version> <felix.obr.version>1.6.6</felix.obr.version> <karaf.version>3.0.1</karaf.version> @@ -55,8 +55,8 @@ <google.guava.version>14.0.1</google.guava.version> <fasterxml.jackson.version>2.2.1</fasterxml.jackson.version> <typesafe-config.version>1.0.2</typesafe-config.version> - <mvel2.version>2.1.3.Final</mvel2.version> - <mybatis.version>3.2.5</mybatis.version> + <mvel2.version>2.1.7.Final</mvel2.version> + <mybatis.version>3.2.7</mybatis.version> <jodatime.bundle.version>2.3_1</jodatime.bundle.version> <jpa.version>1.0.1</jpa.version> @@ -105,7 +105,7 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-osgi</artifactId> + <artifactId>activemq-camel</artifactId> <version>${activemq.version}</version> </dependency> <!-- Activiti--> http://git-wip-us.apache.org/repos/asf/servicemix/blob/8ca299c5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f867656..2e7dfd3 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ <jaxb.api.version>2.2</jaxb.api.version> <osgi.version>4.3.1</osgi.version> <scala.bundle.version>2.10.2_1</scala.bundle.version> - <wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version> + <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version> <swagger.bundle.version>1.3.0_1</swagger.bundle.version> <javassist.bundle.version>3.12.1.GA_2</javassist.bundle.version> <reflections.bundle.version>0.9.8_1</reflections.bundle.version> @@ -126,7 +126,7 @@ <postgresql.version>9.1-901</postgresql.version> <slf4j.version>1.7.5</slf4j.version> <spring.version>3.2.4.RELEASE</spring.version> - <wss4j.version>1.6.7</wss4j.version> + <wss4j.version>1.6.15</wss4j.version> </properties> <dependencyManagement>
