servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1398618 - in /servicemix/smx4/features/trunk: ./ assemblies/apache-servicemix/src/main/filtered-resources/ itests/tests/ itests/tests/src/test/java/org/apache/servicemix/examples/ parent/
Date Tue, 16 Oct 2012 02:27:44 GMT
Author: ffang
Date: Tue Oct 16 02:27:44 2012
New Revision: 1398618

URL: http://svn.apache.org/viewvc?rev=1398618&view=rev
Log:
[SMX4-1263]upgrade to activemq 5.7.0 

Modified:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/itests/tests/pom.xml
    servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
    servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/parent/pom.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1398618&r1=1398617&r2=1398618&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Tue Oct 16 02:27:44 2012
@@ -181,7 +181,7 @@
         <feature version="${servicemix.components.version}">servicemix-shared</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
         <bundle dependency="true">mvn:commons-net/commons-net/${commons-net.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+        <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix.components.version}</bundle>
     </feature>
     <feature name="servicemix-http" version="${servicemix.components.version}" resolver="(obr)"
start-level='50'>

Modified: servicemix/smx4/features/trunk/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/pom.xml?rev=1398618&r1=1398617&r2=1398618&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/itests/tests/pom.xml Tue Oct 16 02:27:44 2012
@@ -309,8 +309,8 @@
             <artifactId>geronimo-jta_1.1_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>

Modified: servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1398618&r1=1398617&r2=1398618&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++ servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Tue Oct 16 02:27:44 2012
@@ -75,7 +75,7 @@ public class CXFNMRIntegrationTest exten
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl"),
             getBundle("org.apache.neethi", "neethi"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.saaj-impl"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
+            getBundle("commons-pool", "commons-pool"),
             getBundle("org.codehaus.woodstox", "stax2-api"),
             getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.dom4j"),

Modified: servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1398618&r1=1398617&r2=1398618&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++ servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Tue Oct 16 02:27:44 2012
@@ -87,7 +87,7 @@ public class IntegrationTest extends Abs
             getBundle("org.springframework", "spring-tx"),
             getBundle("org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-jms_1.1_spec"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
+            getBundle("commons-pool", "commons-pool"),
             getBundle("org.apache.xbean", "xbean-spring"),
             getBundle("org.apache.activemq", "activemq-core"),
             getBundle("org.apache.activemq", "activemq-ra"),

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1398618&r1=1398617&r2=1398618&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Tue Oct 16 02:27:44 2012
@@ -37,7 +37,7 @@
 
   <!-- Properties -->
   <properties>
-    <activemq.version>5.5.1</activemq.version>
+    <activemq.version>5.7.0</activemq.version>
     <activiti.version>5.9</activiti.version>
     <camel.version>2.10.1</camel.version>
     <cxf.version>2.6.2</cxf.version>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1398618&r1=1398617&r2=1398618&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Oct 16 02:27:44 2012
@@ -156,7 +156,7 @@
         <commons-httpclient.bundle.version>3.1_6</commons-httpclient.bundle.version>
         <commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
         <commons-net.bundle.version>2.2</commons-net.bundle.version>
-        <commons-pool.bundle.version>1.5.4_2</commons-pool.bundle.version>
+        <commons-pool.version>1.6</commons-pool.version>
         <commons-vfs.bundle.version>1.0_5</commons-vfs.bundle.version>
         <drools.bundle.version>5.1.1_1</drools.bundle.version>
         <fastinfoset.bundle.version>1.2.7_3</fastinfoset.bundle.version>
@@ -370,9 +370,9 @@
                <version>${commons-net.bundle.version}</version>
            </dependency>
            <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-               <version>${commons-pool.bundle.version}</version>
+               <groupId>commons-pool</groupId>
+               <artifactId>commons-pool</artifactId>
+               <version>${commons-pool.version}</version>
            </dependency>
            <dependency>
                <groupId>org.apache.servicemix.bundles</groupId>



Mime
View raw message