[brooklyn-dist] branch master updated: tidy version string for jakarta/javax ws.rs-api

[heneveld]

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-dist.git


The following commit(s) were added to refs/heads/master by this push:
     new ad2725f  tidy version string for jakarta/javax ws.rs-api
ad2725f is described below

commit ad2725ff3dea7d249bfb1ea5b3c85dc2392b75c5
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Wed Nov 17 20:57:25 2021 +0000

    tidy version string for jakarta/javax ws.rs-api
---
 .../resources/etc/org.apache.karaf.features.xml                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
 
b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
index fbd9af9..366bdf8 100644
--- 
a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
+++ 
b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
@@ -111,11 +111,11 @@
 
         <!-- cxf uses servicemix's variant; other use javax standard one; but 
jakarta is better; note some cheat and v2.1.1 exports as 2.1.99.b01 -->
         <bundle 
originalUri="mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/[0,999]"
-                
replacement="mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}" />
+                
replacement="mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.rs-api.version}" />
         <bundle originalUri="mvn:javax.ws.rs/javax.ws.rs-api/[0,999]" 
-                
replacement="mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}" />
+                
replacement="mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.rs-api.version}" />
         <bundle originalUri="mvn:jakarta.ws.rs/jakarta.ws.rs-api/[0,999]" 
-                
replacement="mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jax-rs-api.version}" />
+                
replacement="mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.rs-api.version}" />
 
         <bundle 
originalUri="mvn:org.apache.httpcomponents/httpcore-osgi/[4.4,${httpcomponents.httpcore.version}]"
                 
replacement="mvn:org.apache.httpcomponents/httpcore-osgi/${httpcomponents.httpcore.version}"
 />
@@ -226,8 +226,8 @@
         
<bundle>mvn:jakarta.xml.bind/jakarta.xml.bind-api/${jakarta.xml.bind-api.version}</bundle>
         
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0</bundle>
 
-        
<bundle>mvn:jakarta.ws.rs/jakarta.ws.rs-api/[0,${jax-rs-api.version})</bundle>  
   <!-- use right version -->
-        
<bundle>mvn:jakarta.ws.rs/jakarta.ws.rs-api/(${jax-rs-api.version},999]</bundle>
   <!-- exclude 2.1.99 -->
+        
<bundle>mvn:jakarta.ws.rs/jakarta.ws.rs-api/[0,${jakarta.rs-api.version})</bundle>
     <!-- use right version -->
+        
<bundle>mvn:jakarta.ws.rs/jakarta.ws.rs-api/(${jakarta.rs-api.version},999]</bundle>
   <!-- exclude 2.1.99 -->
         <bundle>mvn:javax.ws.rs/javax.ws.rs-api/[0,999]</bundle>  <!-- use 
jakarta above -->
         
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/[0,999]</bundle>
 <!-- use javax above -->