This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9cce5c541813ad8e433c3fdb4717ed4be096bbd8 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Wed Apr 18 17:45:15 2018 +0100 Updating the poms so that the Java9 surefire configuration also applies to Java 10 --- integration/jca/pom.xml | 4 ++-- maven-plugins/corba/pom.xml | 4 ++-- maven-plugins/java2swagger-plugin/pom.xml | 4 ++-- rt/bindings/xml/pom.xml | 4 ++-- rt/rs/client/pom.xml | 4 ++-- rt/rs/extensions/search/pom.xml | 4 ++-- rt/rs/microprofile-client/pom.xml | 4 ++-- rt/rs/security/oauth-parent/oauth2/pom.xml | 4 ++-- rt/rs/security/sso/oidc/pom.xml | 4 ++-- rt/transports/jms/pom.xml | 4 ++-- services/wsn/wsn-core/pom.xml | 4 ++-- systests/cdi/cdi-owb/pom.xml | 4 ++-- systests/cdi/cdi-weld/pom.xml | 4 ++-- systests/jaxrs/pom.xml | 4 ++-- systests/jaxws/pom.xml | 4 ++-- systests/rs-http-sci/pom.xml | 4 ++-- systests/rs-security/pom.xml | 4 ++-- systests/rs-sse/pom.xml | 4 ++-- systests/tracing/pom.xml | 4 ++-- systests/transport-jms/pom.xml | 4 ++-- systests/transports/pom.xml | 4 ++-- systests/uncategorized/pom.xml | 4 ++-- systests/ws-specs/pom.xml | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml index ac9a739..8096170 100644 --- a/integration/jca/pom.xml +++ b/integration/jca/pom.xml @@ -112,9 +112,9 @@ </dependencies> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <dependencies> <dependency> diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml index 4792e90..a3d195a 100644 --- a/maven-plugins/corba/pom.xml +++ b/maven-plugins/corba/pom.xml @@ -71,9 +71,9 @@ </dependencies> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <dependencies> <dependency> diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml index 809ebe3..d2a8549 100644 --- a/maven-plugins/java2swagger-plugin/pom.xml +++ b/maven-plugins/java2swagger-plugin/pom.xml @@ -233,9 +233,9 @@ </build> </profile> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <dependencies> <dependency> diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml index adea1d7..d62fe24 100644 --- a/rt/bindings/xml/pom.xml +++ b/rt/bindings/xml/pom.xml @@ -125,9 +125,9 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <dependencies> <dependency> diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index 2fb0faf..e21e57d 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -155,9 +155,9 @@ </dependencies> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index 49b4e8f..7c005a2 100644 --- a/rt/rs/extensions/search/pom.xml +++ b/rt/rs/extensions/search/pom.xml @@ -155,9 +155,9 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml index 5869b1a..dc1e8a3 100644 --- a/rt/rs/microprofile-client/pom.xml +++ b/rt/rs/microprofile-client/pom.xml @@ -169,9 +169,9 @@ </dependencies> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index 346ab60..9e48c92 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -273,12 +273,12 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <compilerArguments>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-modules java.se.ee,java.activation,java.xml.ws,java.xml.bind -Aopenjpa.source=7 -Aopenjpa.metamodel=true</compilerArguments> </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index 7800ede..86894fb 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -226,12 +226,12 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <compilerArguments>--patch-module java.xml.ws.annotation=${project.basedir}/target//java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-modules java.se.ee,java.activation,java.xml.ws,java.xml.bind -Aopenjpa.source=7 -Aopenjpa.metamodel=true</compilerArguments> </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index 90fbe5e..361cc26 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -166,9 +166,9 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index ff0bc89..a79ffd9 100644 --- a/services/wsn/wsn-core/pom.xml +++ b/services/wsn/wsn-core/pom.xml @@ -174,9 +174,9 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml index c12e38f..c016a89 100644 --- a/systests/cdi/cdi-owb/pom.xml +++ b/systests/cdi/cdi-owb/pom.xml @@ -131,13 +131,13 @@ </dependencies> </profile> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <cxf.server.launcher.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens [...] <cxf.surefire.fork.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens ja [...] </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml index 2075e17..8af7994 100644 --- a/systests/cdi/cdi-weld/pom.xml +++ b/systests/cdi/cdi-weld/pom.xml @@ -116,13 +116,13 @@ </dependencies> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <cxf.surefire.fork.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens [...] <cxf.server.launcher.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-ope [...] </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index b2dffe3..ee2fc13 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -630,13 +630,13 @@ </dependencies> </profile> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <cxf.server.launcher.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.base/java.lang=java.xml.bind --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens jav [...] <cxf.surefire.fork.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.base/java.lang=java.xml.bind --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java. [...] </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <dependencies> <dependency> diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml index 3c741f8..4bb9c26 100644 --- a/systests/jaxws/pom.xml +++ b/systests/jaxws/pom.xml @@ -294,9 +294,9 @@ </dependencies> </profile> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml index f3ea52f..47daf9f 100644 --- a/systests/rs-http-sci/pom.xml +++ b/systests/rs-http-sci/pom.xml @@ -142,13 +142,13 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <cxf.surefire.fork.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens [...] <cxf.server.launcher.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-ope [...] </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index adc7712..ec8a6a6 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -223,13 +223,13 @@ </dependencies> </profile> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <cxf.server.launcher.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens [...] <cxf.surefire.fork.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens ja [...] </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/rs-sse/pom.xml b/systests/rs-sse/pom.xml index 8aeeb3d..e6bece2 100644 --- a/systests/rs-sse/pom.xml +++ b/systests/rs-sse/pom.xml @@ -110,13 +110,13 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <cxf.server.launcher.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens [...] <cxf.surefire.fork.vmargs>-ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --add-opens java.xml.ws/javax.xml.ws=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.codemodel.internal=ALL-UNNAMED --add-opens jdk.xml.bind/com.sun.tools.internal.xjc.api.impl.s2j=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens ja [...] </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml index ef5a9c7..f4d64a4 100644 --- a/systests/tracing/pom.xml +++ b/systests/tracing/pom.xml @@ -164,9 +164,9 @@ </build> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index f47c3a8..b706130 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -248,9 +248,9 @@ </dependencies> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index 3c31936..8923620 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -259,12 +259,12 @@ </dependencies> <profiles> <profile> - <id>java9</id> + <id>java9plus</id> <properties> <cxf.surefire.fork.vmargs>-Djdk.http.auth.tunneling.disabledSchemes="" -ea --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar --patch-module java.transaction=${project.basedir}/target/java9 --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=java.base/java.io=ALL-UNNAMED --add-opens java.xml.bind/com.sun.xml.internal.bind.api=ALL-UNNAMED --add-opens jdk.x [...] </properties> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> </profile> </profiles> diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml index 3fc576f..4084f33 100644 --- a/systests/uncategorized/pom.xml +++ b/systests/uncategorized/pom.xml @@ -431,9 +431,9 @@ </dependencies> </profile> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> diff --git a/systests/ws-specs/pom.xml b/systests/ws-specs/pom.xml index d002f23..44cc7d3 100644 --- a/systests/ws-specs/pom.xml +++ b/systests/ws-specs/pom.xml @@ -199,9 +199,9 @@ </dependencies> </profile> <profile> - <id>java9</id> + <id>java9plus</id> <activation> - <jdk>9</jdk> + <jdk>[9,)</jdk> </activation> <build> <plugins> -- To stop receiving notification emails like this one, please contact [email protected].
