Upgrade Maven plugins and blacklist jakarta.ws.rs-api in Demo App

* Upgrade bnd to 6.2.0 as well as the other Maven plugins to the latest version * Blacklist jakarta.ws.rs-api to prevent openhab#1327 See also: openhab/openhab-core#2836 Signed-off-by: Wouter Born <github@maindrain.net>
wborn · Mar 13, 2022 · bdcff34 · bdcff34
1 parent f72b594
commit bdcff34
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun
@@ -91,6 +91,7 @@ feature.openhab-model-runtime-all: \
 	openhab.logdir=${.}/runtime/userdata/logs
 
 -runblacklist: \
+	bnd.identity;id='jakarta.ws.rs-api',\
 	bnd.identity;id='org.apache.aries.jpa.container',\
 	bnd.identity;id='org.openhab.core.test',\
 	bnd.identity;id='osgi.annotation',\

diff --git a/launch/app/pom.xml b/launch/app/pom.xml
@@ -16,7 +16,7 @@
     <oh.java.version>11</oh.java.version>
     <maven.compiler.source>${oh.java.version}</maven.compiler.source>
     <maven.compiler.target>${oh.java.version}</maven.compiler.target>
-    <bnd.version>6.1.0</bnd.version>
+    <bnd.version>6.2.0</bnd.version>
   </properties>
 
   <dependencies>
@@ -189,43 +189,43 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.10.1</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
+          <version>3.0.0-M2</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M2</version>
+          <version>3.0.0</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.0-M1</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>3.2.2</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
+          <version>3.3.2</version>
           <configuration>
             <failOnError>!${quality.skip}</failOnError>
           </configuration>
@@ -234,13 +234,13 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.6.4</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.0-M5</version>
           <configuration>
             <preparationGoals>clean install</preparationGoals>
           </configuration>
@@ -249,25 +249,25 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>3.2.0</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.7.1</version>
+          <version>3.11.0</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.2.1</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>3.0.0-M5</version>
         </plugin>
 
         <!-- This plugin's configuration is used to store Eclipse m2e settings only. -->