3.10.0 Release

tbradellis · Nov 3, 2018 · 4d74561 · 4d74561
1 parent 99d9c2a
commit 4d74561
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,13 @@
-3.10.0 (in progress)
+3.11.0 (in progress)
+================
+* Your contribution here.
+
+3.10.0 (11/03/18)
 ================
 * [#656](https://github.com/oshi/oshi/pull/656): JNA 5.0.0. - [@dbwiddis](https://github.com/dbwiddis).
 * [#659](https://github.com/oshi/oshi/pull/659): Add free/total inode counts. - [@Space2Man](https://github.com/Space2Man).
 * [#666](https://github.com/oshi/oshi/pull/666): Recreate counter handles when invalid - [@dbwiddis](https://github.com/dbwiddis).
 * [#675](https://github.com/oshi/oshi/pull/675): Solaris 10 network stats compatibility fix - [@dbwiddis](https://github.com/dbwiddis).
-* Your contribution here.
 
 3.9.1 (10/14/18)
 ================

diff --git a/README.md b/README.md
@@ -56,8 +56,8 @@ Downloads
 ---------
 | Stable Release Version | Current Development Version | Dependencies |
 | ------------- | ------------- | ------------- |
-| [oshi-core-3.9.1](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=com.github.oshi&a=oshi-core&v=3.9.1&e=jar)  | [oshi-core-3.10.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.github.oshi&a=oshi-core&v=3.10.0-SNAPSHOT&e=jar) | [JNA](https://github.com/java-native-access/jna) • [SLF4J](http://www.slf4j.org/) |
-| [oshi-json-3.9.1](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=com.github.oshi&a=oshi-json&v=3.9.1&e=jar)   | [oshi-json-3.10.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.github.oshi&a=oshi-json&v=3.10.0-SNAPSHOT&e=jar)  | [javax.json](https://jsonp.java.net/download.html) |
+| [oshi-core-3.10.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=com.github.oshi&a=oshi-core&v=3.10.0&e=jar)  | [oshi-core-3.11.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.github.oshi&a=oshi-core&v=3.11.0-SNAPSHOT&e=jar) | [JNA](https://github.com/java-native-access/jna) • [SLF4J](http://www.slf4j.org/) |
+| [oshi-json-3.10.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=com.github.oshi&a=oshi-json&v=3.10.0&e=jar)   | [oshi-json-3.11.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.github.oshi&a=oshi-json&v=3.11.0-SNAPSHOT&e=jar)  | [javax.json](https://jsonp.java.net/download.html) |
 
 Output
 -------------

diff --git a/oshi-json/src/main/java/oshi/json/hardware/HWDiskStore.java b/oshi-json/src/main/java/oshi/json/hardware/HWDiskStore.java
@@ -63,6 +63,9 @@ public HWDiskStore() {
 
     /**
      * Create json diskStore from hardware diskStore
+     * 
+     * @param diskStore
+     *            The object to copy
      */
     public HWDiskStore(oshi.hardware.HWDiskStore diskStore) {
         this.hwDiskStore = new oshi.hardware.HWDiskStore(diskStore);

diff --git a/pom.xml b/pom.xml
@@ -126,7 +126,7 @@
 		<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
 		<!-- maven-site-plugin dependencies -->
 		<doxia-module-markdown.version>1.8</doxia-module-markdown.version>
-		<wagon-git.version>2.0.4</wagon-git.version><!-- https://github.com/trajano/wagon-git/issues/18 -->
+		<wagon-git.version>2.0.3</wagon-git.version><!-- https://github.com/trajano/wagon-git/issues/18 -->
 		<wagon-ssh.version>3.2.0</wagon-ssh.version>
 		<maven-fluido-skin.version>1.7</maven-fluido-skin.version>
 		<!-- build plugins -->
@@ -145,10 +145,7 @@
 		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
 		<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
-		<findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version><!-- 
-			remove for jdk8 -->
-		<spotbugs-maven-plugin.version>3.1.3</spotbugs-maven-plugin.version><!-- 
-			add for jdk8 -->
+		<spotbugs-maven-plugin.version>3.1.3</spotbugs-maven-plugin.version>
 		<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
 		<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
 		<tidy-maven-plugin.version>1.1.0</tidy-maven-plugin.version>
@@ -158,7 +155,7 @@
 		<maven-changelog-plugin.version>2.3</maven-changelog-plugin.version>
 		<maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
 		<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
-		<maven-surefire-report-plugin.version>2.21.1</maven-surefire-report-plugin.version>
+		<maven-surefire-report-plugin.version>2.22.1</maven-surefire-report-plugin.version>
 		<taglist-maven-plugin.version>2.4</taglist-maven-plugin.version>
 		<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
 		<!-- SCM -->
@@ -170,12 +167,11 @@
 		<plexus-utils.version>3.1.0</plexus-utils.version>
 		<!-- Misc. -->
 		<sonar-maven-plugin.version>3.5.0.1254</sonar-maven-plugin.version>
-		<wagon-maven-plugin.version>2.0</wagon-maven-plugin.version>
+		<wagon-maven-plugin.version>2.0.0</wagon-maven-plugin.version>
 		<animal-sniffer-maven-plugin.version>1.16</animal-sniffer-maven-plugin.version>
 		<dependency-check-maven.version>3.3.4</dependency-check-maven.version>
 		<puppycrawl.checkstyle.version>8.14</puppycrawl.checkstyle.version>
 		<m2e.lifecycle-mapping.version>1.0.0</m2e.lifecycle-mapping.version>
-
 	</properties>
 
 	<dependencies>
@@ -345,7 +341,7 @@
 					<version>${bnd-maven-plugin.version}</version>
 					<configuration>
 						<bnd><![CDATA[
-						Export-Package: oshi.*;-noimport:=true
+						Export-Package: oshi.*;-noimport:=true;-split-package:=merge-first
 						Import-Package: com.sun.management.*;optional:=true, *
 						Bundle-SymbolicName: ${project.groupId}.${project.artifactId}
 						-snapshot: SNAPSHOT
@@ -454,11 +450,6 @@
 					</executions>
 				</plugin>
 				<!-- External Tools -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId> <!-- Upgrade to spotbugs (jdk8) -->
-					<artifactId>findbugs-maven-plugin</artifactId>
-					<version>${findbugs-maven-plugin.version}</version>
-				</plugin>
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>

diff --git a/src/site/markdown/README.md b/src/site/markdown/README.md
@@ -56,8 +56,8 @@ Downloads
 ---------
 | Stable Release Version | Current Development Version | Dependencies |
 | ------------- | ------------- | ------------- |
-| [oshi-core-3.9.1](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&amp;g=com.github.oshi&amp;a=oshi-core&amp;v=3.9.1&amp;e=jar)  | [oshi-core-3.10.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&amp;g=com.github.oshi&amp;a=oshi-core&amp;v=3.10.0-SNAPSHOT&amp;e=jar) | [JNA](https://github.com/java-native-access/jna) • [SLF4J](http://www.slf4j.org/) |
-| [oshi-json-3.9.1](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&amp;g=com.github.oshi&amp;a=oshi-json&amp;v=3.9.1&amp;e=jar)   | [oshi-json-3.10.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&amp;g=com.github.oshi&amp;a=oshi-json&amp;v=3.10.0-SNAPSHOT&amp;e=jar)  | [javax.json](https://jsonp.java.net/download.html) |
+| [oshi-core-3.10.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&amp;g=com.github.oshi&amp;a=oshi-core&amp;v=3.10.0&amp;e=jar)  | [oshi-core-3.11.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&amp;g=com.github.oshi&amp;a=oshi-core&amp;v=3.11.0-SNAPSHOT&amp;e=jar) | [JNA](https://github.com/java-native-access/jna) • [SLF4J](http://www.slf4j.org/) |
+| [oshi-json-3.10.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&amp;g=com.github.oshi&amp;a=oshi-json&amp;v=3.10.0&amp;e=jar)   | [oshi-json-3.11.0-SNAPSHOT](https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&amp;g=com.github.oshi&amp;a=oshi-json&amp;v=3.11.0-SNAPSHOT&amp;e=jar)  | [javax.json](https://jsonp.java.net/download.html) |
 
 Output
 -------------