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:12 UTC

[brooklyn-ui] 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-ui.git


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

commit 06eb5219757541568c9178e507e34df2a5147d4e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Nov 17 20:57:07 2021 +0000

    tidy version string for jakarta/javax ws.rs-api
---
 modularity-server/metadata-registry/pom.xml | 2 +-
 modularity-server/module-registry/pom.xml   | 2 +-
 pom.xml                                     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modularity-server/metadata-registry/pom.xml b/modularity-server/metadata-registry/pom.xml
index 4bd54b3..9bb259d 100644
--- a/modularity-server/metadata-registry/pom.xml
+++ b/modularity-server/metadata-registry/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>${javax.ws.rs-api.version}</version>
+            <version>${jakarta.rs-api.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
diff --git a/modularity-server/module-registry/pom.xml b/modularity-server/module-registry/pom.xml
index e7bfb48..8de57b1 100644
--- a/modularity-server/module-registry/pom.xml
+++ b/modularity-server/module-registry/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>${javax.ws.rs-api.version}</version>
+            <version>${jakarta.rs-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
diff --git a/pom.xml b/pom.xml
index 3b3b7c6..fc5a31d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,6 @@
 
         <!-- versions from brooklyn server which have a different var name here -->
         <osgi.core.version>${org.osgi.core.version}</osgi.core.version>
-        <javax.ws.rs-api.version>${jax-rs-api.version}</javax.ws.rs-api.version>
         <servlet-api.version>${javax-servlet.version}</servlet-api.version>
 
         <!-- build tools, versions not declared in brooklyn-server but they are here -->