Repository: servicemix Updated Branches: refs/heads/servicemix-6.0.x 44376da76 -> d10e534fa
[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/d10e534f Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d10e534f Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d10e534f Branch: refs/heads/servicemix-6.0.x Commit: d10e534fa99d176d7295295fbdff2d6da6f2d491 Parents: 44376da Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue Jun 21 20:43:38 2016 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue Jun 21 20:43:38 2016 +0200 ---------------------------------------------------------------------- .../filtered-resources/etc/org.apache.karaf.features.cfg | 5 ++++- parent/pom.xml | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/d10e534f/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg index ab83c53..0e54736 100644 --- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg +++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg @@ -74,4 +74,7 @@ featuresBoot=\ # featuresBootAsynchronous=false - +# +# Store cfg file for config element in feature +# +#configCfgStore=true http://git-wip-us.apache.org/repos/asf/servicemix/blob/d10e534f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7fa4a46..69af163 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,7 +41,7 @@ <activemq.version>5.12.3</activemq.version> <activiti.version>5.17.0</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> @@ -74,13 +74,13 @@ <jodatime2.bundle.version>2.6</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.2.8</mybatis.version> <osgi.version>5.0.0</osgi.version> <pax.exam.version>4.6.0</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.9_1</reflections.bundle.version> <scala-2.10.version>2.10.4</scala-2.10.version> @@ -95,7 +95,7 @@ <thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version> <typesafe-config.version>1.2.0</typesafe-config.version> <wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version> - <xalan.bundle.version>2.7.2_2</xalan.bundle.version> + <xalan.bundle.version>2.7.2_3</xalan.bundle.version> <xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version> <xerces.version>2.11.0</xerces.version> <xml.api.version>2.11.0-20110622</xml.api.version>
