Repository: servicemix Updated Branches: refs/heads/servicemix-6.x 2883ed7c9 -> d20f88f30
SM-2861: Upgrade to Apache Karaf 3.0.6 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d20f88f3 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d20f88f3 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d20f88f3 Branch: refs/heads/servicemix-6.x Commit: d20f88f30a22ffb85f64102bc1e25078b95f19c2 Parents: 2883ed7 Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue Feb 23 21:21:27 2016 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue Feb 23 21:38:49 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/etc/system.properties | 12 ++++++++---- parent/pom.xml | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/d20f88f3/assemblies/apache-servicemix/src/main/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/src/main/resources/etc/system.properties b/assemblies/apache-servicemix/src/main/resources/etc/system.properties index 7f8b389..02446f5 100644 --- a/assemblies/apache-servicemix/src/main/resources/etc/system.properties +++ b/assemblies/apache-servicemix/src/main/resources/etc/system.properties @@ -97,6 +97,10 @@ karaf.clean.cache = false org.apache.servicemix.specs.debug=false org.apache.servicemix.specs.timeout=0 +javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl +javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl + + # # Settings for the OSGi 4.3 Weaving # By default, we will not weave any classes. Change this setting to include classes @@ -141,6 +145,10 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) # You can specify the location of the lock file using the # karaf.lock.dir=/path/to/the/directory/containing/the/lock # +# By default, the slave instances start but are passive. +# If you want to prevent the slave instances startup, you can use +# the karaf.lock.slave.block property (false by default): +# karaf.lock.slave.block=true # # Default port for the OSGI HTTP Service @@ -167,10 +175,6 @@ activemq.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name activemq.jmx.user=smx activemq.jmx.password=smx - -javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl - # # CXF Log configuration # http://git-wip-us.apache.org/repos/asf/servicemix/blob/d20f88f3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b637f9b..934cbb4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -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.5</karaf.version> + <karaf.version>3.0.6</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.8.0</pax.exam.version> <pax.logging.version>1.8.4</pax.logging.version> - <pax.url.version>2.4.1</pax.url.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>
