You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/11/17 20:57:05 UTC
[brooklyn-server] branch master updated: tidy version string for jakarta/javax ws.rs-api
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
The following commit(s) were added to refs/heads/master by this push:
new 2ef8c79 tidy version string for jakarta/javax ws.rs-api
2ef8c79 is described below
commit 2ef8c7905b3a476e63747407a5e4dbaa4c5a4dee
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Nov 17 20:56:44 2021 +0000
tidy version string for jakarta/javax ws.rs-api
---
karaf/features/src/main/feature/feature.xml | 6 +++---
pom.xml | 13 +++++++++++--
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 24d981d..df875a5 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -95,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:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}</bundle>
+ <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.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>
@@ -236,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:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}</bundle>
+ <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.rs-api.version}</bundle>
<config name="org.apache.cxf.osgi">
org.apache.cxf.servlet.context = /v1
@@ -332,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:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}</bundle> <!-- was javax; mapped to jakarta -->
+ <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.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/pom.xml b/pom.xml
index 7d3550a..395cee7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,11 @@
<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.6</jax-rs-api.version> <!-- bumped from various; using jakarta now; this has better osgi signature; other maps to 2.1.99.b01 ? -->
+
+ <jakarta.rs-api.version>2.1.6</jakarta.rs-api.version> <!-- bumped from various; using jakarta now; this has better osgi signature; other maps to 2.1.99.b01 ? -->
+ <old.javax.rs-api.version>2.1.1</old.javax.rs-api.version> <!-- use jakarta instead, above -->
+ <jax-rs-api.version>${old.javax.rs-api.version}</jax-rs-api.version> <!-- kept for backwards compatibility, but should definitely not use! -->
+
<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 -->
@@ -803,7 +807,12 @@
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jax-rs-api.version}</version>
+ <version>${jakarta.rs-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>${old.javax.rs-api.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>