This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit adae0d769d975a3d513729a2c3ac36ccc317fb01 Author: Alex Heneveld <[email protected]> AuthorDate: Wed Nov 17 15:03:57 2021 +0000 use jakarta for ws.rs-api this has better osgi verisoning info (also is newer) --- camp/camp-brooklyn/pom.xml | 4 ++-- karaf/features/src/main/feature/feature.xml | 9 +++++---- locations/container/pom.xml | 4 ++-- locations/jclouds/pom.xml | 4 ++-- pom.xml | 6 +++--- rest/rest-api/pom.xml | 4 ++-- rest/rest-server/pom.xml | 4 ++-- utils/rest-swagger/pom.xml | 4 ++-- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/camp/camp-brooklyn/pom.xml b/camp/camp-brooklyn/pom.xml index 673e552..26e529e 100644 --- a/camp/camp-brooklyn/pom.xml +++ b/camp/camp-brooklyn/pom.xml @@ -152,8 +152,8 @@ </dependency> <dependency> <!-- jsr311 excluded from jclouds; see jclouds module's pom for further comments. --> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 48fd9fa..24d981d 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -44,7 +44,8 @@ <feature name="brooklyn-essential-deps" version="${project.version}" description="Brooklyn Essential Dependencies, to load early"> <bundle>mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle> <!-- complementary to above, but split packages; excluded by karaf.features.xml as not needed, confuses things --> + <bundle>mvn:jakarta.xml.bind/jakarta.xml.bind-api/${jakarta.xml.bind-api.version}</bundle> <!-- preferred over servicemix jaxb (identical) --> <bundle>mvn:org.slf4j/jul-to-slf4j/${slf4j.version}</bundle> <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> @@ -94,7 +95,7 @@ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/${project.version}</bundle> <bundle>mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle> - <bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${jax-rs-api.version}</bundle> + <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}</bundle> <bundle>wrap:mvn:javax.validation/validation-api/${validation-api.version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle> @@ -235,7 +236,7 @@ <!-- should be deps of jax-rs-2.0 rest-api project --> <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle> - <bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${jax-rs-api.version}</bundle> + <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}</bundle> <config name="org.apache.cxf.osgi"> org.apache.cxf.servlet.context = /v1 @@ -331,7 +332,7 @@ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle> <!-- upstream dependencies, maybe not needed --> - <bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${jax-rs-api.version}</bundle> + <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}</bundle> <!-- was javax; mapped to jakarta --> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_1</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_5</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauth-commons/20100527_1</bundle> diff --git a/locations/container/pom.xml b/locations/container/pom.xml index 63589cd..b1d9b59 100644 --- a/locations/container/pom.xml +++ b/locations/container/pom.xml @@ -149,8 +149,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index 9602838..c2c7398 100644 --- a/locations/jclouds/pom.xml +++ b/locations/jclouds/pom.xml @@ -191,8 +191,8 @@ For tests running in the module still need to use a specific dependency - use JAX-RS 2.0 as that's what is used in standard build. --> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 247d793..7d3550a 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ <aopalliance.version>1.0</aopalliance.version> <commons-configuration.version>1.7</commons-configuration.version> <commons-lang.version>2.4</commons-lang.version> - <jax-rs-api.version>2.1.1</jax-rs-api.version> <!-- differs from jclouds 2.2.0, which depends on v2.0.1 --> + <jax-rs-api.version>2.1.6</jax-rs-api.version> <!-- bumped from various; using jakarta now; this has better osgi signature; other maps to 2.1.99.b01 ? --> <maxmind.version>2.8.0-rc1</maxmind.version> <maxmind-db.version>1.2.1</maxmind-db.version> <winrm4j.version>0.12.3</winrm4j.version> <!-- WINRM4J_VERSION --> @@ -801,8 +801,8 @@ <!-- JAX-RS dependencies--> <!-- JAX-RS 2.0 API --> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <version>${jax-rs-api.version}</version> </dependency> <dependency> diff --git a/rest/rest-api/pom.xml b/rest/rest-api/pom.xml index 6a978d4..617f831 100644 --- a/rest/rest-api/pom.xml +++ b/rest/rest-api/pom.xml @@ -62,8 +62,8 @@ <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> diff --git a/rest/rest-server/pom.xml b/rest/rest-server/pom.xml index 2cc4d60..60e26b5 100644 --- a/rest/rest-server/pom.xml +++ b/rest/rest-server/pom.xml @@ -105,8 +105,8 @@ <artifactId>jetty-servlet</artifactId> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index 2213164..fd73dc6 100644 --- a/utils/rest-swagger/pom.xml +++ b/utils/rest-swagger/pom.xml @@ -37,8 +37,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency>
