servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject servicemix git commit: SM-2404: Upgrade to Karaf 2.4.1
Date Sat, 10 Jan 2015 13:22:40 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.4.x 7ce06e6ee -> 1ab6dc930


SM-2404: Upgrade to Karaf 2.4.1


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

Branch: refs/heads/servicemix-5.4.x
Commit: 1ab6dc930266a914575cfa6003d1f648bc429fcd
Parents: 7ce06e6
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Sat Jan 10 14:00:50 2015 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Sat Jan 10 14:08:45 2015 +0100

----------------------------------------------------------------------
 assembly/pom.xml |  7 +++++++
 itests/pom.xml   |  2 +-
 parent/pom.xml   | 10 +++++-----
 pom.xml          |  6 +++---
 4 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/1ab6dc93/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ebf8c18..f0b77fa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -177,6 +177,13 @@
                         <inherited>false</inherited>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-http-lightweight</artifactId>
+                        <version>2.6</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/1ab6dc93/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 580eb62..f1ff3ac 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/1ab6dc93/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eef9512..b54ab5c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -44,11 +44,11 @@
     <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
 
     <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
-    <karaf.version>2.4.0</karaf.version>
-    <aries.proxy.version>1.0.3</aries.proxy.version>
+    <karaf.version>2.4.1</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>
-    <pax.logging.version>1.7.4</pax.logging.version>
+    <aries.blueprint.core.version>1.4.2</aries.blueprint.core.version>
+    <pax.logging.version>1.8.1</pax.logging.version>
 
     <akka.version>2.2.3</akka.version>
     <scala.version>2.10.2</scala.version>
@@ -58,7 +58,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>
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/1ab6dc93/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 37e5d46..1712342 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.16</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,10 +132,10 @@
         <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>
-        <spring.version>3.2.9.RELEASE_1</spring.version>
+        <spring.version>3.2.11.RELEASE_1</spring.version>
         <wss4j.version>1.6.15</wss4j.version>
     </properties>
     


Mime
View raw message