You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/03/07 23:50:39 UTC

servicemix git commit: SM-2412: Upgrade to Karaf 3.0.3

Repository: servicemix
Updated Branches:
  refs/heads/master b205ddfa8 -> 207f7ad6c


SM-2412: Upgrade to Karaf 3.0.3


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

Branch: refs/heads/master
Commit: 207f7ad6cbf1fd4e2d66fa7dc7af33ad78de52d1
Parents: b205ddf
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Mar 7 23:49:40 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Mar 7 23:49:40 2015 +0100

----------------------------------------------------------------------
 itests/pom.xml               |  2 +-
 logging/jms-appender/pom.xml |  2 --
 parent/pom.xml               | 23 ++++++++++++++++-------
 pom.xml                      |  6 +++---
 4 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/207f7ad6/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index d25bd3f..d2e4bec 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -63,7 +63,7 @@
 
       <dependency>
         <groupId>org.ops4j.pax.logging</groupId>
-        <artifactId>pax-logging-service</artifactId>
+        <artifactId>pax-logging-api</artifactId>
         <scope>test</scope>
       </dependency>
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/207f7ad6/logging/jms-appender/pom.xml
----------------------------------------------------------------------
diff --git a/logging/jms-appender/pom.xml b/logging/jms-appender/pom.xml
index a45f4ba..8f66ed9 100644
--- a/logging/jms-appender/pom.xml
+++ b/logging/jms-appender/pom.xml
@@ -35,12 +35,10 @@
          <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
-            <version>${pax.logging.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <version>${pax.logging.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/207f7ad6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 128577d..41337a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,16 +40,16 @@
     <activemq.version>5.10.2</activemq.version>
     <activiti.version>5.16.4</activiti.version>
     <camel.version>2.14.1</camel.version>
-    <cxf.version>3.0.2</cxf.version>
+    <cxf.version>3.0.3</cxf.version>
     <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
 
     <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
-    <karaf.version>3.0.2</karaf.version>
-    <aries.proxy.version>1.0.3</aries.proxy.version>
+    <karaf.version>3.0.3</karaf.version>
+    <aries.proxy.version>1.0.4</aries.proxy.version>
     <aries.util.version>1.1.0</aries.util.version>
-    <aries.blueprint.core.version>1.4.1</aries.blueprint.core.version>
+    <aries.blueprint.core.version>1.4.2</aries.blueprint.core.version>
     <aries.transaction.version>1.0.1</aries.transaction.version>
-    <pax.logging.version>1.7.4</pax.logging.version>
+    <pax.logging.version>1.8.1</pax.logging.version>
 
     <akka.version>2.2.3</akka.version>
     <scala.version>2.10.2</scala.version>
@@ -59,7 +59,7 @@
     <mvel2.version>2.1.7.Final</mvel2.version>
     <mybatis.version>3.2.7</mybatis.version>
     <jodatime.bundle.version>2.3_1</jodatime.bundle.version>
-    <jpa.version>1.0.1</jpa.version>
+    <jpa.version>2.1.0</jpa.version>
 
     <servicemix.specs.version>2.4.0</servicemix.specs.version>
 
@@ -404,7 +404,16 @@
         <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
         <version>${servicemix.specs.version}</version>
       </dependency>
-
+      <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-service</artifactId>
+        <version>${pax.logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <version>${pax.logging.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/207f7ad6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c0f7621..6ccab0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
         <lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
         <cobertura-maven-plugin.version>2.2</cobertura-maven-plugin.version>
-        <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
         <maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
         <exec-maven-plugin.version>1.3.2</exec-maven-plugin.version>
         <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
@@ -132,9 +132,9 @@
         <xml.api.version>2.11.0-20110622</xml.api.version>
         <xalan.version>2.7.2</xalan.version>
         <pax.exam.version>4.4.0</pax.exam.version>
-        <pax.url.version>2.2.0</pax.url.version>
+        <pax.url.version>2.3.0</pax.url.version>
         <postgresql.version>9.1-901</postgresql.version>
-        <slf4j.version>1.7.5</slf4j.version>
+        <slf4j.version>1.7.7</slf4j.version>
         <spring.version>3.2.11.RELEASE_1</spring.version>
     </properties>