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/02/23 21:30:38 UTC
servicemix git commit: SM-2861: Upgrade to Apache Karaf 3.0.6
Repository: servicemix
Updated Branches:
refs/heads/servicemix-6.0.x 69397a4a3 -> d2a326745
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/d2a32674
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d2a32674
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d2a32674
Branch: refs/heads/servicemix-6.0.x
Commit: d2a3267459e97aec7389d9baa0e2f94ed584dbf6
Parents: 69397a4
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue Feb 23 21:21:27 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue Feb 23 21:21:27 2016 +0100
----------------------------------------------------------------------
assembly/src/main/resources/etc/system.properties | 12 ++++++++----
parent/pom.xml | 6 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d2a32674/assembly/src/main/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/system.properties b/assembly/src/main/resources/etc/system.properties
index 7f8b389..02446f5 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/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/d2a32674/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5b23e66..e456437 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,19 +74,19 @@
<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.5</karaf.version>
+ <karaf.version>3.0.6</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.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.9_1</reflections.bundle.version>
<scala-2.10.version>2.10.4</scala-2.10.version>
<scala-xml.version>1.0.4</scala-xml.version>
<scala.version>2.11.5</scala.version>
- <servicemix.specs.version>2.5.0</servicemix.specs.version>
+ <servicemix.specs.version>2.6.0</servicemix.specs.version>
<slf4j.version>1.7.12</slf4j.version>
<spring.version>3.2.14.RELEASE_1</spring.version>
<swagger.bundle.version>1.3.12_1</swagger.bundle.version>