servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject [1/2] git commit: SM-2345: Upgrade to ActiveMQ 5.9.1
Date Mon, 28 Jul 2014 20:52:37 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.0.x 991f33895 -> ed81ccb8a


SM-2345: Upgrade to ActiveMQ 5.9.1


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/7d0d89b6
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/7d0d89b6
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/7d0d89b6

Branch: refs/heads/servicemix-5.0.x
Commit: 7d0d89b6104284bd226466382cdb26dc945650f8
Parents: 991f338
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Mon Jul 28 22:20:14 2014 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Mon Jul 28 22:20:14 2014 +0200

----------------------------------------------------------------------
 activemq/activemq-camel/pom.xml                                | 2 +-
 activemq/activemq-service/pom.xml                              | 2 +-
 assembly/pom.xml                                               | 1 +
 .../main/filtered-resources/etc/org.apache.karaf.features.cfg  | 2 +-
 assembly/src/main/filtered-resources/features.xml              | 1 +
 assembly/src/main/filtered-resources/internal.xml              | 5 +++++
 parent/pom.xml                                                 | 6 +++---
 pom.xml                                                        | 4 ++--
 8 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/activemq/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-camel/pom.xml b/activemq/activemq-camel/pom.xml
index 758f8f5..ef543c4 100644
--- a/activemq/activemq-camel/pom.xml
+++ b/activemq/activemq-camel/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-osgi</artifactId>
+            <artifactId>activemq-camel</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/activemq/activemq-service/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-service/pom.xml b/activemq/activemq-service/pom.xml
index af7d0c6..628b735 100644
--- a/activemq/activemq-service/pom.xml
+++ b/activemq/activemq-service/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-osgi</artifactId>
+            <artifactId>activemq-camel</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f677d10..cf82736 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -153,6 +153,7 @@
                                 <descriptor>file:${basedir}/target/classes/examples.xml</descriptor>
                             </descriptors>
                             <features>
+                                <feature>joda-time</feature>
                                 <feature>cxf</feature>
                                 <feature>obr</feature>
                                 <feature>config</feature>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 3ae6292..c9f5b8f 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -30,7 +30,7 @@ featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.v
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=config,kar,ssh,management,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war
+featuresBoot=config,kar,ssh,management,joda-time,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index 3ebfd2b..3950903 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -24,6 +24,7 @@
 
     <feature name="activemq-service" version="${version}" resolver="(obr)" start-level="50">
         <feature version="${activemq.version}">activemq-broker-noweb</feature>
+        <feature version="${activemq.version}">activemq-camel</feature>
         <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.service/${version}</bundle>
         <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.camel/${version}</bundle>
     </feature>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/src/main/filtered-resources/internal.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml
index 6c81d1d..76da7fe 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -26,4 +26,9 @@
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle>
     </feature>
 
+    <!-- workaround for SM-2301 -->
+    <feature name="joda-time">
+        <bundle start-level='10'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
+    </feature>
+
 </features>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 528f06f..8a0eb6d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
 
   <!-- Properties -->
   <properties>
-    <activemq.version>5.9.0</activemq.version>
+    <activemq.version>5.9.1</activemq.version>
     <activiti.version>5.15.1</activiti.version>
     <camel.version>2.12.4</camel.version>
     <cxf.version>2.7.11</cxf.version>
@@ -55,7 +55,7 @@
     <fasterxml.jackson.version>2.2.1</fasterxml.jackson.version>
     <typesafe-config.version>1.0.2</typesafe-config.version>
     <mvel2.version>2.1.7.Final</mvel2.version>
-    <mybatis.version>3.2.5</mybatis.version>
+    <mybatis.version>3.2.7</mybatis.version>
     <jodatime.bundle.version>2.3_1</jodatime.bundle.version>
     <jpa.version>1.0.1</jpa.version>
 
@@ -106,7 +106,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-osgi</artifactId>
+        <artifactId>activemq-camel</artifactId>
         <version>${activemq.version}</version>
       </dependency>
       <!-- Activiti-->

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 264f4f8..711f67b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
         <jaxb.api.version>2.2</jaxb.api.version>
         <osgi.version>4.3.1</osgi.version>
         <scala.bundle.version>2.10.2_1</scala.bundle.version>
-        <wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version>
+        <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
         <swagger.bundle.version>1.3.0_1</swagger.bundle.version>
         <javassist.bundle.version>3.12.1.GA_2</javassist.bundle.version>
         <reflections.bundle.version>0.9.8_1</reflections.bundle.version>
@@ -130,7 +130,7 @@
         <postgresql.version>9.1-901</postgresql.version>
         <slf4j.version>1.7.5</slf4j.version>
         <spring.version>3.2.4.RELEASE</spring.version>
-        <wss4j.version>1.6.7</wss4j.version>
+        <wss4j.version>1.6.15</wss4j.version>
     </properties>
     
     <pluginRepositories>


Mime
View raw message