Hi Is there a specific reason why you are not upgrading to Camel 2.19.x?
On Fri, Jun 9, 2017 at 1:16 PM, <[email protected]> wrote: > Repository: activemq > Updated Branches: > refs/heads/master 2a0b785a0 -> a6782443c > > > AMQ-6585 - Upgrade to Camel 2.18.4 > > Added the camel-blueprint feature to work with Spring 4.x as Spring DM > support for Camel was deprecated > > > Project: http://git-wip-us.apache.org/repos/asf/activemq/repo > Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a6782443 > Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a6782443 > Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a6782443 > > Branch: refs/heads/master > Commit: a6782443c1695f54176afecfda6c5c423bc18a84 > Parents: 2a0b785 > Author: Christopher L. Shannon (cshannon) <[email protected]> > Authored: Fri Jun 9 07:13:11 2017 -0400 > Committer: Christopher L. Shannon (cshannon) <[email protected]> > Committed: Fri Jun 9 07:13:11 2017 -0400 > > ---------------------------------------------------------------------- > activemq-camel/pom.xml | 4 ++-- > ...ctiveMQBrokerNdExternalCamelFeatureTest.java | 6 ++++-- > .../src/main/resources/features-core.xml | 2 +- > activemq-karaf/src/main/resources/features.xml | 2 ++ > activemq-osgi/pom.xml | 22 ++++++++++++++++---- > .../activemq/osgi/ActiveMQServiceFactory.java | 2 +- > pom.xml | 12 +++++++---- > 7 files changed, 36 insertions(+), 14 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-camel/pom.xml > ---------------------------------------------------------------------- > diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml > index 37877e0..05f743c 100644 > --- a/activemq-camel/pom.xml > +++ b/activemq-camel/pom.xml > @@ -32,7 +32,7 @@ > > <properties> > <activemq.osgi.import.pkg> > - org.springframework.jms*;version="[3,5)", > + org.springframework.jms*;version="[4,5)", > org.apache.activemq.pool, > org.apache.camel*;version="${camel-version-range}", > * > @@ -102,7 +102,7 @@ > </dependency> > <dependency> > <groupId>org.apache.camel</groupId> > - <artifactId>camel-test-spring3</artifactId> > + <artifactId>camel-test-spring</artifactId> > <scope>test</scope> > </dependency> > <dependency> > > http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java > ---------------------------------------------------------------------- > diff --git > a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java > > b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java > index b948ecc..b25f05e 100644 > --- > a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java > +++ > b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java > @@ -26,11 +26,12 @@ import java.util.concurrent.Callable; > > import org.junit.Ignore; > import org.junit.Test; > +import org.junit.runner.RunWith; > import org.ops4j.pax.exam.Configuration; > import org.ops4j.pax.exam.Option; > +import org.ops4j.pax.exam.junit.PaxExam; > > -//@RunWith(PaxExam.class) > -@Ignore > +@RunWith(PaxExam.class) > public class ActiveMQBrokerNdExternalCamelFeatureTest extends > AbstractFeatureTest { > > @Configuration > @@ -53,6 +54,7 @@ public class ActiveMQBrokerNdExternalCamelFeatureTest > extends AbstractFeatureTes > > assertBrokerStarted(); > withinReason(new Runnable() { > + @Override > public void run() { > getBundle("org.apache.activemq.activemq-camel"); > } > > http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-karaf/src/main/resources/features-core.xml > ---------------------------------------------------------------------- > diff --git a/activemq-karaf/src/main/resources/features-core.xml > b/activemq-karaf/src/main/resources/features-core.xml > index 0f318c6..0e615ab 100644 > --- a/activemq-karaf/src/main/resources/features-core.xml > +++ b/activemq-karaf/src/main/resources/features-core.xml > @@ -22,7 +22,7 @@ > > <!-- Bundles needed if only client will be deployed in the container --> > <feature name="activemq-client" description="ActiveMQ client libraries" > version="${project.version}" resolver="(obr)" start-level="50"> > - <feature version="[3.2,5)">spring</feature> > + <feature version="[4,5)">spring</feature> > <bundle > dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle> > <bundle > dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> > <bundle > dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> > > http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-karaf/src/main/resources/features.xml > ---------------------------------------------------------------------- > diff --git a/activemq-karaf/src/main/resources/features.xml > b/activemq-karaf/src/main/resources/features.xml > index 7299ef7..586e324 100644 > --- a/activemq-karaf/src/main/resources/features.xml > +++ b/activemq-karaf/src/main/resources/features.xml > @@ -42,6 +42,8 @@ > > <bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle> > <feature version="${camel-version-range}">camel-jms</feature> > <feature version="${camel-version-range}">camel</feature> > + <feature version="${camel-version-range}">camel-spring</feature> > + <feature version="${camel-version-range}">camel-blueprint</feature> > </feature> > > <feature name="activemq-web-console" version="${project.version}" > resolver="(obr)" start-level="50"> > > http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-osgi/pom.xml > ---------------------------------------------------------------------- > diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml > index d389669..80eecf4 100644 > --- a/activemq-osgi/pom.xml > +++ b/activemq-osgi/pom.xml > @@ -57,9 +57,9 @@ > org.apache.zookeeper*;resolution:=optional, > org.fusesource.leveldbjni*;resolution:=optional, > org.fusesource.hawtjni*;resolution:=optional, > - org.springframework.jms*;version="[3,5)";resolution:=optional, > - org.springframework.transaction*;version="[3,5)";resolution:=optional, > - org.springframework*;version="[3,5)";resolution:=optional, > + org.springframework.jms*;version="[4,5)";resolution:=optional, > + org.springframework.transaction*;version="[4,5)";resolution:=optional, > + org.springframework*;version="[4,5)";resolution:=optional, > org.xmlpull*;resolution:=optional, > scala*;resolution:=optional, > javax.annotation*, > @@ -174,6 +174,11 @@ > <groupId>${project.groupId}</groupId> > <artifactId>activemq-spring</artifactId> > </dependency> > + > + <dependency> > + <groupId>org.apache.camel</groupId> > + <artifactId>camel-blueprint</artifactId> > + </dependency> > > <dependency> > <groupId>org.springframework.osgi</groupId> > @@ -247,7 +252,16 @@ > <type>jar</type> > <overWrite>false</overWrite> > > <outputDirectory>${basedir}/target/extra-resources/</outputDirectory> > - <includes>camel-osgi.xsd,camel-spring.xsd</includes> > + <includes>camel-spring.xsd</includes> > + </artifactItem> > + <artifactItem> > + <groupId>org.apache.camel</groupId> > + <artifactId>camel-blueprint</artifactId> > + <version>${camel-version}</version> > + <type>jar</type> > + <overWrite>false</overWrite> > + > <outputDirectory>${basedir}/target/extra-resources/</outputDirectory> > + <includes>camel-blueprint.xsd</includes> > </artifactItem> > </artifactItems> > </configuration> > > http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java > ---------------------------------------------------------------------- > diff --git > a/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java > > b/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java > index 7c8d177..29b02d6 100644 > --- > a/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java > +++ > b/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java > @@ -26,7 +26,7 @@ import java.util.Properties; > import org.apache.activemq.broker.BrokerService; > import org.apache.activemq.spring.SpringBrokerContext; > import org.apache.activemq.spring.Utils; > -import org.apache.camel.osgi.CamelContextFactoryBean; > +import org.apache.camel.blueprint.CamelContextFactoryBean; > import org.osgi.framework.BundleContext; > import org.osgi.service.cm.ConfigurationException; > import org.osgi.service.cm.ManagedServiceFactory; > > http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/pom.xml > ---------------------------------------------------------------------- > diff --git a/pom.xml b/pom.xml > index 098697d..982c411 100644 > --- a/pom.xml > +++ b/pom.xml > @@ -47,8 +47,8 @@ > <aries-version>1.1.0</aries-version> > <aries-transaction-version>1.1.1</aries-transaction-version> > <axion-version>1.0-M3-dev</axion-version> > - <camel-version>2.16.3</camel-version> > - <camel-version-range>[2.16,3)</camel-version-range> > + <camel-version>2.18.4</camel-version> > + <camel-version-range>[2.18,3)</camel-version-range> > <cglib-version>2.2</cglib-version> > <commons-beanutils-version>1.9.2</commons-beanutils-version> > <commons-collections-version>3.2.2</commons-collections-version> > @@ -584,6 +584,11 @@ > </dependency> > <dependency> > <groupId>org.apache.camel</groupId> > + <artifactId>camel-blueprint</artifactId> > + <version>${camel-version}</version> > + </dependency> > + <dependency> > + <groupId>org.apache.camel</groupId> > <artifactId>camel-jms</artifactId> > <version>${camel-version}</version> > </dependency> > @@ -592,10 +597,9 @@ > <artifactId>camel-test</artifactId> > <version>${camel-version}</version> > </dependency> > - <!-- when upgrading to Spring 4.x then use camel-test-spring --> > <dependency> > <groupId>org.apache.camel</groupId> > - <artifactId>camel-test-spring3</artifactId> > + <artifactId>camel-test-spring</artifactId> > <version>${camel-version}</version> > </dependency> > > -- Claus Ibsen ----------------- http://davsclaus.com @davsclaus Camel in Action 2: https://www.manning.com/ibsen2
