You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2013/07/12 16:50:33 UTC

svn commit: r1502580 - in /activemq/trunk: activemq-blueprint/pom.xml pom.xml

Author: davsclaus
Date: Fri Jul 12 14:50:33 2013
New Revision: 1502580

URL: http://svn.apache.org/r1502580
Log:
Dependency upgrades and better aligned with Camel 2.12.

Modified:
    activemq/trunk/activemq-blueprint/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-blueprint/pom.xml?rev=1502580&r1=1502579&r2=1502580&view=diff
==============================================================================
--- activemq/trunk/activemq-blueprint/pom.xml (original)
+++ activemq/trunk/activemq-blueprint/pom.xml Fri Jul 12 14:50:33 2013
@@ -32,8 +32,8 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-        org.apache.xbean*;version="[3.7,4)",
-        org.apache.aries.blueprint.*;version="[0.3,2)",
+        org.apache.xbean*;version="[3.13,4)",
+        org.apache.aries.blueprint.*;version="[1.0,2)",
           *
     </activemq.osgi.import.pkg>
   </properties>
@@ -43,6 +43,7 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <version>${aries-version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1502580&r1=1502579&r2=1502580&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Jul 12 14:50:33 2013
@@ -48,17 +48,17 @@
     <axion-version>1.0-M3-dev</axion-version>
     <camel-version>2.12-SNAPSHOT</camel-version>
     <camel-version-range>[2.12,3)</camel-version-range>
-    <cglib-version>2.0</cglib-version>
+    <cglib-version>2.2</cglib-version>
     <commons-beanutils-version>1.8.3</commons-beanutils-version>
     <commons-collections-version>3.2.1</commons-collections-version>
     <commons-daemon-version>1.0.15</commons-daemon-version>
     <commons-dbcp-version>1.4</commons-dbcp-version>
     <commons-io-version>1.4</commons-io-version>
     <commons-lang-version>2.6</commons-lang-version>
-    <commons-logging-version>1.1.2</commons-logging-version>
+    <commons-logging-version>1.1.3</commons-logging-version>
     <commons-pool-version>1.6</commons-pool-version>
     <commons-primitives-version>1.0</commons-primitives-version>
-    <commons-net-version>3.2</commons-net-version>
+    <commons-net-version>3.3</commons-net-version>
     <directory-version>2.0.0-M6</directory-version>
     <hawtio-version>1.2-M1</hawtio-version>
 
@@ -69,12 +69,12 @@
     <hawtdispatch-version>1.17</hawtdispatch-version>
     <howl-version>0.1.8</howl-version>
     <hsqldb-version>1.8.0.12</hsqldb-version>
-    <httpclient-version>4.2.3</httpclient-version>
-    <httpcore-version>4.2.3</httpcore-version>
-    <jackson-version>1.9.10</jackson-version>
+    <httpclient-version>4.2.5</httpclient-version>
+    <httpcore-version>4.2.4</httpcore-version>
+    <jackson-version>1.9.12</jackson-version>
     <jasypt-version>1.9.0</jasypt-version>
     <jdom-version>1.0</jdom-version>
-    <jetty-version>7.6.7.v20120910</jetty-version>
+    <jetty-version>7.6.9.v20130131</jetty-version>
     <jmdns-version>3.4.1</jmdns-version>
     <jsp-version>2.1.v20100127</jsp-version>
     <jstl-version>1.1.2</jstl-version>
@@ -109,20 +109,20 @@
     <scalatest-version>1.8</scalatest-version>
     <slf4j-version>1.6.6</slf4j-version>
     <snappy-version>1.1.0-M3</snappy-version>
-    <spring-version>3.1.3.RELEASE</spring-version>
+    <spring-version>3.2.3.RELEASE</spring-version>
     <spring-osgi-version>1.2.1</spring-osgi-version>
     <spring-oxm-version>1.5.10</spring-oxm-version>
     <stax2-api-version>3.0.2</stax2-api-version>
     <velocity-version>1.7</velocity-version>
     <woodstox-core-asl-version>4.1.4</woodstox-core-asl-version>
     <xalan-version>2.7.1</xalan-version>
-    <xmlbeans-version>2.5.0</xmlbeans-version>
-    <xmlbeans-bundle-version>2.5.0_2</xmlbeans-bundle-version>
+    <xmlbeans-version>2.6.0</xmlbeans-version>
+    <xmlbeans-bundle-version>2.6.0_2</xmlbeans-bundle-version>
     <xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
     <xpp3-version>1.1.4c</xpp3-version>
     <xstream-version>1.4.4</xstream-version>
     <xbean-version>3.13</xbean-version>
-    <xerces-version>2.9.1</xerces-version>
+    <xerces-version>2.11.0</xerces-version>
     <zookeeper-version>3.4.5</zookeeper-version>
 
     <pax-exam-version>2.6.0</pax-exam-version>