karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject karaf git commit: [KARAF-5029]ensure Karaf can build and pass all tests with JDK9 latest EA kit
Date Fri, 17 Mar 2017 02:44:18 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 095e6f11e -> 521f53445


[KARAF-5029]ensure Karaf can build and pass all tests with JDK9 latest EA kit


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/521f5344
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/521f5344
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/521f5344

Branch: refs/heads/master
Commit: 521f534458c51819fc3b47cd2f1bd1c39a93df3c
Parents: 095e6f1
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Fri Mar 17 10:44:03 2017 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Fri Mar 17 10:44:03 2017 +0800

----------------------------------------------------------------------
 .../src/main/filtered-resources/resources/bin/karaf     |  2 +-
 pom.xml                                                 |  4 ++--
 tooling/karaf-maven-plugin/pom.xml                      |  2 +-
 .../src/it/test-simplify-bundles/pom.xml                | 12 +++++++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/521f5344/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index cd60228..5b06aa9 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -262,7 +262,7 @@ run() {
                     --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 \
-                    --add-modules java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws
\
+                    --add-modules java.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws
\
                     -Dkaraf.instances="${KARAF_HOME}/instances" \
                     -Dkaraf.home="${KARAF_HOME}" \
                     -Dkaraf.base="${KARAF_BASE}" \

http://git-wip-us.apache.org/repos/asf/karaf/blob/521f5344/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a38ae0c..a82ac5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,7 +260,7 @@
         <org.json.version>20150729</org.json.version>
 
         <pax.cdi.version>1.0.0.RC2</pax.cdi.version>
-        <pax.exam.version>4.10.0</pax.exam.version>
+        <pax.exam.version>4.10.1-SNAPSHOT</pax.exam.version>
         <pax.logging.version>1.9.1</pax.logging.version>
         <pax.base.version>1.5.0</pax.base.version>
         <pax.url.version>2.5.2</pax.url.version>
@@ -2305,7 +2305,7 @@
                                   --add-opens java.base/java.net=ALL-UNNAMED 
                                   --add-opens java.base/java.lang=ALL-UNNAMED
                                   --add-opens java.base/java.util=ALL-UNNAMED
-                                  --add-modules java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws</surefire.argLine>
+                                  --add-modules java.activation,java.xml.ws.annotation,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/521f5344/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 06c8921..e67e894 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -322,7 +322,7 @@
         <profile>
 	        <id>java9</id>
 	        <properties>
-                <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>
+                <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.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws
-Djava.io.tmpdir=${project.build.directory}</mvn.opts>
 	        </properties>
 	        <activation>
         	    <jdk>9</jdk>

http://git-wip-us.apache.org/repos/asf/karaf/blob/521f5344/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml b/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml
index b61c6a3..a83f345 100644
--- a/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml
@@ -52,6 +52,16 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <maxmem>256M</maxmem>
+                    <fork>${compiler.fork}</fork>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
@@ -73,4 +83,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>


Mime
View raw message