You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/12/19 09:21:30 UTC
[2/2] camel git commit: Upgrade Karaf OSGi fun
Upgrade Karaf OSGi fun
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0caeee2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0caeee2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0caeee2
Branch: refs/heads/master
Commit: f0caeee20f1f9bbfcfd1f1d1682572c875119690
Parents: 1abcb8a
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 19 10:15:21 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 19 10:20:42 2016 +0100
----------------------------------------------------------------------
components/camel-spring/pom.xml | 6 ------
parent/pom.xml | 5 ++---
platforms/karaf/features/src/main/resources/features.xml | 6 ++++++
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f0caeee2/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 87f9221..8e31690 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -183,12 +183,6 @@
<version>${cglib-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/f0caeee2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eb90411..fd61e87 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,12 +52,11 @@
<aries-blueprint-proxy-version>1.0.1</aries-blueprint-proxy-version>
<aries-blueprint-proxy-impl-version>1.0.4</aries-blueprint-proxy-impl-version>
<aries-spifly-version>1.0.8</aries-spifly-version>
- <aries-util-version>1.1.1</aries-util-version>
+ <aries-util-version>1.1.3</aries-util-version>
<arquillian-container-se-managed-version>1.0.0.Final</arquillian-container-se-managed-version>
<arquillian-version>1.1.11.Final</arquillian-version>
<arquillian-weld-embedded-version>2.0.0.Beta4</arquillian-weld-embedded-version>
- <asm-bundle-version>3.3.1_1</asm-bundle-version>
- <asm-version>3.3.1</asm-version>
+ <asm-version>5.0.4</asm-version>
<aspectj-version>1.8.9</aspectj-version>
<asterisk-java-version>1.0.0-final</asterisk-java-version>
<asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/f0caeee2/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index d8b9455..0a9e844 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -315,6 +315,7 @@
<bundle dependency='true'>mvn:net.openhft/affinity/${openhft-affinity-version}</bundle>
<bundle dependency='true'>mvn:net.openhft/compiler/${openhft-compiler-version}</bundle>
<bundle dependency='true'>mvn:net.openhft/lang/${openhft-lang-version}</bundle>
+ <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
<bundle dependency='true'>mvn:net.openhft/chronicle-core/${chronicle-core-version}</bundle>
<bundle dependency='true'>mvn:net.openhft/chronicle-bytes/${chronicle-bytes-version}</bundle>
<bundle dependency='true'>mvn:net.openhft/chronicle-wire/${chronicle-wire-version}</bundle>
@@ -1364,6 +1365,7 @@
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
@@ -1387,7 +1389,11 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${openstack4j-guava-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}</bundle>
<bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle>
+ <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
+ <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm-version}</bundle>
+ <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.pacesys/openstack4j-core/${openstack4j-version}</bundle>