Repository: servicemix Updated Branches: refs/heads/servicemix-5.1.x ddaac86cc -> 83154cd8b
SM-2431: Upgrade to Karaf 2.3.10 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/573b9927 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/573b9927 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/573b9927 Branch: refs/heads/servicemix-5.1.x Commit: 573b992715c0cc8c002b76aa19fb657755ac4e8e Parents: ddaac86 Author: Krzysztof Sobkowiak <[email protected]> Authored: Sat Mar 7 16:09:39 2015 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Sat Mar 7 16:09:39 2015 +0100 ---------------------------------------------------------------------- .../etc/org.apache.karaf.features.cfg | 25 ++++++++++++++++++-- .../resources/etc/org.ops4j.pax.url.mvn.cfg | 3 ++- .../src/main/resources/etc/system.properties | 20 ++++++++-------- parent/pom.xml | 4 ++-- 4 files changed, 37 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/573b9927/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 23bf5db..40aca51 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 @@ -25,12 +25,33 @@ respectStartLvlDuringFeatureStartup=true # # Comma separated list of features repositories to register by default # -featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features +featuresRepositories=\ + mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,\ + mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,\ + mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,\ + mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,\ + mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,\ + mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,\ + mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features # # Comma separated list of features to install at startup # -featuresBoot=config,kar,ssh,management,joda-time,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,cxf,camel-cxf,camel-blueprint,activemq-service,war +featuresBoot=\ + config,\ + kar,\ + ssh,\ + management,\ + joda-time,\ + eventadmin,\ + activemq-broker-noweb,\ + jaxrs-api,\ + activemq-camel,\ + cxf,\ + camel-cxf,\ + camel-blueprint,\ + activemq-service,\ + war # # Defines if the boot features are started in asynchronous mode (in a dedicated thread) http://git-wip-us.apache.org/repos/asf/servicemix/blob/573b9927/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg index f4ebff5..c55866c 100644 --- a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -73,7 +73,8 @@ org.ops4j.pax.url.mvn.disableAether=true # # The following property value will add the system folder as a repo. # -org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository},\ +org.ops4j.pax.url.mvn.defaultRepositories= \ + file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository}, \ file:${karaf.home}/local-repo@snapshots@id=karaf.local-repo # http://git-wip-us.apache.org/repos/asf/servicemix/blob/573b9927/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 101a824..07b7f28 100644 --- a/assembly/src/main/resources/etc/system.properties +++ b/assembly/src/main/resources/etc/system.properties @@ -87,6 +87,15 @@ org.apache.servicemix.specs.debug=false org.apache.servicemix.specs.timeout=0 # +# Settings for the OSGi 4.3 Weaving +# By default, we will not weave any classes. Change this setting to include classes +# that you application needs to have woven. +# +org.apache.aries.proxy.weaving.enabled=none +# Classes not to weave - Aries default + Xerces which is known to have issues. +org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.* + +# # Default port for the OSGI HTTP Service # org.osgi.service.http.port=8181 @@ -118,13 +127,4 @@ javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFac # # CXF Log configuration # -org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger - -# -# Settings for the OSGi 4.3 Weaving -# By default, we will not weave any classes. Change this setting to include classes -# that you application needs to have woven. -# -org.apache.aries.proxy.weaving.enabled=none -# Classes not to weave - Aries default + Xerces which is known to have issues. -org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.* +org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger \ No newline at end of file http://git-wip-us.apache.org/repos/asf/servicemix/blob/573b9927/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1c7237c..ac9f665 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -37,14 +37,14 @@ <!-- Properties --> <properties> - <activemq.version>5.10.1</activemq.version> + <activemq.version>5.10.2</activemq.version> <activiti.version>5.15.1</activiti.version> <camel.version>2.13.3</camel.version> <cxf.version>2.7.13</cxf.version> <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version> <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version> - <karaf.version>2.3.9</karaf.version> + <karaf.version>2.3.10</karaf.version> <aries.proxy.version>1.0.2</aries.proxy.version> <aries.util.version>1.1.0</aries.util.version> <aries.blueprint.core.version>1.4.0</aries.blueprint.core.version>
