demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade to Karaf 4.4.5 and Xtext 2.34 (#4133)

Browse Source 
* 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 <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2024-03-17 09:41:15 +01:00
committed by GitHub
parent 9c1c88519b
commit 3850599163
51 changed files with 574 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/karaf/openhab-core/pom.xml
+2 -2
View File
@@ -16,8 +16,8 @@
<description>openHAB Core Features</description>
<properties>
<jetty.version>9.4.52.v20230823</jetty.version>
<jna.version>5.13.0</jna.version>
<jetty.version>9.4.53.v20231009</jetty.version>
<jna.version>5.14.0</jna.version>
</properties>
<build>
features/karaf/openhab-core/src/main/feature/feature.xml
+3 -3
View File
@@ -28,7 +28,7 @@
<feature dependency="true">openhab.tp-gson</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.32.0)(!(version&gt;=2.33.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.34.0)(!(version&gt;=2.35.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@@ -389,10 +389,10 @@
<feature name="openhab-core-model-lsp" version="${project.version}">
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.32.0)(!(version&gt;=2.33.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.34.0)(!(version&gt;=2.35.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.21.0)(!(version&gt;=0.22.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.22.0)(!(version&gt;=0.23.0)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature>
<feature>openhab-core-model-item-ide</feature>
features/karaf/openhab-tp/pom.xml
+2 -2
View File
@@ -15,8 +15,8 @@
<name>openHAB Core :: Features :: Karaf :: Target Platform</name>
<properties>
<jetty.version>9.4.52.v20230823</jetty.version>
<jna.version>5.13.0</jna.version>
<jetty.version>9.4.53.v20231009</jetty.version>
<jna.version>5.14.0</jna.version>
</properties>
<build>
features/karaf/openhab-tp/src/main/feature/feature.xml
+7 -7
View File
@@ -23,7 +23,7 @@
<feature>log</feature>
<feature>pax-web-jetty-extras</feature>
<!-- Apache Commons -->
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.12.0</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.14.0</bundle>
<!-- Measurement -->
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
@@ -205,9 +205,9 @@
</feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.21.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.21.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.21.0</bundle>
<capability>openhab.tp;feature=lsp4j;version=0.22.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.22.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.22.0</bundle>
<feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature>
@@ -246,13 +246,13 @@
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version}</bundle>
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.1</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/32.1.2-jre</bundle>
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.2</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/33.0.0-jre</bundle>
<bundle dependency="true">mvn:com.google.inject/guice/7.0.0</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.1</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.149.v20220915-0556</bundle>
<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.165</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0</bundle>