Upgrade Maven compiler and fix/upgrade some TP dependencies (#8636)

Upgrades the compiler and its dependencies so the compiler results of Maven builds are more similar to those generated in recent Eclipse versions.

To fix compilation issues in Eclipse for add-ons using classes from javax.xml.stream several dependencies were upgraded/excluded.

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.lametrictime/pom.xml b/bundles/org.openhab.binding.lametrictime/pom.xml
index f499ac2aa2639808156ab42efbff63ebe2467dff..93375308194af33df30be47ace9ebadff53d09dd 100644 (file)
--- a/bundles/org.openhab.binding.lametrictime/pom.xml
+++ b/bundles/org.openhab.binding.lametrictime/pom.xml
@@ -54,10 +54,10 @@
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
+      <groupId>org.apache.servicemix.specs</groupId>
+      <artifactId>org.apache.servicemix.specs.activation-api-1.2.1</artifactId>
+      <version>1.2.1_2</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.googlecode.junit-toolbox</groupId>

diff --git a/bundles/org.openhab.binding.mail/src/main/feature/feature.xml b/bundles/org.openhab.binding.mail/src/main/feature/feature.xml
index 08d40165adcc61bbb20d158de19d1b21752cb654..3c7bdc851d373b273eee265690f070ff61227e90 100644 (file)
--- a/bundles/org.openhab.binding.mail/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.mail/src/main/feature/feature.xml
@@ -5,6 +5,7 @@
        <feature name="openhab-binding-mail" description="Mail Binding" version="${project.version}">
                <feature>openhab-runtime-base</feature>
                <bundle dependency="true">mvn:com.sun.mail/javax.mail/1.6.2</bundle>
+               <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.mail/${project.version}</bundle>
        </feature>
 </features>

diff --git a/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml b/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml
index 16803bd3478f5f80db24340fa26724ab8216b890..6f41ae9efc43490c1749f279766b973ee0d96387 100644 (file)
--- a/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml
@@ -4,6 +4,7 @@
 
        <feature name="openhab-binding-pushbullet" description="Pushbullet Binding" version="${project.version}">
                <feature>openhab-runtime-base</feature>
+               <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.pushbullet/${project.version}</bundle>
        </feature>
 </features>

diff --git a/features/openhab-addons/src/main/resources/footer.xml b/features/openhab-addons/src/main/resources/footer.xml
index 96832fc2821977fdbc900bd5a68bc30c7cf0384f..70dda14930f19af77aa09be8bdad26101361f3aa 100644 (file)
--- a/features/openhab-addons/src/main/resources/footer.xml
+++ b/features/openhab-addons/src/main/resources/footer.xml
@@ -27,7 +27,7 @@
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.e3dc/${project.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.helioseasycontrols/${project.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.stiebeleltron/${project.version}</bundle>
-               <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.studer/${project.version}</bundle>           
+               <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.studer/${project.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.sunspec/${project.version}</bundle>
        </feature>
 

diff --git a/itests/itest-common.bndrun b/itests/itest-common.bndrun
index 6c9bff3bb39d232e91af724d1da0e8c5a7893e9f..374d8e935ad3a44bbb6af9e387198899dca1c937 100644 (file)
--- a/itests/itest-common.bndrun
+++ b/itests/itest-common.bndrun
@@ -25,9 +25,9 @@ Export-Package:
 -exportcontents: 
 
 -runrequires.ee: \
-    bnd.identity;id='org.apache.servicemix.specs.activation-api-1.1',\
-    bnd.identity;id='org.apache.servicemix.specs.jaxb-api-2.2',\
-    bnd.identity;id='org.apache.servicemix.bundles.jaxb-impl'
+    bnd.identity;id='org.apache.servicemix.specs.activation-api-1.2.1',\
+    bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
+    bnd.identity;id='com.sun.xml.bind.jaxb-osgi'
 
 -runrequires.junit: \
     bnd.identity;id='biz.aQute.tester.junit-platform',\

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index 9abb04967ff243572d7c9630f89d2a445254c09f..663378416438873c6f2af3bc2361e1628d281dfb 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -19,13 +19,9 @@ Fragment-Host: org.openhab.binding.astro
        org.objenesis;version='[2.6.0,2.6.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
        com.google.gson;version='[2.8.2,2.8.3)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
        junit-jupiter-api;version='[5.6.2,5.6.3)',\
        junit-jupiter-engine;version='[5.6.2,5.6.3)',\
@@ -44,4 +40,8 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
        org.openhab.core.storage.json;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index e8ce24dbed0ad5fdf458f83f54751b47bc6c3aea..67318a3b46eba6316320024aef208c432c4202cb 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -26,12 +26,8 @@ Fragment-Host: org.openhab.binding.avmfritz
        com.google.gson;version='[2.8.2,2.8.3)',\
        org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
        org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.objectweb.asm;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
@@ -68,4 +64,8 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.openhab.core.io.net;version='[3.0.0,3.0.1)',\
        org.openhab.core.test;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index bcd3e527ba917665d788fb956787eca71bbeb79b..e2ce0982530493196845a12e264cab7a183bbdc3 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -20,9 +20,6 @@ Fragment-Host: org.openhab.binding.feed
 # done
 #
 -runbundles: \
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        com.google.gson;version='[2.8.2,2.8.3)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
        org.apache.felix.scr;version='[2.1.10,2.1.11)',\
@@ -32,12 +29,10 @@ Fragment-Host: org.openhab.binding.feed
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-       org.apache.commons.io;version='[2.2.0,2.2.1)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.objectweb.asm;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
@@ -72,4 +67,8 @@ Fragment-Host: org.openhab.binding.feed
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)'
\ No newline at end of file
+       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'
\ No newline at end of file

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index f07fb47f10ca0d6278a54a0213fe16f5c1ba7385..b5250125bccccd1ddbd4f6697c6b0c8900b5f5ee 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.hue
 
 -runrequires: \
-    bnd.identity;id='org.openhab.binding.hue.tests',\
-    bnd.identity;id='org.openhab.core.binding.xml',\
-    bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.hue.tests',\
+       bnd.identity;id='org.openhab.core.binding.xml',\
+       bnd.identity;id='org.openhab.core.thing.xml'
+
+# We would like to use the "volatile" storage only
+-runblacklist: \
+       bnd.identity;id='org.openhab.core.storage.json'
 
 #
 # done
@@ -25,12 +29,8 @@ Fragment-Host: org.openhab.binding.hue
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.objectweb.asm;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
@@ -68,4 +68,8 @@ Fragment-Host: org.openhab.binding.hue
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
-       org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)'
+       org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 699aa1bc8e903add7b715b8514ca2bc3fedfcd96..25115587818b9fc6e150706aa733fbab24595d22 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.max
 
 -runrequires: \
-    bnd.identity;id='org.openhab.binding.max.tests',\
-    bnd.identity;id='org.openhab.core.binding.xml',\
-    bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.max.tests',\
+       bnd.identity;id='org.openhab.core.binding.xml',\
+       bnd.identity;id='org.openhab.core.thing.xml'
+
+# We would like to use the "volatile" storage only
+-runblacklist: \
+       bnd.identity;id='org.openhab.core.storage.json'
 
 #
 # done
@@ -24,12 +28,8 @@ Fragment-Host: org.openhab.binding.max
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
@@ -54,4 +54,8 @@ Fragment-Host: org.openhab.binding.max
        org.openhab.core.test;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 363e688ef1cb15ad7ab1418fc0c11763910234d2..4a985159de48b285b8c65c874958adddd13c6afc 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -36,12 +36,8 @@ Fragment-Host: org.openhab.binding.modbus
        org.objenesis;version='[2.6.0,2.6.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
        com.google.gson;version='[2.8.2,2.8.3)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
@@ -77,4 +73,8 @@ Fragment-Host: org.openhab.binding.modbus
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
        org.openhab.core.transform;version='[3.0.0,3.0.1)',\
        org.openhab.io.transport.modbus;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 49b1796db1077f79b898de58b34b9533bdf5a685..0d60a1ca8a2c05d32307e9240154fbf015db9ecb 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -29,9 +29,6 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.objenesis;version='[2.6.0,2.6.1)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
@@ -47,7 +44,6 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
        ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
        com.google.dagger;version='[2.20.0,2.20.1)',\
        com.hivemq.client.mqtt;version='[1.1.2,1.1.3)',\
@@ -91,4 +87,8 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant
        org.openhab.core.transform;version='[3.0.0,3.0.1)',\
        org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
-       org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)'
+       org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index 8d9ecadab7d97385580b6ea93429028611bdd9b9..2c862325e966e5ac73cc6bec215811c932474a68 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -28,9 +28,6 @@ Fragment-Host: org.openhab.binding.mqtt.homie
        org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.objenesis;version='[2.6.0,2.6.1)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
@@ -46,7 +43,6 @@ Fragment-Host: org.openhab.binding.mqtt.homie
        io.netty.transport;version='[4.1.42,4.1.43)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
        com.google.dagger;version='[2.20.0,2.20.1)',\
@@ -92,5 +88,8 @@ Fragment-Host: org.openhab.binding.mqtt.homie
        org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\
-       moquette-broker;version='[0.13.0,0.13.1)'
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'
 

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index 22ee03cf3b0bab4e3f3e5c90a35048850fdc0642..0bd63c939baef1e4ea39f7e6d14d19ef67236970 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -22,18 +22,12 @@ Fragment-Host: org.openhab.binding.nest
        ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        com.google.gson;version='[2.8.2,2.8.3)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       javax.xml.soap-api;version='[1.3.5,1.3.6)',\
        org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
        org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
        org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxws-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
        org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
@@ -88,4 +82,9 @@ Fragment-Host: org.openhab.binding.nest
        org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
-       org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)'
+       org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       javax.xml.soap-api;version='[1.4.0,1.4.1)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
+       org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 673235aed9a223bc9f9d1b123bbc39ce5abaebcd..5c361fabfde38fd3158bdc8d28d1a383df69c150 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.ntp
 
 -runrequires: \
-    bnd.identity;id='org.openhab.binding.ntp.tests',\
-    bnd.identity;id='org.openhab.core.binding.xml',\
-    bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.ntp.tests',\
+       bnd.identity;id='org.openhab.core.binding.xml',\
+       bnd.identity;id='org.openhab.core.thing.xml'
+
+# We would like to use the "volatile" storage only
+-runblacklist: \
+       bnd.identity;id='org.openhab.core.storage.json'
 
 #
 # done
@@ -26,12 +30,8 @@ Fragment-Host: org.openhab.binding.ntp
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
@@ -59,4 +59,8 @@ Fragment-Host: org.openhab.binding.ntp
        org.openhab.core.test;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index a65a969e3b881560a5239935a05063c2d496b234..ae7975e8c72980706b0a632f5e5c20e90d0c0c66 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -4,11 +4,16 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.systeminfo
 
 -runrequires: \
-    bnd.identity;id='org.openhab.binding.systeminfo.tests',\
-    bnd.identity;id='org.openhab.core.binding.xml',\
-    bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.systeminfo.tests',\
+       bnd.identity;id='org.openhab.core.binding.xml',\
+       bnd.identity;id='org.openhab.core.thing.xml'
+
+# We would like to use the "volatile" storage only
+-runblacklist: \
+       bnd.identity;id='org.openhab.core.storage.json'
 
 -runsystemcapabilities: ${native_capability}
+
 #
 # done
 #
@@ -21,9 +26,6 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        org.objenesis;version='[2.6.0,2.6.1)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
@@ -31,7 +33,6 @@ Fragment-Host: org.openhab.binding.systeminfo
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
        ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        com.sun.jna;version='[5.5.0,5.5.1)',\
        com.sun.jna.platform;version='[5.5.0,5.5.1)',\
        org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
@@ -61,4 +62,8 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.openhab.core.test;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 1af32d5a56795b668b8ee0f4983f3eb45c230435..caa73b5703d8b42cb67b0203f6294590c66fd854 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.tradfri
 
 -runrequires: \
-        bnd.identity;id='org.openhab.binding.tradfri.tests',\
-        bnd.identity;id='org.openhab.core.binding.xml',\
-        bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.tradfri.tests',\
+       bnd.identity;id='org.openhab.core.binding.xml',\
+       bnd.identity;id='org.openhab.core.thing.xml'
+
+# We would like to use the "volatile" storage only
+-runblacklist: \
+       bnd.identity;id='org.openhab.core.storage.json'
 
 #
 # done
@@ -21,15 +25,11 @@ Fragment-Host: org.openhab.binding.tradfri
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        com.google.gson;version='[2.8.2,2.8.3)',\
        javax.jmdns;version='[3.5.5,3.5.6)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        org.objenesis;version='[2.6.0,2.6.1)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
@@ -63,4 +63,8 @@ Fragment-Host: org.openhab.binding.tradfri
        org.openhab.core.test;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index b1776653b42b735d981557064bf953abeb99c9b7..3eae6dadb405ce2a99dca9859399cec0c2ee3827 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.wemo
 
 -runrequires: \
-    bnd.identity;id='org.openhab.binding.wemo.tests',\
-    bnd.identity;id='org.openhab.core.binding.xml',\
-    bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.wemo.tests',\
+       bnd.identity;id='org.openhab.core.binding.xml',\
+       bnd.identity;id='org.openhab.core.thing.xml'
+
+# We would like to use the "volatile" storage only
+-runblacklist: \
+       bnd.identity;id='org.openhab.core.storage.json'
 
 #
 # done
@@ -27,12 +31,8 @@ Fragment-Host: org.openhab.binding.wemo
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
        org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.objectweb.asm;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
        org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
@@ -73,4 +73,8 @@ Fragment-Host: org.openhab.binding.wemo
        org.openhab.core.test;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing;version='[3.0.0,3.0.1)',\
        org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun b/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun
index e690bf692d5a1ea58392ff7c22c2475f847f50ff..c3fa9880cc564aadb88db9de62ab4ed51c45b830 100644 (file)
--- a/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun
+++ b/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun
@@ -18,10 +18,6 @@ Fragment-Host: org.openhab.io.mqttembeddedbroker
 # done
 #
 -runbundles: \
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        com.google.gson;version='[2.8.2,2.8.3)',\
        com.h2database.mvstore;version='[1.4.199,1.4.200)',\
@@ -76,4 +72,7 @@ Fragment-Host: org.openhab.io.mqttembeddedbroker
        org.openhab.io.mqttembeddedbroker.tests;version='[3.0.0,3.0.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\
-       moquette-broker;version='[0.13.0,0.13.1)'
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 0d24204e46ebf56775f7fae8018f7b76d0bff85d..128e2bcd83656cc4954d0404b15b3ccdb2a9f196 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -8,6 +8,10 @@ Fragment-Host: org.openhab.persistence.mapdb
        bnd.identity;id='org.openhab.core',\
        bnd.identity;id='org.openhab.persistence.mapdb'
 
+# We would like to use the "volatile" storage only
+-runblacklist: \
+       bnd.identity;id='org.openhab.core.storage.json'
+
 #
 # done
 #
@@ -25,12 +29,8 @@ Fragment-Host: org.openhab.persistence.mapdb
        org.openhab.core.test;version='[3.0.0,3.0.1)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        slf4j.api;version='[1.7.25,1.7.26)',\
-       org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
-       org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
        org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
        org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
@@ -46,4 +46,8 @@ Fragment-Host: org.openhab.persistence.mapdb
        junit-platform-engine;version='[1.6.2,1.6.3)',\
        junit-platform-launcher;version='[1.6.2,1.6.3)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
-       org.opentest4j;version='[1.2.0,1.2.1)'
+       org.opentest4j;version='[1.2.0,1.2.1)',\
+       com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+       jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+       org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+       org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)'

diff --git a/pom.xml b/pom.xml
index 92bb901e34e88d6fc7a7905deec462d685eb5e65..9090c209029c78dcffa7d44f85d30d5d3c8651a1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@ Import-Package: \\
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.8.1</version>
           <configuration>
             <compilerId>eclipse</compilerId>
             <compilerArgs>
@@ -295,12 +295,12 @@ Import-Package: \\
             <dependency>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-compiler-eclipse</artifactId>
-              <version>2.8.5</version>
+              <version>2.8.8</version>
             </dependency>
             <dependency>
               <groupId>org.eclipse.jdt</groupId>
               <artifactId>ecj</artifactId>
-              <version>3.16.0</version>
+              <version>3.23.0</version>
             </dependency>
           </dependencies>
         </plugin>