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/08/28 21:04:07 UTC
[3/3] servicemix git commit: [SM-3081] Upgrade to Apache Karaf 4.0.6
[SM-3081] Upgrade to Apache Karaf 4.0.6
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/3426b917
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/3426b917
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/3426b917
Branch: refs/heads/master
Commit: 3426b91745dd27f17422200694edddf007171fa5
Parents: b5bf2f4
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Aug 25 00:46:34 2016 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Aug 25 00:46:34 2016 +0200
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 3 +++
.../src/main/resources/etc/jre.properties | 6 ++++--
itests/pom.xml | 10 ++++++++++
parent/pom.xml | 7 ++++---
4 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/3426b917/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index 528fe53..e912676 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -253,6 +253,9 @@
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library>
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library>
+
+ <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
+ <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
</libraries>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/3426b917/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/jre.properties b/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
index 03d0377..314e6c2 100644
--- a/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
+++ b/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
@@ -345,7 +345,8 @@ jre-1.7= \
org.w3c.dom.xpath, \
org.xml.sax, \
org.xml.sax.ext, \
- org.xml.sax.helpers
+ org.xml.sax.helpers, \
+ com.sun.nio.sctp
jre-1.8= \
javax.accessibility, \
@@ -539,4 +540,5 @@ jre-1.8= \
org.w3c.dom.xpath, \
org.xml.sax, \
org.xml.sax.ext, \
- org.xml.sax.helpers
+ org.xml.sax.helpers, \
+ com.sun.nio.sctp
http://git-wip-us.apache.org/repos/asf/servicemix/blob/3426b917/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 68d3671..d37d4c0 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -118,6 +118,16 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemPropertyVariables>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/3426b917/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b727f17..9c3c626 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
<activemq.version>5.13.4</activemq.version>
<activiti.version>5.19.0.2</activiti.version>
<akka.version>2.3.9</akka.version>
- <aries.blueprint.core.version>1.6.1</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.6.2</aries.blueprint.core.version>
<aries.jpa.version>2.3.0</aries.jpa.version>
<aries.proxy.version>1.0.5</aries.proxy.version>
<aries.transaction.version>1.3.0</aries.transaction.version>
@@ -74,9 +74,10 @@
<javassist.bundle.version>3.12.1.GA_3</javassist.bundle.version>
<javax-inject.bundle.version>1_2</javax-inject.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
+ <jna.version>4.2.2</jna.version>
<jodatime2.bundle.version>2.9</jodatime2.bundle.version>
<json4s.bundle.version>3.2.11_1</json4s.bundle.version>
- <karaf.version>4.0.5</karaf.version>
+ <karaf.version>4.0.6</karaf.version>
<mvel2.version>2.2.1.Final</mvel2.version>
<mybatis.version>3.3.0</mybatis.version>
<osgi.version>6.0.0</osgi.version>
@@ -90,7 +91,7 @@
<scala.version>2.11.7</scala.version>
<servicemix.specs.version>2.7.0</servicemix.specs.version>
<slf4j.version>1.7.12</slf4j.version>
- <spring.version>3.2.14.RELEASE_1</spring.version>
+ <spring.version>3.2.17.RELEASE_1</spring.version>
<!-- spring-dm does not support spring 4.x so import-range must be 3.x for the -->
<!-- Karaf features file. -->
<spring-version-range-karaf>[3.2,4)</spring-version-range-karaf>