This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7910_jakarta_jaxws-api in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-7910_jakarta_jaxws-api by this push: new 64584f3 CXF-7910: replace javax.annotation-api with jakarta.annotation-api 64584f3 is described below commit 64584f32c8a4632344a1e062e0fc969dfd88e41e Author: Dennis Kieselhorst <d...@apache.org> AuthorDate: Thu Jan 9 21:13:21 2020 +0100 CXF-7910: replace javax.annotation-api with jakarta.annotation-api --- distribution/javadoc/pom.xml | 4 ++-- distribution/src/main/release/samples/pom.xml | 6 +++--- integration/spring-boot/starter-jaxrs/pom.xml | 12 ++++++++++++ integration/spring-boot/starter-jaxws/pom.xml | 12 ++++++++++++ .../codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 6 +++--- maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml | 6 +++--- .../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml | 6 +++--- osgi/karaf/features/pom.xml | 4 ++++ osgi/karaf/features/src/main/resources/features.xml | 4 ++-- parent/pom.xml | 10 +++++----- pom.xml | 4 ++-- rt/frontend/jaxrs/pom.xml | 4 ++-- rt/rs/extensions/search/pom.xml | 8 ++++++++ rt/rs/microprofile-client/pom.xml | 4 ++-- rt/rs/security/http-signature/pom.xml | 4 ++-- rt/rs/security/oauth-parent/oauth2/pom.xml | 4 ++++ rt/rs/security/sso/oidc/pom.xml | 8 ++++++-- services/wsn/wsn-core/pom.xml | 4 ++++ systests/cdi/base/pom.xml | 6 ++++++ systests/jaxrs/pom.xml | 8 ++++++++ systests/microprofile/client/tracing/pom.xml | 4 ++++ systests/rs-http-sci/pom.xml | 6 ++++++ systests/rs-security/pom.xml | 4 ++++ systests/rs-sse/rs-sse-jetty/pom.xml | 6 ++++++ systests/tracing/pom.xml | 10 ++++++++-- 25 files changed, 121 insertions(+), 33 deletions(-) diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index 9d7de33..19bdc8a 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -55,8 +55,8 @@ <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.ws.xmlschema</groupId> diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 138a0a2..030cb28 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -256,9 +256,9 @@ <version>${cxf.jaxb.version}</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.3.1</version> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>1.3.5</version> </dependency> <dependency> <groupId>jakarta.xml.ws</groupId> diff --git a/integration/spring-boot/starter-jaxrs/pom.xml b/integration/spring-boot/starter-jaxrs/pom.xml index 9001cea..7359f0d 100644 --- a/integration/spring-boot/starter-jaxrs/pom.xml +++ b/integration/spring-boot/starter-jaxrs/pom.xml @@ -37,10 +37,22 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/integration/spring-boot/starter-jaxws/pom.xml b/integration/spring-boot/starter-jaxws/pom.xml index 4635a50..69f1f6e 100644 --- a/integration/spring-boot/starter-jaxws/pom.xml +++ b/integration/spring-boot/starter-jaxws/pom.xml @@ -37,10 +37,22 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml index afa96b3..dd38ac0 100644 --- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml @@ -150,9 +150,9 @@ </activation> <dependencies> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.3.1</version> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>1.3.5</version> </dependency> <dependency> <groupId>jakarta.xml.ws</groupId> diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml index 34b61b5..1c4ebb8 100644 --- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml @@ -79,9 +79,9 @@ <version>2.3.2</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.3.1</version> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>1.3.5</version> </dependency> <dependency> <groupId>jakarta.xml.ws</groupId> diff --git a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml index b129d22..0888105 100644 --- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml @@ -81,9 +81,9 @@ <version>2.3.2</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.3.1</version> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>1.3.5</version> </dependency> <dependency> <groupId>jakarta.xml.ws</groupId> diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml index f9e3a35..adb9e7a 100644 --- a/osgi/karaf/features/pom.xml +++ b/osgi/karaf/features/pom.xml @@ -45,6 +45,10 @@ <groupId>com.sun.activation</groupId> <artifactId>javax.activation</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 89500f1..00829d7 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -23,7 +23,7 @@ <feature name="cxf-specs" version="${project.version}"> <bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle> - <bundle start-level="10" dependency="true">mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle> + <bundle start-level="10" dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${cxf.javax.annotation-api.version}</bundle> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${cxf.servicemix.specs.jaxb.version}</bundle> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/${cxf.specs.jaxws.api.version}</bundle> @@ -278,7 +278,7 @@ <feature name="cxf-jackson" version="${project.version}"> <!-- Required by jackson-dataformat-yaml --> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.jaxrs.specs.version}</bundle> - <bundle start-level="10" dependency="true">mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle> + <bundle start-level="10" dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${cxf.javax.annotation-api.version}</bundle> <bundle start-level="35">mvn:org.yaml/snakeyaml/${cxf.snakeyaml.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle> diff --git a/parent/pom.xml b/parent/pom.xml index 8409903..51ee3b0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -136,7 +136,7 @@ <cxf.jaeger.version>1.0.0</cxf.jaeger.version> <cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version> <cxf.javassist.version>3.25.0-GA</cxf.javassist.version> - <cxf.javax.annotation-api.version>1.3.2</cxf.javax.annotation-api.version> + <cxf.javax.annotation-api.version>1.3.5</cxf.javax.annotation-api.version> <cxf.javax.el.version>3.0.0</cxf.javax.el.version> <cxf.javax.ws.rs.version>2.1.6</cxf.javax.ws.rs.version> <cxf.jaxb.runtime.version>${cxf.jaxb.version}</cxf.jaxb.runtime.version> @@ -2143,8 +2143,8 @@ <version>${cxf.jaxb.runtime.version}</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> <version>${cxf.javax.annotation-api.version}</version> </dependency> <dependency> @@ -2874,8 +2874,8 @@ </build> <dependencies> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>jakarta.xml.ws</groupId> diff --git a/pom.xml b/pom.xml index 8d71e07..27b2ea6 100644 --- a/pom.xml +++ b/pom.xml @@ -688,8 +688,8 @@ <exclude>javax.xml.soap:javax.xml.soap-api</exclude> <exclude>javax.activation:javax.activation-api</exclude> <exclude>com.sun.activation:javax.activation</exclude> - <!--<exclude>javax.validation:validation-api</exclude> - <exclude>javax.annotation:javax.annotation-api</exclude>--> + <exclude>javax.annotation:javax.annotation-api</exclude> + <!--<exclude>javax.validation:validation-api</exclude>--> </excludes> </bannedDependencies> </rules> diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml index fbefb4d..2ef4789 100644 --- a/rt/frontend/jaxrs/pom.xml +++ b/rt/frontend/jaxrs/pom.xml @@ -106,8 +106,8 @@ <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index b45594c..bbb9621 100644 --- a/rt/rs/extensions/search/pom.xml +++ b/rt/rs/extensions/search/pom.xml @@ -114,6 +114,10 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -147,6 +151,10 @@ <groupId>javax.activation</groupId> <artifactId>javax.activation-api</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml index 3173f29..3c29eac 100644 --- a/rt/rs/microprofile-client/pom.xml +++ b/rt/rs/microprofile-client/pom.xml @@ -131,8 +131,8 @@ <artifactId>microprofile-config-api</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>javax.enterprise</groupId> diff --git a/rt/rs/security/http-signature/pom.xml b/rt/rs/security/http-signature/pom.xml index 848faac..96d9db8 100644 --- a/rt/rs/security/http-signature/pom.xml +++ b/rt/rs/security/http-signature/pom.xml @@ -63,8 +63,8 @@ <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index bfa251b..9f4f5b1 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -131,6 +131,10 @@ <groupId>javax.activation</groupId> <artifactId>javax.activation-api</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index 17a1dae..831a68b 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -93,6 +93,10 @@ <groupId>javax.activation</groupId> <artifactId>javax.activation-api</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -148,8 +152,8 @@ <artifactId>geronimo-jta_1.1_spec</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>org.hibernate.javax.persistence</groupId> diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index ba13435..6e0321a 100644 --- a/services/wsn/wsn-core/pom.xml +++ b/services/wsn/wsn-core/pom.xml @@ -144,6 +144,10 @@ <groupId>javax.activation</groupId> <artifactId>javax.activation-api</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml index fc49b8d..b6dd4c2 100644 --- a/systests/cdi/base/pom.xml +++ b/systests/cdi/base/pom.xml @@ -49,6 +49,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>apache-jsp</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 6c3e9ed..e1e2064 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -179,6 +179,10 @@ <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -510,6 +514,10 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/systests/microprofile/client/tracing/pom.xml b/systests/microprofile/client/tracing/pom.xml index ab6584e..2b00540 100644 --- a/systests/microprofile/client/tracing/pom.xml +++ b/systests/microprofile/client/tracing/pom.xml @@ -89,6 +89,10 @@ <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml index 7c219b4..f904ba9 100644 --- a/systests/rs-http-sci/pom.xml +++ b/systests/rs-http-sci/pom.xml @@ -39,6 +39,12 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-annotations</artifactId> <version>${cxf.jetty.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index 67a1b60..8977b91 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -248,6 +248,10 @@ <groupId>javax.activation</groupId> <artifactId>javax.activation-api</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/systests/rs-sse/rs-sse-jetty/pom.xml b/systests/rs-sse/rs-sse-jetty/pom.xml index 1644c1a..e662a7e 100644 --- a/systests/rs-sse/rs-sse-jetty/pom.xml +++ b/systests/rs-sse/rs-sse-jetty/pom.xml @@ -39,6 +39,12 @@ <artifactId>jetty-annotations</artifactId> <version>${cxf.jetty.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml index 9b7d180..5f8aff4 100644 --- a/systests/tracing/pom.xml +++ b/systests/tracing/pom.xml @@ -48,6 +48,12 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>apache-jsp</artifactId> <version>${cxf.jetty.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -101,8 +107,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> <scope>test</scope> </dependency> <dependency>