You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2014/02/20 08:32:39 UTC
svn commit: r1570094 - in /servicemix/smx5/trunk: ./
assemblies/shared/src/main/resources/etc/
itests/src/test/scala/org/apache/servicemix/itests/ parent/
Author: ffang
Date: Thu Feb 20 07:32:38 2014
New Revision: 1570094
URL: http://svn.apache.org/r1570094
Log:
[SM-2241]Upgrade to Karaf 2.3.4
Modified:
servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties
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/assemblies/shared/src/main/resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties?rev=1570094&r1=1570093&r2=1570094&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties (original)
+++ servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/jre.properties Thu Feb 20 07:32:38 2014
@@ -190,8 +190,8 @@ jre-1.7= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
+ javax.annotation;version="1.2", \
+ javax.annotation.processing;version="1.2", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
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=1570094&r1=1570093&r2=1570094&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 Thu Feb 20 07:32:38 2014
@@ -49,6 +49,11 @@ karaf.default.repository=system
#
karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+# Sets the maximum size of the shell command history. If not set,
+# defaults to 500 entries. Setting to 0 will disable history.
+#
+# karaf.shell.history.maxSize=0
+
#
# Default role name used for console authorization (JMX, SSH and WEB)
# The syntax is the following:
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=1570094&r1=1570093&r2=1570094&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 Thu Feb 20 07:32:38 2014
@@ -51,7 +51,7 @@ trait IntegrationTestConfigurations {
karafDistributionConfiguration().
frameworkUrl(
maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("tar.gz").versionAsInProject()).
- karafVersion("2.3.3").name("Apache ServiceMix (${name})").
+ karafVersion("2.3.4").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=1570094&r1=1570093&r2=1570094&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Thu Feb 20 07:32:38 2014
@@ -44,10 +44,10 @@
<felix.obr.version>1.6.6</felix.obr.version>
- <karaf.version>2.3.3</karaf.version>
- <aries.proxy.version>1.0.1</aries.proxy.version>
+ <karaf.version>2.3.4</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.1.0</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.3.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=1570094&r1=1570093&r2=1570094&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Thu Feb 20 07:32:38 2014
@@ -161,7 +161,7 @@
<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_7</commons-httpclient.bundle.version>
- <commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
+ <commons-lang.bundle.version>2.6</commons-lang.bundle.version>
<commons-net.bundle.version>2.2</commons-net.bundle.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-io.version>2.4</commons-io.version>