servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [SM-2319] Remove the connector feature (now provided by Karaf) [SM-2321] Upgrade to Karaf 3.0.2-SNAPSHOT
Date Mon, 14 Jul 2014 13:29:12 GMT
Repository: servicemix
Updated Branches:
  refs/heads/master 8c300b33d -> a041239b6


[SM-2319] Remove the connector feature (now provided by Karaf)
[SM-2321] Upgrade to Karaf 3.0.2-SNAPSHOT


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

Branch: refs/heads/master
Commit: a041239b6a82d7250513df5855c8fd14393edea6
Parents: 8c300b3
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Jul 14 15:24:17 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Jul 14 15:24:17 2014 +0200

----------------------------------------------------------------------
 assembly/src/main/filtered-resources/examples.xml | 14 +++++++-------
 assembly/src/main/filtered-resources/features.xml | 14 +-------------
 parent/pom.xml                                    |  8 ++++----
 pom.xml                                           |  2 +-
 4 files changed, 13 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/a041239b/assembly/src/main/filtered-resources/examples.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/examples.xml b/assembly/src/main/filtered-resources/examples.xml
index fde72fa..9ba6061 100644
--- a/assembly/src/main/filtered-resources/examples.xml
+++ b/assembly/src/main/filtered-resources/examples.xml
@@ -31,12 +31,12 @@
     <feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
     </feature>
     <feature name="examples-cxf-jaxrs" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
 	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
@@ -44,14 +44,14 @@
     <feature name="examples-cxf-jaxrs-blueprint" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
         <feature version="${version}">swagger</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
 	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs-blueprint/${version}</bundle>
     </feature>
     <feature name="examples-cxf-jaxws-blueprint" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
 	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-jaxws-blueprint/${version}</bundle>
@@ -107,14 +107,14 @@
     </feature>
     <feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf-core</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf-core</feature>
         <feature version="${cxf.version}">cxf-ws-security</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
@@ -127,7 +127,7 @@
         <feature version="${cxf.version}">cxf-ws-security</feature>
         <feature version="${cxf.version}">cxf-ws-rm</feature>
         <bundle dependency="true">mvn:org.apache.cxf/cxf-bundle-compatible/${cxf.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
     </feature>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/a041239b/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 3df4e88..60ad52c 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>
@@ -47,7 +35,7 @@
         <feature version="${cxf.version}">cxf-specs</feature>
         <feature version="${aries.transaction.version}">transaction</feature>
         <feature version="${camel.version}">camel</feature>
-        <feature version="${spring.version}">spring-orm</feature>
+        <feature version="[3.2,3.3)">spring-orm</feature>
         <feature version="${drools.version}">drools</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/a041239b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3666f9f..6d87e8e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -43,12 +43,12 @@
     <cxf.version>2.7.11</cxf.version>
 
     <felix.obr.version>1.6.6</felix.obr.version>
-    <karaf.version>3.0.1</karaf.version>
-    <aries.proxy.version>1.0.2</aries.proxy.version>
+    <karaf.version>3.0.2-SNAPSHOT</karaf.version>
+    <aries.proxy.version>1.0.3</aries.proxy.version>
     <aries.util.version>1.1.0</aries.util.version>
-    <aries.blueprint.core.version>1.4.0</aries.blueprint.core.version>
+    <aries.blueprint.core.version>1.4.1</aries.blueprint.core.version>
     <aries.transaction.version>1.0.1</aries.transaction.version>
-    <pax.logging.version>1.7.2</pax.logging.version>
+    <pax.logging.version>1.7.3-SNAPSHOT</pax.logging.version>
 
     <akka.version>2.2.3</akka.version>
     <scala.version>2.10.2</scala.version>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/a041239b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d1648fc..6ebc48f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
         <pax.url.version>1.3.7</pax.url.version>
         <postgresql.version>9.1-901</postgresql.version>
         <slf4j.version>1.7.5</slf4j.version>
-        <spring.version>3.2.4.RELEASE</spring.version>
+        <spring.version>3.2.9.RELEASE_1</spring.version>
         <wss4j.version>1.6.15</wss4j.version>
     </properties>
 


Mime
View raw message