Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Karaf to 4.4.7, Xtext/Xtend 2.37.0 #4406

Merged
merged 3 commits into from
Jan 26, 2025
Merged

Upgrade Karaf to 4.4.7, Xtext/Xtend 2.37.0 #4406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71d4152
Revert "Start spifly early (#4526)"
holgerfriedrich Dec 28, 2024
942560c
Upgrade Karaf from 4.4.6 to 4.4.7
holgerfriedrich Oct 5, 2024
fc6c7c3
Upgrade Xtext/Xtend to 2.37.0
holgerfriedrich Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/compile-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.172</version>
<version>4.8.176</version>
<scope>compile</scope>
</dependency>

Expand Down
17 changes: 8 additions & 9 deletions bom/compile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

<properties>
<californium.version>2.7.4</californium.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<pax.web.version>8.0.27</pax.web.version>
<jetty.version>9.4.57.v20241219</jetty.version>
<pax.web.version>8.0.30</pax.web.version>
<swagger.version>2.2.15</swagger.version>
</properties>

Expand Down Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.17.0</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -117,11 +117,10 @@
</dependency>

<!-- Gson -->
<!-- The Orbit bundle is used because LSP4J imports com.google.gson.internal -->
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>com.google.gson</artifactId>
<version>2.10.1.v20230109-0753</version>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -418,13 +417,13 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.14.0</version>
<version>5.16.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.14.0</version>
<version>5.16.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
36 changes: 18 additions & 18 deletions bom/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

<properties>
<californium.version>2.7.4</californium.version>
<cxf.version>3.6.2</cxf.version>
<jackson.version>2.17.1</jackson.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<pax.logging.version>2.2.7</pax.logging.version>
<pax.web.version>8.0.27</pax.web.version>
<cxf.version>3.6.4</cxf.version>
<jackson.version>2.18.2</jackson.version>
<jetty.version>9.4.57.v20241219</jetty.version>
<pax.logging.version>2.2.8</pax.logging.version>
<pax.web.version>8.0.30</pax.web.version>
<swagger.version>2.2.15</swagger.version>
</properties>

Expand Down Expand Up @@ -194,7 +194,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.8</version>
<version>2.3.9</version>
</dependency>

<!-- Activation 1.2 API -->
Expand Down Expand Up @@ -404,12 +404,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.17.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -449,9 +449,9 @@

<!-- Gson -->
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>com.google.gson</artifactId>
<version>2.10.1.v20230109-0753</version>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -780,21 +780,21 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.24</version>
<version>4.26</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>4.24</version>
<version>4.26</version>
<scope>compile</scope>
</dependency>

<!-- Google Commons / Guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.0-jre</version>
<version>33.3.1-jre</version>
<scope>compile</scope>
</dependency>

Expand All @@ -808,7 +808,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.174</version>
<version>4.8.176</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -906,7 +906,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7</version>
<version>9.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -1066,13 +1066,13 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.14.0</version>
<version>5.16.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.14.0</version>
<version>5.16.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bom/test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<name>openHAB Core :: BOM :: Test</name>

<properties>
<cxf.version>3.6.2</cxf.version>
<cxf.version>3.6.4</cxf.version>
<junit.version>5.10.0</junit.version>
<mockito.version>4.11.0</mockito.version>
</properties>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.8</version>
<version>2.3.9</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.14.0</version>
<version>5.16.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.io.jetty.certificate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.77</version>
<version>1.78.1</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.io.transport.modbus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.11.1</version>
<version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.semantics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7</version>
<version>9.7.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
<!-- Required for JDK 17 compatibility, see: https://github.com/highsource/maven-jaxb2-plugin/issues/207 -->
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.8</version>
<version>2.3.9</version>
</dependency>
</dependencies>
<executions>
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<description>openHAB Core Features</description>

<properties>
<jetty.version>9.4.54.v20240208</jetty.version>
<jna.version>5.14.0</jna.version>
<jetty.version>9.4.57.v20241219</jetty.version>
<jna.version>5.16.0</jna.version>
</properties>

<build>
Expand Down
6 changes: 3 additions & 3 deletions features/karaf/openhab-core/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<feature dependency="true">openhab.tp-gson</feature>

<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.36.0)(!(version&gt;=2.37.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.37.0)(!(version&gt;=2.38.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>

<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
Expand Down Expand Up @@ -262,7 +262,7 @@
<feature>openhab-core-base</feature>
<feature>openhab-transport-serial</feature>

<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.11.1</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.12.0</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.modbus/${project.version}</bundle>
</feature>

Expand Down Expand Up @@ -401,7 +401,7 @@

<feature name="openhab-core-model-lsp" version="${project.version}">

<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.36.0)(!(version&gt;=2.37.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.37.0)(!(version&gt;=2.38.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>

<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.23.1)(!(version&gt;=0.24.0)))"</requirement>
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-tp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<name>openHAB Core :: Features :: Karaf :: Target Platform</name>

<properties>
<jetty.version>9.4.54.v20240208</jetty.version>
<jna.version>5.14.0</jna.version>
<jetty.version>9.4.57.v20241219</jetty.version>
<jna.version>5.16.0</jna.version>
</properties>

<build>
Expand Down
Loading