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

use upstream nrjavaserial 3.15.0 on runtime #761

Merged
merged 3 commits into from
Apr 29, 2019
Merged

use upstream nrjavaserial 3.15.0 on runtime #761

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
eeef063
use upstream nrjavaserial 3.15.0 on runtime
maggu2810 Apr 27, 2019
3e5b9fc
add nrjavaserial without liblockdev
maggu2810 Apr 27, 2019
47cfd98
use only one feature for a nrjavaserial implementation
maggu2810 Apr 28, 2019
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/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@
<dependency>
<groupId>com.neuronrobotics</groupId>
<artifactId>nrjavaserial</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
Copy link
Contributor Author

@maggu2810 maggu2810 Apr 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

That's just for testing (runtime POM is used in itests and for the Bnd based demo applications). I don't see any need to use a non upstream implementation there (we can consider to change it if someone needs it because he develop on an arm64 machine).

<scope>compile</scope>
</dependency>

Expand Down
1 change: 0 additions & 1 deletion features/karaf/openhab-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<properties>
<jetty.version>9.4.12.v20180830</jetty.version>
<jna.version>4.5.2</jna.version>
<nrjavaserial.version>3.15.0.OH2</nrjavaserial.version>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

That property has not been necessary at all, as it is used at one place -- in the feature.
There is no "win" to define it here and reference in the feature.
We can define it in the feature.

Now the bundle declaration in the feature has been moved at all to another feature repository.

</properties>

<build>
Expand Down
2 changes: 0 additions & 2 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 @@ -345,7 +345,6 @@
<requirement>openhab.tp;filter:="(&amp;(feature=serial)(impl=rxtx))"</requirement>
<feature dependency="true">openhab-core-io-transport-serial-rxtx</feature>


<requirement>openhab.tp;filter:="(feature=commons-net)"</requirement>
<feature dependency="true">openhab.tp-commons-net</feature>

Expand Down Expand Up @@ -609,7 +608,6 @@
</feature>

<feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}">
<bundle>mvn:org.openhab/nrjavaserial/${nrjavaserial.version}</bundle>
<feature>openhab-core-io-transport-serial-rfc2217</feature>
<feature>openhab-core-config-serial</feature>
<feature>openhab-core-config-discovery-usbserial</feature>
Expand Down
7 changes: 6 additions & 1 deletion features/karaf/openhab-tp/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,12 @@

<feature name="openhab.tp-serial-rxtx" version="${project.version}">
<capability>openhab.tp;feature=serial;impl=rxtx</capability>
<bundle>mvn:com.neuronrobotics/nrjavaserial/3.14.0</bundle>

Copy link

Choose a reason for hiding this comment

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

Extra line?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I used that empty line to separate the commented stuff from other lines.

<!-- Use "no liblockdev" version -->
<!-- See: https://github.com/openhab/openhab-core/pull/761 -->
<!-- See: https://github.com/openhab/openhab-core/issues/750 -->
<!-- <bundle>mvn:com.neuronrobotics/nrjavaserial/3.15.0</bundle> -->
<bundle>mvn:org.openhab/nrjavaserial/3.15.0.OH2</bundle>
Copy link

Choose a reason for hiding this comment

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

Should this be statically called, or should it be...

<bundle>mvn:org.openhab/nrjavaserial/${nrjavaserial.version}</bundle>

... like it was in the openhab-transport-serial?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The version should be statically (I tried to already comment this in a self made review of my own changes).

</feature>

<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
Expand Down