You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/01/25 21:44:59 UTC
[21/26] servicemix git commit: SM-2820: Upgrade to Apache Karaf 4.0.4
SM-2820: Upgrade to Apache Karaf 4.0.4
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d4b76b5b
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d4b76b5b
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d4b76b5b
Branch: refs/heads/master
Commit: d4b76b5b005e151cfe8ba817b69c151d6ca611ab
Parents: d0cc5ad
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Jan 24 22:05:00 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Jan 24 22:05:00 2016 +0100
----------------------------------------------------------------------
.../etc/org.apache.karaf.features.cfg | 13 +++++++++++++
.../servicemix-features/src/main/feature/feature.xml | 2 +-
parent/pom.xml | 10 +++++-----
3 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d4b76b5b/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 d641a04..1fb0375 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
@@ -83,6 +83,19 @@ featuresBoot = \
war
#
+# Resource repositories (OBR) that the features resolver can use
+# to resolve requirements/capabilities
+#
+# The format of the resourceRepositories is
+# resourceRepositories=[xml:url|json:url],...
+# for Instance:
+#
+#resourceRepositories=xml:http://host/path/to/index.xml
+# or
+#resourceRepositories=json:http://host/path/to/index.json
+#
+
+#
# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
#
featuresBootAsynchronous=false
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d4b76b5b/assemblies/features/servicemix-features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-features/src/main/feature/feature.xml b/assemblies/features/servicemix-features/src/main/feature/feature.xml
index 950ebe8..f202945 100644
--- a/assemblies/features/servicemix-features/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-features/src/main/feature/feature.xml
@@ -36,7 +36,7 @@
<!-- Activiti support -->
<feature name="activiti" version="${activiti.version}">
- <feature version="${jpa.version}">jpa</feature>
+ <feature version="${aries.jpa.version}">jpa</feature>
<feature version="${cxf.version}">cxf-specs</feature>
<feature version="${aries.transaction.version}">transaction</feature>
<feature version="${camel.version}">camel</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d4b76b5b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e0c3f28..6c16047 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,8 @@
<activemq.version>5.12.1</activemq.version>
<activiti.version>5.19.0.1</activiti.version>
<akka.version>2.3.9</akka.version>
- <aries.blueprint.core.version>1.4.5</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.5.0</aries.blueprint.core.version>
+ <aries.jpa.version>2.3.0</aries.jpa.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.transaction.version>1.3.0</aries.transaction.version>
<aries.util.version>1.1.1</aries.util.version>
@@ -74,15 +75,14 @@
<javax-inject.bundle.version>1_2</javax-inject.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
<jodatime2.bundle.version>2.9</jodatime2.bundle.version>
- <jpa.version>2.2.0</jpa.version>
<json4s.bundle.version>3.2.11_1</json4s.bundle.version>
- <karaf.version>4.0.3</karaf.version>
+ <karaf.version>4.0.4</karaf.version>
<mvel2.version>2.2.1.Final</mvel2.version>
<mybatis.version>3.2.8</mybatis.version>
<osgi.version>6.0.0</osgi.version>
<pax.exam.version>4.8.0</pax.exam.version>
- <pax.logging.version>1.8.4</pax.logging.version>
- <pax.url.version>2.4.3</pax.url.version>
+ <pax.logging.version>1.8.5</pax.logging.version>
+ <pax.url.version>2.4.5</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>