Skip to content

Commit

Permalink
Merge pull request oshi#605 from swimmesberger/osgi-fix
Browse files Browse the repository at this point in the history
OSGi imports missing
  • Loading branch information
dbwiddis committed Sep 4, 2018
2 parents 05b292e + a30193b commit 3b1f580
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
3.9.0 (in progress)
================
* [#605](https://github.com/oshi/oshi/pull/605): Update OSGi imports. - [@dbwiddis](https://github.com/dbwiddis).
* Your contribution here.

3.8.1 (09/01/2018)
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
[![SonarQube Reliability](https://sonarcloud.io/api/project_badges/measure?project=com.github.oshi%3Aoshi-parent&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=com.github.oshi%3Aoshi-parent)
[![SonarQube Security](https://sonarcloud.io/api/project_badges/measure?project=com.github.oshi%3Aoshi-parent&metric=security_rating)](https://sonarcloud.io/dashboard?id=com.github.oshi%3Aoshi-parent)
[![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/oshi/oshi.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/oshi/oshi/context:java)
[![Total Alerts](https://img.shields.io/lgtm/alerts/g/oshi/oshi.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/oshi/oshi/alerts)
[![Project Stats](https://www.openhub.net/p/oshi/widgets/project_thin_badge.gif)](https://www.openhub.net/p/oshi?ref=github)
[![LGTM Stats](https://www.openhub.net/p/oshi/widgets/project_thin_badge.gif)](https://www.openhub.net/p/oshi?ref=github)
[![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/dbwiddis)

OSHI is a free JNA-based (native) Operating System and Hardware Information library for Java.
Expand Down
13 changes: 13 additions & 0 deletions oshi-core-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,19 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<bnd><![CDATA[
Export-Package: oshi.*;-noimport:=true
Import-Package: com.sun.management.*;optional:=true, !org.slf4j.*, *
Bundle-SymbolicName: ${project.groupId}.${project.artifactId}
-snapshot: SNAPSHOT
]]></bnd>
</configuration>
</plugin>
</plugins>
</build>
</project>
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@
<version>3.5.0</version>
<configuration>
<bnd><![CDATA[
Export-Package: oshi.*
Import-Package: com.sun.jna.*
Export-Package: oshi.*;-noimport:=true
Import-Package: com.sun.management.*;optional:=true, *
Bundle-SymbolicName: ${project.groupId}.${project.artifactId}
-snapshot: SNAPSHOT
]]></bnd>
Expand Down

0 comments on commit 3b1f580

Please sign in to comment.