servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [SM-2320] Upgrade to Karaf 2.3.6-SNAPSHOT
Date Wed, 16 Jul 2014 07:31:33 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.1.x 62e6f06f0 -> 10ee82c29


[SM-2320] Upgrade to Karaf 2.3.6-SNAPSHOT


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

Branch: refs/heads/servicemix-5.1.x
Commit: 10ee82c29bbf3aee0a970c6e1b481f02f76006f0
Parents: 62e6f06
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jul 16 09:29:11 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jul 16 09:31:14 2014 +0200

----------------------------------------------------------------------
 assembly/src/main/filtered-resources/features.xml | 14 +-------------
 parent/pom.xml                                    |  3 +--
 2 files changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/10ee82c2/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 107f62c..fa9cc43 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -17,18 +17,6 @@
 -->
 <features name="servicemix-features-${version}">
 
-    <feature name="connector" version="${version}" resolver="(obr)" start-level='50'>
-        <feature version="${aries.transaction.version}">transaction</feature>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.transaction/${spring.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.context/${spring.version}</bundle>
                                      ‚
-        <bundle dependency="true">mvn:org.springframework/org.springframework.aop/${spring.version}</bundle>
-    </feature>
-
     <feature name="jms-appender" version="${version}" resolver="(obr)" start-level="50">
         <feature version="${activemq.version}">activemq-broker-noweb</feature>
         <bundle>mvn:org.apache.servicemix.logging/jms-appender/${version}</bundle>
@@ -45,7 +33,7 @@
     <feature name="activiti" version="${activiti.version}" resolver="(obr)">
 		<feature version="${jpa.version}">jpa</feature>
         <feature version="${cxf.version}">cxf-specs</feature>
-        <feature version="${aries.transaction.version}">transaction</feature>
+        <feature version="[1.0,1.1)">transaction</feature>
         <feature version="${camel.version}">camel</feature>
         <feature version="${spring.version}">spring-orm</feature>
         <feature version="${drools.version}">drools</feature>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/10ee82c2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c63cec5..47e3bb9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -43,11 +43,10 @@
     <cxf.version>2.7.11</cxf.version>
 
     <felix.obr.version>1.6.6</felix.obr.version>
-    <karaf.version>2.3.4</karaf.version>
+    <karaf.version>2.3.6-SNAPSHOT</karaf.version>
     <aries.proxy.version>1.0.2</aries.proxy.version>
     <aries.util.version>1.1.0</aries.util.version>
     <aries.blueprint.core.version>1.4.0</aries.blueprint.core.version>
-    <aries.transaction.version>1.0.1</aries.transaction.version>
     <pax.logging.version>1.7.2</pax.logging.version>
 
     <akka.version>2.2.3</akka.version>


Mime
View raw message