Skip to content

Commit

Permalink
Upgrade Karaf tooling and openHAB TP to 4.2.7 (openhab#1197)
Browse files Browse the repository at this point in the history
For Karaf 4.2.7 release notes, see:

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345539

Also updates the following openHAB TP dependencies:

* Jetty 9.4.20.v20190813
* JNA 5.4.0 (used by most add-ons)

Signed-off-by: Wouter Born <github@maindrain.net>
  • Loading branch information
wborn authored and kaikreuzer committed Nov 10, 2019
1 parent 7634f3d commit fd3732e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions features/karaf/openhab-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<description>openHAB Core Features</description>

<properties>
<jetty.version>9.4.18.v20190429</jetty.version>
<jna.version>4.5.2</jna.version>
<jetty.version>9.4.20.v20190813</jetty.version>
<jna.version>5.4.0</jna.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion features/karaf/openhab-tp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>openHAB Core :: Features :: Karaf :: Target Platform</name>

<properties>
<jetty.version>9.4.18.v20190429</jetty.version>
<jetty.version>9.4.20.v20190813</jetty.version>
</properties>

<build>
Expand Down
7 changes: 7 additions & 0 deletions features/karaf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@
<version>${karaf.tooling.version}</version>
<type>kar</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<!-- This should have been an optional dependency and will be fixed in Karaf 4.2.8 (KARAF-6462). -->
<groupId>org.knopflerfish.kf6</groupId>
<artifactId>log-API</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Repositories -->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

<bnd.version>4.2.0</bnd.version>
<karaf.compile.version>4.2.1</karaf.compile.version>
<karaf.tooling.version>4.2.6</karaf.tooling.version>
<karaf.tooling.version>4.2.7</karaf.tooling.version>
<sat.version>0.8.0</sat.version>
<slf4j.version>1.7.21</slf4j.version>
<xtext.version>2.19.0</xtext.version>
Expand Down

0 comments on commit fd3732e

Please sign in to comment.