You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2016/09/13 03:46:42 UTC
karaf git commit: [KARAF-4709]use new JVM options with recent java9
kit
Repository: karaf
Updated Branches:
refs/heads/master 08c11e4ef -> 6c3e6b420
[KARAF-4709]use new JVM options with recent java9 kit
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6c3e6b42
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6c3e6b42
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6c3e6b42
Branch: refs/heads/master
Commit: 6c3e6b4205894ad6deac056f4cb2ba51977440dd
Parents: 08c11e4
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Sep 13 11:46:24 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Sep 13 11:46:24 2016 +0800
----------------------------------------------------------------------
assemblies/features/base/src/main/resources/resources/bin/karaf | 4 ++--
pom.xml | 2 +-
tooling/karaf-maven-plugin/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6c3e6b42/assemblies/features/base/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf
index c38abf7..7a2a507 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -496,7 +496,7 @@ run() {
if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
if [ "${VERSION}" -gt "80" ]; then
$KARAF_EXEC "$JAVA" $JAVA_OPTS \
- -XaddExports:java.base/sun.net.www.protocol.http=ALL-UNNAMED -XaddExports:java.base/sun.net.www.protocol.https=ALL-UNNAMED -XaddExports:java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED -XaddExports:jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED -XaddExports:jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED \
+ --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED \
-Dkaraf.instances="${KARAF_HOME}/instances" \
-Dkaraf.home="$KARAF_HOME" \
-Dkaraf.base="$KARAF_BASE" \
@@ -506,7 +506,7 @@ run() {
-Djava.io.tmpdir="$KARAF_DATA/tmp" \
-Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" \
-Dorg.apache.servicemix.specs.debug=true \
- -addmods java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws,jdk.xml.bind \
+ --add-modules java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws,jdk.xml.bind \
$KARAF_SYSTEM_OPTS \
$KARAF_OPTS \
$OPTS \
http://git-wip-us.apache.org/repos/asf/karaf/blob/6c3e6b42/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8b91a6a..988bd04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2354,7 +2354,7 @@
<profile>
<id>java9</id>
<properties>
- <surefire.argLine>-addmods java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws</surefire.argLine>
+ <surefire.argLine>--add-modules java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws</surefire.argLine>
</properties>
<activation>
<jdk>9</jdk>
http://git-wip-us.apache.org/repos/asf/karaf/blob/6c3e6b42/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 646d11f..ec227f6 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -300,7 +300,7 @@
<profile>
<id>java9</id>
<properties>
- <mvn.opts>-XaddExports:java.base/sun.net.www.protocol.http=ALL-UNNAMED -XaddExports:java.base/sun.net.www.protocol.https=ALL-UNNAMED -XaddExports:java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED -XaddExports:jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED -addmods java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws -Djava.io.tmpdir=${project.build.directory}</mvn.opts>
+ <mvn.opts>--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-modules java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws -Djava.io.tmpdir=${project.build.directory}</mvn.opts>
</properties>
<activation>
<jdk>9</jdk>