这是indexloc提供的服务，不要输入任何密码
Skip to content

Upgrade to Karaf 4.2.7 #6368

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

Merged
merged 1 commit into from
Nov 10, 2019
Merged

Upgrade to Karaf 4.2.7 #6368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 bundles/org.openhab.binding.amazondashbutton/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<feature name="openhab-binding-amazondashbutton" description="Amazon Dash Button Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:net.java.dev.jna/jna/5.4.0</bundle>
<feature>openhab-runtime-jna</feature>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.amazondashbutton/${project.version}</bundle>
</feature>
</features>
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<feature name="openhab-binding-doorbird" description="Doorbird Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:net.java.dev.jna/jna/5.4.0</bundle>
<feature>openhab-runtime-jna</feature>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.doorbird/${project.version}</bundle>
</feature>
</features>
3 changes: 1 addition & 2 deletions bundles/org.openhab.binding.systeminfo/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

<feature name="openhab-binding-systeminfo" description="System Info Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:net.java.dev.jna/jna/5.4.0</bundle>
<bundle dependency="true">mvn:net.java.dev.jna/jna-platform/5.4.0</bundle>
<feature>openhab-runtime-jna</feature>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.systeminfo/${project.version}</bundle>
</feature>
</features>
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.tellstick/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>4.2.1</version>
<version>4.5.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 2 additions & 1 deletion bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@

<feature name="openhab-binding-tellstick" description="Tellstick Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-runtime-jna</feature>
Copy link
Member

@kaikreuzer kaikreuzer Nov 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How can we find out, if tellstick also works with JNA 5.4.0?

Copy link
Member Author

@wborn wborn Nov 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could create an issue for that and ask if all those that commented in https://github.com/openhab/openhab2-addons/issues/3849 can help with testing if it still works after updating the JNA dependency.

Copy link
Member Author

@wborn wborn Nov 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe @jannegpriv can test if the Tellstick Binding also works JNA 5.4.0?

<feature>openhab-transport-serial</feature>
<feature dependency="true">openhab.tp-jaxb</feature>
<bundle dependency="true">mvn:net.java.dev.jna/jna/4.5.2</bundle>
<bundle dependency="true">mvn:net.java.dev.jna/jna-platform/4.5.2</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.tellstick/${project.version}</bundle>
</feature>
</features>
7 changes: 7 additions & 0 deletions features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@
<version>${karaf.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>

<bnd.version>4.2.0</bnd.version>
<karaf.version>4.2.6</karaf.version>
<karaf.version>4.2.7</karaf.version>
<sat.version>0.8.0</sat.version>
<slf4j.version>1.7.21</slf4j.version>

Expand Down