You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/10/01 08:54:44 UTC
svn commit: r1003406 - in /servicemix/smx4/features/trunk:
examples/itests/tests/pom.xml
examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
pom.xml
Author: gertv
Date: Fri Oct 1 06:54:43 2010
New Revision: 1003406
URL: http://svn.apache.org/viewvc?rev=1003406&view=rev
Log:
SMX4-494: Upgrade to ActiveMQ 5.4.1 (part 1)
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
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=1003406&r1=1003405&r2=1003406&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Fri Oct 1 06:54:43 2010
@@ -83,6 +83,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ <version>${jasypt.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
<version>${jetty.bundle.version}</version>
</dependency>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1003406&r1=1003405&r2=1003406&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Fri Oct 1 06:54:43 2010
@@ -90,6 +90,7 @@ public class IntegrationTest extends Abs
//for activemq
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-lang"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jasypt"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.josql"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.oro"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.velocity"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1003406&r1=1003405&r2=1003406&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Oct 1 06:54:43 2010
@@ -72,7 +72,7 @@
<osgi.core.version>4.2.0</osgi.core.version>
<!-- ActiveMQ -->
- <activemq.version>5.4.0</activemq.version>
+ <activemq.version>5.4.1</activemq.version>
<!-- Camel and features linked dependencies -->
<camel.version>2.4.0</camel.version>
@@ -129,6 +129,7 @@
<ibatis-sqlmap.bundle.version>2.3.4.726_3</ibatis-sqlmap.bundle.version>
<irclib.bundle.version>1.10_3</irclib.bundle.version>
<isorelax.bundle.version>20050913_3</isorelax.bundle.version>
+ <jasypt.bundle.version>1.6_1</jasypt.bundle.version>
<jaxb-impl.bundle.version>2.1.12_2</jaxb-impl.bundle.version>
<jaxp-ri.bundle.version>1.4.2_4</jaxp-ri.bundle.version>
<jaxen.bundle.version>1.1.1_1</jaxen.bundle.version>