Remove temporary config from parent pom

oshi · Dec 30, 2019 · 7d4894b · 7d4894b
1 parent 98965e4
commit 7d4894b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/oshi-core/src/main/java/oshi/hardware/NetworkIF.java b/oshi-core/src/main/java/oshi/hardware/NetworkIF.java
@@ -29,7 +29,6 @@
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -107,8 +106,7 @@ public void setNetworkInterface(NetworkInterface networkInterface) {
             ArrayList<String> ipv6list = new ArrayList<>();
             ArrayList<Short> prefixLengthList = new ArrayList<>();
 
-            for(InterfaceAddress interfaceAddress: networkInterface.getInterfaceAddresses())
-            {
+            for (InterfaceAddress interfaceAddress : networkInterface.getInterfaceAddresses()) {
                 InetAddress address = interfaceAddress.getAddress();
                 if (address.getHostAddress().length() > 0) {
                     if (address.getHostAddress().contains(":")) {
@@ -200,15 +198,13 @@ public String[] getIPv4addr() {
      * The Internet Protocol (IP) v4 subnet masks.
      * </p>
      *
-     * @return The IPv4 subnet mask length. Ranges between 0-32
-     *         This value is set when the
-     *         {@link oshi.hardware.NetworkIF} is instantiated and may not be up to
-     *         date. To update this value, execute the
+     * @return The IPv4 subnet mask length. Ranges between 0-32 This value is set
+     *         when the {@link oshi.hardware.NetworkIF} is instantiated and may not
+     *         be up to date. To update this value, execute the
      *         {@link #setNetworkInterface(NetworkInterface)} method.
      *
      */
-    public Short[] getSubnetMasks()
-    {
+    public Short[] getSubnetMasks() {
         return Arrays.copyOf(this.subnetMasks, this.subnetMasks.length);
     }
 
@@ -231,14 +227,12 @@ public String[] getIPv6addr() {
      * The Internet Protocol (IP) v6 address.
      * </p>
      *
-     * @return The IPv6 address prefix lengths. Ranges between 0-128.
-     *         This value is set when the
-     *         {@link oshi.hardware.NetworkIF} is instantiated and may not be up to
-     *         date. To update this value, execute the
+     * @return The IPv6 address prefix lengths. Ranges between 0-128. This value is
+     *         set when the {@link oshi.hardware.NetworkIF} is instantiated and may
+     *         not be up to date. To update this value, execute the
      *         {@link #setNetworkInterface(NetworkInterface)} method
      */
-    public Short[] getPrefixLengths()
-    {
+    public Short[] getPrefixLengths() {
         return Arrays.copyOf(this.prefixLengths, this.prefixLengths.length);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -591,11 +591,6 @@
 				<artifactId>git-commit-id-plugin</artifactId>
 				<configuration>
 					<dotGitDirectory>.git</dotGitDirectory>
-					<!-- Fixes occassional issue in commit id plugin - see https://github.com/ktoso/maven-git-commit-id-plugin/issues/61 -->
-					<gitDescribe>
-						<always>true</always>
-					</gitDescribe>
-					<runOnlyOnce>true</runOnlyOnce>
 				</configuration>
 				<executions>
 					<execution>