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 2014/09/22 22:34:35 UTC
[1/3] git commit: SM-2376: Incorrect javax.annotation version for
java7
Repository: servicemix
Updated Branches:
refs/heads/master 5d896ae7d -> db73ca6c0
SM-2376: Incorrect javax.annotation version for java7
(Cherry picked from the commit a6dccb4dc209c63502aa7e279ea321c88710617d)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/f4290405
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f4290405
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f4290405
Branch: refs/heads/master
Commit: f42904059be538d8aa87f23dbe5e28588dbd7392
Parents: 5d896ae
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Sep 22 21:19:56 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Sep 22 22:32:50 2014 +0200
----------------------------------------------------------------------
assembly/src/main/resources/etc/jre.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f4290405/assembly/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/jre.properties b/assembly/src/main/resources/etc/jre.properties
index 12d0002..c034c4a 100644
--- a/assembly/src/main/resources/etc/jre.properties
+++ b/assembly/src/main/resources/etc/jre.properties
@@ -190,8 +190,8 @@ jre-1.7= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.2", \
- javax.annotation.processing;version="1.2", \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
[2/3] git commit: SM-2377: Java8 packages related to JavaFX are
missing
Posted by ks...@apache.org.
SM-2377: Java8 packages related to JavaFX are missing
(Cherry picked from the commit b0c8181bcf096253b0dcf02ab3fe02f614b32fb1)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/7fcdc95c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/7fcdc95c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/7fcdc95c
Branch: refs/heads/master
Commit: 7fcdc95ce479fa32fa45d9a63e4ed5d94778e646
Parents: f429040
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Sep 22 21:23:37 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Sep 22 22:33:31 2014 +0200
----------------------------------------------------------------------
assembly/src/main/resources/etc/jre.properties | 33 +++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7fcdc95c/assembly/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/jre.properties b/assembly/src/main/resources/etc/jre.properties
index c034c4a..0a67bc1 100644
--- a/assembly/src/main/resources/etc/jre.properties
+++ b/assembly/src/main/resources/etc/jre.properties
@@ -463,6 +463,39 @@ jre-1.8= \
javax.xml.ws.wsaddressing;version="2.2", \
javax.xml.ws.spi.http;version="2.2", \
javax.xml.xpath, \
+ javafx.animation, \
+ javafx.application, \
+ javafx.beans, \
+ javafx.beans.binding, \
+ javafx.beans.property, \
+ javafx.beans.property.adapter, \
+ javafx.beans.value, \
+ javafx.collections, \
+ javafx.concurrent, \
+ javafx.css, \
+ javafx.embed.swing, \
+ javafx.embed.swt, \
+ javafx.event, \
+ javafx.fxml, \
+ javafx.geometry, \
+ javafx.scene, \
+ javafx.scene.canvas, \
+ javafx.scene.chart, \
+ javafx.scene.control, \
+ javafx.scene.control.cell, \
+ javafx.scene.effect, \
+ javafx.scene.image, \
+ javafx.scene.input, \
+ javafx.scene.layout, \
+ javafx.scene.media, \
+ javafx.scene.paint, \
+ javafx.scene.shape, \
+ javafx.scene.text, \
+ javafx.scene.transform, \
+ javafx.scene.web, \
+ javafx.stage, \
+ javafx.util, \
+ javafx.util.converter, \
org.ietf.jgss, \
org.omg.CORBA, \
org.omg.CORBA_2_3, \
[3/3] git commit: SM-2372: Upgrade to Pax Exam 4.2.0
Posted by ks...@apache.org.
SM-2372: Upgrade to Pax Exam 4.2.0
(Cherry picked from the commit fdb416efbb93d24f0a3d3b6d9d5d37e9a991cfd1)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/db73ca6c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/db73ca6c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/db73ca6c
Branch: refs/heads/master
Commit: db73ca6c0e3148be0a4767f9b139b6fe7ee5d434
Parents: 7fcdc95
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Sep 22 21:35:03 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Sep 22 22:34:01 2014 +0200
----------------------------------------------------------------------
itests/pom.xml | 3 +++
pom.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/db73ca6c/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 853aa0a..d25bd3f 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -141,6 +141,9 @@
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${settings.localRepository}</argLine>
+ <systemPropertyVariables>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/db73ca6c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88ded3e..2a8e462 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<xerces.version>2.11.0</xerces.version>
<xml.api.version>2.11.0-20110622</xml.api.version>
<xalan.version>2.7.1</xalan.version>
- <pax.exam.version>4.1.0</pax.exam.version>
+ <pax.exam.version>4.2.0</pax.exam.version>
<pax.url.version>2.2.0</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
<slf4j.version>1.7.5</slf4j.version>