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

Jump to bottom

Upgrade to Karaf 4.4.5 and Xtext 2.34 #4133

Merged
merged 4 commits into from
Mar 17, 2024
Merged

Upgrade to Karaf 4.4.5 and Xtext 2.34 #4133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8ce22f
Upgrade to Karaf 4.4.5 and Xtext 2.34
holgerfriedrich Feb 28, 2024
c6e0de2
resolve runbundles
holgerfriedrich Mar 5, 2024
d701ac0
resolve runbundle org.openhab.core.config.discovery.usbserial.linuxsy…
holgerfriedrich Mar 5, 2024
2a9ef64
Remove org.openhab.core.model.lazygen
holgerfriedrich Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions bom/compile-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
10 changes: 5 additions & 5 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.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>

Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>

Expand Down
29 changes: 15 additions & 14 deletions bom/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -906,6 +906,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -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>

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.13.0</version>
<version>5.14.0</version>
</dependency>
</dependencies>

Expand Down
5 changes: 2 additions & 3 deletions bundles/org.openhab.core.model.item/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
27 changes: 0 additions & 27 deletions bundles/org.openhab.core.model.lazygen/.classpath
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions bundles/org.openhab.core.model.lazygen/.project
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions bundles/org.openhab.core.model.lazygen/NOTICE
View file
Open in desktop

This file was deleted.

Empty file removed bundles/org.openhab.core.model.lazygen/model.profile-marker
View file
Open in desktop
Empty file.
17 changes: 0 additions & 17 deletions bundles/org.openhab.core.model.lazygen/pom.xml
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions ...ab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions ...penhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java
View file
Open in desktop

This file was deleted.