You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/02/20 19:06:53 UTC
svn commit: r912171 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/ examples/itests/tests/
Author: jbonofre
Date: Sat Feb 20 18:06:52 2010
New Revision: 912171
URL: http://svn.apache.org/viewvc?rev=912171&view=rev
Log:
[SMX4-471] Upgrade to Camel 2.2.0.
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=912171&r1=912170&r2=912171&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Sat Feb 20 18:06:52 2010
@@ -527,6 +527,11 @@
</dependency>
-->
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${activemq.commons.pool.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${activemq.version}</version>
@@ -846,8 +851,13 @@
<version>${scriptengines.version}</version>
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons.pool.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.karaf</groupId>
- <artifactId>features</artifactId>
+ <artifactId>apache-camel</artifactId>
<version>${camel.version}</version>
<type>xml</type>
<classifier>features</classifier>
@@ -975,7 +985,7 @@
<descriptors>
<descriptor>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.camel.karaf/features/${camel.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=912171&r1=912170&r2=912171&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Sat Feb 20 18:06:52 2010
@@ -39,7 +39,7 @@
<exclude>NOTICE</exclude>
<exclude>README</exclude>
<exclude>RELEASE-NOTES</exclude>
- <exclude>manual*</exclude>
+ <exclude>karaf-manual*</exclude>
</excludes>
</fileSet>
@@ -294,7 +294,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
- <include>org.apache.camel.karaf:features:xml:features</include>
+ <include>org.apache.camel.karaf:apache-camel:xml:features</include>
</includes>
</dependencySet>
<dependencySet>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=912171&r1=912170&r2=912171&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Sat Feb 20 18:06:52 2010
@@ -38,7 +38,7 @@
<exclude>NOTICE</exclude>
<exclude>README</exclude>
<exclude>RELEASE-NOTES</exclude>
- <exclude>manual*</exclude>
+ <exclude>karaf-manual*</exclude>
</excludes>
</fileSet>
@@ -283,7 +283,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
- <include>org.apache.camel.karaf:features:xml:features</include>
+ <include>org.apache.camel.karaf:apache-camel:xml:features</include>
</includes>
</dependencySet>
<dependencySet>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg?rev=912171&r1=912170&r2=912171&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg Sat Feb 20 18:06:52 2010
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/features/${camel.version}/xml/features
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features
#
# Comma separated list of features to install at startup
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=912171&r1=912170&r2=912171&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Sat Feb 20 18:06:52 2010
@@ -18,7 +18,7 @@
-->
<features>
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
- <repository>mvn:org.apache.camel.karaf/features/${camel.version}/xml/features</repository>
+ <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
<repository>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</repository>
<feature name="connector" version="${version}">
<feature version="${servicemix.nmr.version}">transaction</feature>
@@ -43,7 +43,7 @@
<feature name="activemq" version="${activemq.version}">
<feature version="${version}">connector</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo.j2ee.management.version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
+ <bundle>mvn:commons-pool/commons-pool/${activemq.commons.pool.version}</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
<bundle>mvn:org.apache.activemq/kahadb/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=912171&r1=912170&r2=912171&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Sat Feb 20 18:06:52 2010
@@ -301,7 +301,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>${commons.pool.version}</version>
+ <version>${activemq.commons.pool.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=912171&r1=912170&r2=912171&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Sat Feb 20 18:06:52 2010
@@ -74,7 +74,7 @@
<bcel.version>5.2_2</bcel.version>
<bnd.version>0.0.384</bnd.version>
<cglib.version>2.1_3_4</cglib.version>
- <camel.version>2.1.0</camel.version>
+ <camel.version>2.2.0</camel.version>
<commons.management.version>1.0</commons.management.version>
<commons-beanutils.version>1.7.0_3</commons-beanutils.version>
<commons-collections.version>3.2.1</commons-collections.version>
@@ -86,7 +86,9 @@
<commons-jxpath.version>1.2_3</commons-jxpath.version>
<commons.logging.version>1.1.1</commons.logging.version>
<commons.net.version>1.4.1_3</commons.net.version>
- <commons.pool.version>1.4</commons.pool.version>
+ <commons.pool.version>1.5.4</commons.pool.version>
+ <!-- Required by ActiveMQ -->
+ <activemq.commons.pool.version>1.4</activemq.commons.pool.version>
<commons.vfs.version>1.0_3</commons.vfs.version>
<commons.jexl.version>1.1_3</commons.jexl.version>
<cxf.version>2.2.6</cxf.version>
@@ -143,8 +145,8 @@
<jdt.core.version>3.2.3_2</jdt.core.version>
<jdom.version>1.1_2</jdom.version>
<jencks.version>2.2</jencks.version>
- <jetty.version>6.1.22</jetty.version>
- <jetty.bundle.version>6.1.22_1</jetty.bundle.version>
+ <jetty.version>6.1.19</jetty.version>
+ <jetty.bundle.version>6.1.19_2</jetty.bundle.version>
<jexcelapi.version>2.4.2_2</jexcelapi.version>
<jettison.version>1.2</jettison.version>
<jing.version>20030619_2</jing.version>