Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6BAAA200C3A for ; Fri, 17 Mar 2017 03:44:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6A2EB160B8B; Fri, 17 Mar 2017 02:44:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8F73A160B78 for ; Fri, 17 Mar 2017 03:44:20 +0100 (CET) Received: (qmail 64684 invoked by uid 500); 17 Mar 2017 02:44:19 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 64675 invoked by uid 99); 17 Mar 2017 02:44:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Mar 2017 02:44:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90D47DFE1E; Fri, 17 Mar 2017 02:44:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ffang@apache.org To: commits@karaf.apache.org Message-Id: <83d546449ace44e18c7e40c7eb015912@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) archived-at: Fri, 17 Mar 2017 02:44:21 -0000 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 Authored: Fri Mar 17 10:44:03 2017 +0800 Committer: Freeman Fang 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 @@ 20150729 1.0.0.RC2 - 4.10.0 + 4.10.1-SNAPSHOT 1.9.1 1.5.0 2.5.2 @@ -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 + --add-modules java.activation,java.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws 9 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 @@ java9 - --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} + --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} 9 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 @@ + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + 256M + ${compiler.fork} + + + org.apache.felix maven-bundle-plugin true @@ -73,4 +83,4 @@ - \ No newline at end of file +