Upgrade to Karaf 4.4.5 and Xtext 2.34 (#4133)

* Upgrade to Karaf 4.4.5 and Xtext 2.34 Upgrade Karaf from 4.4.4 to 4.4.5: * Sync runtime dependencies with Karaf 4.4.5, most notably: * Jetty 9.4.53.v20231009 * JNA 5.14.0 * Pax Logging 2.2.6 * Pax Web 8.0.24 * ASM 9.6 * Resolve itest runbundles Upgrade Xtext from 2.32 to 2.34 * Sync depencencies, most notably: * Guava 33.0.0 * classgraph 4.8.165 changing provider to io.github.classgraph * Migrate old Xtext generator xtext.generator to xtext.xtext.generator as xtext.generator has been removed from Xtext, affecting org.openhab.core.model.lazygen * resolve runbundles * Remove org.openhab.core.model.lazygen No longer in use since 2017, see eclipse-archived/smarthome#4122. Signed-off-by: Holger Friedrich <[email protected]>
openhab · Mar 17, 2024 · 3850599 · 3850599
1 parent 9c1c885
commit 3850599
Show file tree

Hide file tree

Showing 51 changed files with 574 additions and 1,027 deletions.
diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
@@ -30,7 +30,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
-      <artifactId>org.eclipse.xtext.generator</artifactId>
+      <artifactId>org.eclipse.xtext.xtext.generator</artifactId>
       <version>${xtext.version}</version>
       <scope>compile</scope>
       <exclusions>
@@ -132,9 +132,9 @@
 
     <!-- Classgraph -->
     <dependency>
-      <groupId>org.eclipse.orbit.bundles</groupId>
-      <artifactId>io.github.classgraph</artifactId>
-      <version>4.8.149.v20220915-0556</version>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <version>4.8.165</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
@@ -18,8 +18,8 @@
 
   <properties>
     <californium.version>2.7.4</californium.version>
-    <jetty.version>9.4.52.v20230823</jetty.version>
-    <pax.web.version>8.0.22</pax.web.version>
+    <jetty.version>9.4.53.v20231009</jetty.version>
+    <pax.web.version>8.0.24</pax.web.version>
     <swagger.version>2.2.15</swagger.version>
   </properties>
 
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
+      <version>3.14.0</version>
       <scope>compile</scope>
     </dependency>
 
@@ -418,13 +418,13 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>5.13.0</version>
+      <version>5.14.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna-platform</artifactId>
-      <version>5.13.0</version>
+      <version>5.14.0</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -19,9 +19,9 @@
     <californium.version>2.7.4</californium.version>
     <cxf.version>3.6.2</cxf.version>
     <jackson.version>2.16.0</jackson.version>
-    <jetty.version>9.4.52.v20230823</jetty.version>
-    <pax.logging.version>2.2.3</pax.logging.version>
-    <pax.web.version>8.0.22</pax.web.version>
+    <jetty.version>9.4.53.v20231009</jetty.version>
+    <pax.logging.version>2.2.6</pax.logging.version>
+    <pax.web.version>8.0.24</pax.web.version>
     <swagger.version>2.2.15</swagger.version>
   </properties>
 
@@ -326,7 +326,7 @@
     <dependency>
       <groupId>org.apache.aries.spifly</groupId>
       <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-      <version>1.3.6</version>
+      <version>1.3.7</version>
     </dependency>
 
     <!-- END: Slightly modified EnRoute implementation index artifacts -->
@@ -404,12 +404,12 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.13.0</version>
+      <version>2.15.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
+      <version>3.14.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -780,21 +780,21 @@
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-bundleutils</artifactId>
-      <version>4.23</version>
+      <version>4.24</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-finder</artifactId>
-      <version>4.23</version>
+      <version>4.24</version>
       <scope>compile</scope>
     </dependency>
 
     <!-- Google Commons / Guava -->
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.2-jre</version>
+      <version>33.0.0-jre</version>
       <scope>compile</scope>
     </dependency>
 
@@ -806,9 +806,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.orbit.bundles</groupId>
-      <artifactId>io.github.classgraph</artifactId>
-      <version>4.8.149.v20220915-0556</version>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <version>4.8.165</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -906,6 +906,7 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
+      <version>9.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -1065,13 +1066,13 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>5.13.0</version>
+      <version>5.14.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna-platform</artifactId>
-      <version>5.13.0</version>
+      <version>5.14.0</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna-platform</artifactId>
-      <version>5.13.0</version>
+      <version>5.14.0</version>
     </dependency>
   </dependencies>
 

diff --git a/bundles/org.openhab.core.model.item/bnd.bnd b/bundles/org.openhab.core.model.item/bnd.bnd
@@ -38,10 +38,9 @@ Require-Bundle: com.ibm.icu;resolution:=optional,\
  org.eclipse.emf.ecore;visibility:=reexport,\
  org.eclipse.emf.mwe.utils;resolution:=optional,\
  org.eclipse.emf.mwe2.launch;resolution:=optional,\
- org.openhab.core.model.lazygen;resolution:=optional,\
  org.eclipse.xtend.lib;resolution:=optional,\
  org.eclipse.xtext,\
  org.eclipse.xtext.common.types,\
- org.eclipse.xtext.generator;resolution:=optional,\
+ org.eclipse.xtext.xtext.generator;resolution:=optional,\
  org.eclipse.xtext.util,\
- org.eclipse.xtext.xbase.lib;bundle-version="2.26.0"
+ org.eclipse.xtext.xbase.lib;bundle-version="2.34.0"
diff --git a/bundles/org.openhab.core.model.lazygen/.classpath b/bundles/org.openhab.core.model.lazygen/.classpath
diff --git a/bundles/org.openhab.core.model.lazygen/.project b/bundles/org.openhab.core.model.lazygen/.project
diff --git a/bundles/org.openhab.core.model.lazygen/NOTICE b/bundles/org.openhab.core.model.lazygen/NOTICE
diff --git a/bundles/org.openhab.core.model.lazygen/model.profile-marker b/bundles/org.openhab.core.model.lazygen/model.profile-marker
diff --git a/bundles/org.openhab.core.model.lazygen/pom.xml b/bundles/org.openhab.core.model.lazygen/pom.xml
diff --git a/...ab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java b/...ab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java
diff --git a/...penhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java b/...penhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java