[SM-2320] Prepare for release - revert "Upgrade to Karaf 2.3.6-SNAPSHOT"

This reverts commit ef9bc2ec669b2df51113c60feec536cbea486a92.


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

Branch: refs/heads/servicemix-5.0.x
Commit: 58c90b337609468b80c4a08c56d3d871afe4a217
Parents: e360cb2
Author: Gert Vanthienen <gertv@apache.org>
Authored: Tue Jul 22 07:30:56 2014 +0200
Committer: Gert Vanthienen <gertv@apache.org>
Committed: Tue Jul 22 07:30:56 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/servicemix/blob/58c90b33/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 3ebfd2b..34fb47a 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -17,6 +17,18 @@
 -->
 <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>
@@ -32,7 +44,7 @@
     <feature name="activiti" version="${activiti.version}" resolver="(obr)">
 		<feature version="${jpa.version}">jpa</feature>
         <feature version="${cxf.version}">cxf-specs</feature>
-        <feature version="[1.0,1.1)">transaction</feature>
+        <feature version="${aries.transaction.version}">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/58c90b33/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2699f0a..6c8662b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -43,10 +43,11 @@
     <cxf.version>2.7.11</cxf.version>
 
     <felix.obr.version>1.6.6</felix.obr.version>
-    <karaf.version>2.3.6-SNAPSHOT</karaf.version>
+    <karaf.version>2.3.4</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>