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-3019] Upgrade to Apache Karaf 3.0.7
Date Mon, 20 Jun 2016 20:51:03 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-6.x c65afc16b -> 69062f440


[SM-3019] Upgrade to Apache Karaf 3.0.7


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

Branch: refs/heads/servicemix-6.x
Commit: 69062f440a79708deee1faed36dadb6431963e46
Parents: c65afc1
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Mon Jun 20 22:50:06 2016 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Mon Jun 20 22:50:06 2016 +0200

----------------------------------------------------------------------
 .../main/filtered-resources/etc/org.apache.karaf.features.cfg  | 5 +++++
 parent/pom.xml                                                 | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/69062f44/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
b/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index f7ee3c1..4226ffb 100644
--- a/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -73,4 +73,9 @@ featuresBoot=\
 #
 featuresBootAsynchronous=false
 
+#
+# Store cfg file for config element in feature
+#
+#configCfgStore=true
+
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/69062f44/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5c822b0..e56c0ae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
         <activemq.version>5.12.3</activemq.version>
         <activiti.version>5.19.0.2</activiti.version>
         <akka.version>2.3.9</akka.version>
-        <aries.blueprint.core.version>1.4.4</aries.blueprint.core.version>
+        <aries.blueprint.core.version>1.6.1</aries.blueprint.core.version>
         <aries.proxy.version>1.0.4</aries.proxy.version>
         <aries.transaction.version>1.1.1</aries.transaction.version>
         <aries.util.version>1.1.1</aries.util.version>
@@ -75,13 +75,13 @@
         <jodatime2.bundle.version>2.9</jodatime2.bundle.version>
         <jpa.version>2.1.0</jpa.version>
         <json4s.bundle.version>3.2.11_1</json4s.bundle.version>
-        <karaf.version>3.0.6</karaf.version>
+        <karaf.version>3.0.7</karaf.version>
         <mvel2.version>2.2.1.Final</mvel2.version>
         <mybatis.version>3.3.0</mybatis.version>
         <osgi.version>5.0.0</osgi.version>
         <pax.exam.version>4.9.1</pax.exam.version>
         <pax.logging.version>1.8.4</pax.logging.version>
-        <pax.url.version>2.4.5</pax.url.version>
+        <pax.url.version>2.4.7</pax.url.version>
         <postgresql.version>9.1-901</postgresql.version>
         <reflections.bundle.version>0.9.10_3</reflections.bundle.version>
         <scala-2.10.version>2.10.4</scala-2.10.version>


Mime
View raw message