Repository: servicemix Updated Branches: refs/heads/servicemix-5.x 8dc9e9cdc -> 91b9f1865
SM-2816: Upgrade to Apache Karaf 2.4.4 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/84063031 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/84063031 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/84063031 Branch: refs/heads/servicemix-5.x Commit: 84063031d99dd8a64641d7b799b0baa7c4b3957c Parents: 8dc9e9c Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue Feb 16 20:40:28 2016 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue Feb 16 20:40:28 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/etc/custom.properties | 84 ++++++++++---------- .../src/main/resources/etc/system.properties | 8 +- parent/pom.xml | 6 +- 3 files changed, 49 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/84063031/assembly/src/main/resources/etc/custom.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/custom.properties b/assembly/src/main/resources/etc/custom.properties index eff5579..c4f43b6 100644 --- a/assembly/src/main/resources/etc/custom.properties +++ b/assembly/src/main/resources/etc/custom.properties @@ -37,48 +37,48 @@ org.osgi.framework.system.packages.extra = \ com.sun.org.apache.xerces.internal.jaxp, \ com.sun.org.apache.xerces.internal.xni, \ com.sun.jndi.ldap, \ - org.apache.xalan.extensions; version="2.7.1", \ - org.apache.xalan.xsltc.compiler; version="2.7.1", \ - org.apache.xalan.xsltc.cmdline.getopt; version="2.7.1", \ - org.apache.xalan.xsltc.util; version="2.7.1", \ - org.apache.xalan.transformer; version="2.7.1", \ - org.apache.xalan.xsltc.trax; version="2.7.1", \ - org.apache.xalan.processor; version="2.7.1", \ - org.apache.xalan.lib; version="2.7.1", \ - org.apache.xalan.trace; version="2.7.1", \ - org.apache.xalan.xsltc.compiler.util; version="2.7.1", \ - org.apache.xalan.templates; version="2.7.1", \ - org.apache.xalan.xsltc; version="2.7.1", \ - org.apache.xalan.xsltc.runtime; version="2.7.1", \ - org.apache.xalan; version="2.7.1", \ - org.apache.xalan.xslt; version="2.7.1", \ - org.apache.xalan.lib.sql; version="2.7.1", \ - org.apache.xalan.xsltc.runtime.output; version="2.7.1", \ - org.apache.xalan.xsltc.dom; version="2.7.1", \ - org.apache.xalan.client; version="2.7.1", \ - org.apache.xalan.xsltc.cmdline; version="2.7.1", \ - org.apache.xalan.serialize; version="2.7.1", \ - org.apache.xalan.res; version="2.7.1", \ - org.apache.xml.dtm.ref; version="2.7.1", \ - org.apache.xml.dtm; version="2.7.1", \ - org.apache.xml.dtm.ref.sax2dtm; version="2.7.1", \ - org.apache.xml.dtm.ref.dom2dtm; version="2.7.1", \ - org.apache.xml.res; version="2.7.1", \ - org.apache.xml.serializer.dom3; version="2.7.1", \ - org.apache.xml.serializer; version="2.7.1", \ - org.apache.xml.serializer.utils; version="2.7.1", \ - org.apache.xml.utils.res; version="2.7.1", \ - org.apache.xml.utils; version="2.7.1", \ - org.apache.xpath.functions; version="2.7.1", \ - org.apache.xpath.jaxp; version="2.7.1", \ - org.apache.xpath.patterns; version="2.7.1", \ - org.apache.xpath.objects; version="2.7.1", \ - org.apache.xpath.res; version="2.7.1", \ - org.apache.xpath; version="2.7.1", \ - org.apache.xpath.axes; version="2.7.1", \ - org.apache.xpath.compiler; version="2.7.1", \ - org.apache.xpath.operations; version="2.7.1", \ - org.apache.xpath.domapi; version="2.7.1", \ + org.apache.xalan.extensions; version="2.7.2", \ + org.apache.xalan.xsltc.compiler; version="2.7.2", \ + org.apache.xalan.xsltc.cmdline.getopt; version="2.7.2", \ + org.apache.xalan.xsltc.util; version="2.7.2", \ + org.apache.xalan.transformer; version="2.7.2", \ + org.apache.xalan.xsltc.trax; version="2.7.2", \ + org.apache.xalan.processor; version="2.7.2", \ + org.apache.xalan.lib; version="2.7.2", \ + org.apache.xalan.trace; version="2.7.2", \ + org.apache.xalan.xsltc.compiler.util; version="2.7.2", \ + org.apache.xalan.templates; version="2.7.2", \ + org.apache.xalan.xsltc; version="2.7.2", \ + org.apache.xalan.xsltc.runtime; version="2.7.2", \ + org.apache.xalan; version="2.7.2", \ + org.apache.xalan.xslt; version="2.7.2", \ + org.apache.xalan.lib.sql; version="2.7.2", \ + org.apache.xalan.xsltc.runtime.output; version="2.7.2", \ + org.apache.xalan.xsltc.dom; version="2.7.2", \ + org.apache.xalan.client; version="2.7.2", \ + org.apache.xalan.xsltc.cmdline; version="2.7.2", \ + org.apache.xalan.serialize; version="2.7.2", \ + org.apache.xalan.res; version="2.7.2", \ + org.apache.xml.dtm.ref; version="2.7.2", \ + org.apache.xml.dtm; version="2.7.2", \ + org.apache.xml.dtm.ref.sax2dtm; version="2.7.2", \ + org.apache.xml.dtm.ref.dom2dtm; version="2.7.2", \ + org.apache.xml.res; version="2.7.2", \ + org.apache.xml.serializer.dom3; version="2.7.2", \ + org.apache.xml.serializer; version="2.7.2", \ + org.apache.xml.serializer.utils; version="2.7.2", \ + org.apache.xml.utils.res; version="2.7.2", \ + org.apache.xml.utils; version="2.7.2", \ + org.apache.xpath.functions; version="2.7.2", \ + org.apache.xpath.jaxp; version="2.7.2", \ + org.apache.xpath.patterns; version="2.7.2", \ + org.apache.xpath.objects; version="2.7.2", \ + org.apache.xpath.res; version="2.7.2", \ + org.apache.xpath; version="2.7.2", \ + org.apache.xpath.axes; version="2.7.2", \ + org.apache.xpath.compiler; version="2.7.2", \ + org.apache.xpath.operations; version="2.7.2", \ + org.apache.xpath.domapi; version="2.7.2", \ org.apache.html.dom; version="2.11.0", \ org.apache.wml.dom; version="2.11.0", \ org.apache.wml; version="2.11.0", \ http://git-wip-us.apache.org/repos/asf/servicemix/blob/84063031/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 827aa56..2f0fe5a 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 @@ -167,10 +171,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/84063031/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a2403cc..3db3d1f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -73,12 +73,12 @@ <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>2.4.3</karaf.version> + <karaf.version>2.4.4</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.6.0</pax.exam.version> - <pax.logging.version>1.8.3</pax.logging.version> + <pax.logging.version>1.8.4</pax.logging.version> <pax.url.version>2.4.1</pax.url.version> <postgresql.version>9.1-901</postgresql.version> <reflections.bundle.version>0.9.10_3</reflections.bundle.version> @@ -87,7 +87,7 @@ <scala.version>2.11.7</scala.version> <servicemix.specs.version>2.5.0</servicemix.specs.version> <slf4j.version>1.7.12</slf4j.version> - <spring.version>3.2.11.RELEASE_1</spring.version> + <spring.version>3.2.14.RELEASE_1</spring.version> <swagger.bundle.version>1.3.12_1</swagger.bundle.version> <swagger.core.bundle.version>1.3.12_2</swagger.core.bundle.version> <swagger.version>1.3.12</swagger.version>
