You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2014/02/18 03:57:08 UTC
svn commit: r1569168 - in /servicemix/smx5/trunk: ./ akka/akka-osgi-aries/
assemblies/apache-servicemix-full/src/main/filtered-resources/etc/
assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/
assemblies/apache-servicemix/src/main/fi...
Author: gertv
Date: Tue Feb 18 02:57:08 2014
New Revision: 1569168
URL: http://svn.apache.org/r1569168
Log:
SM-2236: Some additional version upgrades
Thanks to Krzysztof for the patch!
Modified:
servicemix/smx5/trunk/akka/akka-osgi-aries/pom.xml
servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml
servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/system.properties
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
servicemix/smx5/trunk/parent/pom.xml
servicemix/smx5/trunk/pom.xml
Modified: servicemix/smx5/trunk/akka/akka-osgi-aries/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/akka/akka-osgi-aries/pom.xml?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/akka/akka-osgi-aries/pom.xml (original)
+++ servicemix/smx5/trunk/akka/akka-osgi-aries/pom.xml Tue Feb 18 02:57:08 2014
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>${aries.version}</version>
+ <version>${aries.blueprint.core.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>${aries.version}</version>
+ <version>${aries.proxy.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Feb 18 02:57:08 2014
@@ -27,3 +27,9 @@ featuresRepositories=mvn:org.apache.kara
#
featuresBoot=karaf-framework,config,activemq-broker-noweb,jaxrs-api,camel,camel-cxf,camel-blueprint,war
+#
+# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
+#
+featuresBootAsynchronous=false
+
+
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Feb 18 02:57:08 2014
@@ -27,3 +27,7 @@ featuresRepositories=mvn:org.apache.kara
#
featuresBoot=karaf-framework,config,core
+#
+# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
+#
+featuresBootAsynchronous=false
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Feb 18 02:57:08 2014
@@ -27,3 +27,9 @@ featuresRepositories=mvn:org.apache.kara
#
featuresBoot=karaf-framework,config,activemq-broker-noweb,jaxrs-api,camel,camel-cxf,camel-blueprint,war
+#
+# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
+#
+featuresBootAsynchronous=false
+
+
Modified: servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml Tue Feb 18 02:57:08 2014
@@ -50,9 +50,11 @@
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
<include>xalan:xalan</include>
<include>xalan:serializer</include>
+ <include>org.apache.xerces:xercesImpl</include>
</includes>
</dependencySet>
</dependencySets>
Modified: servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/system.properties?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/system.properties (original)
+++ servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/system.properties Tue Feb 18 02:57:08 2014
@@ -77,6 +77,12 @@ xml.catalog.files=
jline.nobell=true
#
+# ServiceMix specs options
+#
+org.apache.servicemix.specs.debug=false
+org.apache.servicemix.specs.timeout=100
+
+#
# Default port for the OSGI HTTP Service
#
org.osgi.service.http.port=8181
@@ -129,4 +135,4 @@ org.eclipse.jetty.util.log.class=org.ecl
#
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.*
\ No newline at end of file
+org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
Modified: servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala (original)
+++ servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala Tue Feb 18 02:57:08 2014
@@ -54,7 +54,7 @@ trait IntegrationTestConfigurations {
karafDistributionConfiguration().
frameworkUrl(
maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("tar.gz").versionAsInProject()).
- karafVersion("2.3.1").name("Apache ServiceMix (${name})").
+ karafVersion("2.3.3").name("Apache ServiceMix (${name})").
unpackDirectory(new File(s"target/pax-exam/${artifact}")).
useDeployFolder(false),
keepRuntimeFolder(),
Modified: servicemix/smx5/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Tue Feb 18 02:57:08 2014
@@ -45,7 +45,9 @@
<felix.obr.version>1.6.6</felix.obr.version>
<karaf.version>2.3.3</karaf.version>
- <aries.version>1.0.0</aries.version>
+ <aries.proxy.version>1.0.1</aries.proxy.version>
+ <aries.util.version>1.1.0</aries.util.version>
+ <aries.blueprint.core.version>1.1.0</aries.blueprint.core.version>
<aries.transaction.version>1.0.1</aries.transaction.version>
<pax.logging.version>1.7.2</pax.logging.version>
Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1569168&r1=1569167&r2=1569168&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Tue Feb 18 02:57:08 2014
@@ -157,10 +157,10 @@
<antlr.bundle.version>3.0.1_6</antlr.bundle.version>
<antlr-runtime.bundle.version>3.0.1_2</antlr-runtime.bundle.version>
<bcel.bundle.version>5.2_3</bcel.bundle.version>
- <commons-beanutils.bundle.version>1.8.2_1</commons-beanutils.bundle.version>
- <commons-codec.bundle.version>1.4</commons-codec.bundle.version>
+ <commons-beanutils.bundle.version>1.8.3_1</commons-beanutils.bundle.version>
+ <commons-codec.bundle.version>1.8</commons-codec.bundle.version>
<commons-dbcp.bundle.version>1.4_3</commons-dbcp.bundle.version>
- <commons-httpclient.bundle.version>3.1_6</commons-httpclient.bundle.version>
+ <commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version>
<commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
<commons-net.bundle.version>2.2</commons-net.bundle.version>
<commons-pool.version>1.6</commons-pool.version>
@@ -170,7 +170,7 @@
<dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
<fastinfoset.bundle.version>1.2.7_3</fastinfoset.bundle.version>
- <jasypt.bundle.version>1.9.0_1</jasypt.bundle.version>
+ <jasypt.bundle.version>1.9.1_1</jasypt.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
<jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version>
<jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
@@ -184,10 +184,10 @@
<osworkflow.bundle.version>2.7.0_4</osworkflow.bundle.version>
<oro.bundle.version>2.0.8_4</oro.bundle.version>
<propertyset.bundle.version>1.3_4</propertyset.bundle.version>
- <quartz.bundle.version>1.8.5_1</quartz.bundle.version>
+ <quartz.bundle.version>1.8.6_1</quartz.bundle.version>
<rhino.bundle.version>1.7R1_3</rhino.bundle.version>
<saaj-impl.bundle.version>1.3.9_2</saaj-impl.bundle.version>
- <saxon.bundle.version>9.3.0.11_2</saxon.bundle.version>
+ <saxon.bundle.version>9.5.1.2_1</saxon.bundle.version>
<scala.bundle.version>2.10.0_1</scala.bundle.version>
<snmp4j.bundle.version>1.8.1_4</snmp4j.bundle.version>
<velocity.bundle.version>1.7_5</velocity.bundle.version>
@@ -198,7 +198,7 @@
<xmlresolver.bundle.version>1.2_3</xmlresolver.bundle.version>
<xmlsec.bundle.version>1.5.1</xmlsec.bundle.version>
<xpp3.bundle.version>1.1.4c_5</xpp3.bundle.version>
- <xstream.bundle.version>1.3_3</xstream.bundle.version>
+ <xstream.bundle.version>1.4.5_1</xstream.bundle.version>
<swagger.bundle.version>1.3.0_1</swagger.bundle.version>
<javassist.bundle.version>3.12.1.GA_2</javassist.bundle.version>
<reflections.bundle.version>0.9.8_1</reflections.bundle.version>
@@ -232,7 +232,7 @@
<xalan.version>2.7.1</xalan.version>
<jaxws-api.version>2.2</jaxws-api.version>
<jetty.version>7.4.5.v20110725</jetty.version>
- <jettison.version>1.3</jettison.version>
+ <jettison.version>1.3.5</jettison.version>
<joda-time.version>1.6.2</joda-time.version>
<lingo.version>1.3</lingo.version>
<mybatis.version>3.1.1</mybatis.version>
@@ -250,7 +250,7 @@
<wss4j.version>1.6.7</wss4j.version>
<neethi.version>3.0.0</neethi.version>
<xfire.version>1.0.1</xfire.version>
- <xbean.version>3.12</xbean.version>
+ <xbean.version>3.15</xbean.version>
<xmlschema.version>2.0</xmlschema.version>
</properties>