artifacts for v5.1.0

seancfoley · Oct 21, 2019 · a3c4df9 · a3c4df9
1 parent b82e67d
commit a3c4df9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/IPAddress/build.xml b/IPAddress/build.xml
@@ -1,6 +1,6 @@
 <project name="Create IP Address API" default="run" basedir=".">
 	<description>Create IP address jar</description>
-	<property name="version" value="5.0.2"/>
+	<property name="version" value="5.1.0"/>
 
 	<property name="rootOffset" value="."/>
 	<property name="rootdistdir" location="${rootOffset}/dist"/>

diff --git a/IPAddress/dist/IPAddress.jar b/IPAddress/dist/IPAddress.jar
diff --git a/IPAddress/maintenance_instructions.txt b/IPAddress/maintenance_instructions.txt
@@ -82,7 +82,7 @@ B Github
 
 2. Edit the release property in pom.xml
 
-3. Use build.xml to "create dist jar" and replace the checked-in file IPAddress.jar with the dist jar created.
+3. Use build.xml to first "create javadoc", then after to "create dist jar" and replace the checked-in file IPAddress.jar with the dist jar created.
 NOTE: Currently we have had to separate javadoc creation from the creation of dist jar or maven, see notes in build.xml for the reason.
 So, create the javadoc first using Java 8.  Then switch over to creating the dist jar with java 9 in the same JVM as Eclipse, otherwise ant won't work.
 

diff --git a/IPAddress/pom.xml b/IPAddress/pom.xml
@@ -6,7 +6,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 
   <groupId>com.github.seancfoley</groupId>
   <artifactId>ipaddress</artifactId>
-  <version>5.0.2</version>
+  <version>5.1.0</version>
   <packaging>jar</packaging>
 
   <name>IPAddress</name>

diff --git a/IPAddress/src/inet.ipaddr/inet/ipaddr/HostName.java b/IPAddress/src/inet.ipaddr/inet/ipaddr/HostName.java
@@ -109,7 +109,7 @@ public HostName(IPAddress addr, int port) {
 	/**
 	 * Constructs a host name from an InetSocketAddress.
 	 * 
-	 * @param inetAddr
+	 * @param inetSocketAddr
 	 */
 	public HostName(InetSocketAddress inetSocketAddr) {
 		InetAddress inetAddr = inetSocketAddr.getAddress();
@@ -138,7 +138,7 @@ public HostName(InetAddress inetAddr, Integer prefixLength) {
 	/**
 	 * Constructs a host name from an InterfaceAddress.
 	 * 
-	 * @param inetAddr
+	 * @param interfaceAddr
 	 */
 	public HostName(InterfaceAddress interfaceAddr) {
 		this(interfaceAddr.getAddress(), (int) interfaceAddr.getNetworkPrefixLength());

diff --git a/IPAddress/src/inet.ipaddr/inet/ipaddr/IPAddressString.java b/IPAddress/src/inet.ipaddr/inet/ipaddr/IPAddressString.java
@@ -806,7 +806,7 @@ public IPAddressDivisionSeries getDivisionGrouping() {
 	 * <p>
 	 * Since not all IPAddressString instances describe a sequential series of addresses, 
 	 * this does not necessarily match the exact set of addresses specified by the string.  
-	 * For example, 1-2.3.4.1-2 produces the sequential range 1.3.4.1 -> 2.3.4.2 that includes the address 1.255.255.2 not specified by the string.
+	 * For example, 1-2.3.4.1-2 produces the sequential range 1.3.4.1 to 2.3.4.2 that includes the address 1.255.255.2 not specified by the string.
 	 * <p>
 	 * The sequential range matches the same set of addresses as the address string or the address when {@link #isSequential()} is true.
 	 * Otherwise, the range includes addresses not specified by the address string.
@@ -865,7 +865,7 @@ public IPAddressDivisionSeries toDivisionGrouping() throws AddressStringExceptio
 	 * <p>
 	 * Since not all IPAddressString instances describe a sequential series of addresses, 
 	 * this does not necessarily match the exact set of addresses listed by the string.  
-	 * For example, 1-2.3.4.1-2 produces the sequential range 1.3.4.1 -> 2.3.4.2 that includes the address 1.255.255.2 not specified by the string.
+	 * For example, 1-2.3.4.1-2 produces the sequential range 1.3.4.1 to 2.3.4.2 that includes the address 1.255.255.2 not specified by the string.
 	 * <p>
 	 * The sequential range matches the same set of addresses as the address string or the address when {@link #isSequential()} is true.
 	 * Otherwise, the range includes addresses not specified by the address string.

diff --git a/IPAddress/src/inet.ipaddr/inet/ipaddr/format/standard/AddressDivision.java b/IPAddress/src/inet.ipaddr/inet/ipaddr/format/standard/AddressDivision.java
@@ -360,7 +360,6 @@ public boolean isSequential() {
 	 * Any network mask must eliminate the entire division range or keep the entire range.  Any host mask is fine.
 	 * 
 	 * @param maskValue
-	 * @param segmentPrefixLength
 	 * @return
 	 */
 	public boolean isMaskCompatibleWithRange(int maskValue) {
@@ -383,7 +382,7 @@ protected static Masker maskRange(long value, long upperValue, long maskValue, l
 	 * @param value
 	 * @param upperValue
 	 * @param maskValue
-	 * @return an instance that provides the result of masking the values.  With individual addresses, the result is simply value & maskValue.
+	 * @return an instance that provides the result of masking the values.  With individual addresses, the result is simply value &amp; maskValue.
 	 *   But with subnets, returns an object providing lower and upper results along with whether the resulting set of values is sequential.
 	 */
 	public static MaskResult maskRange(long value, long upperValue, long maskValue) {
@@ -439,7 +438,6 @@ public boolean isSequential() {
 	 * Similar to masking, checks that the range resulting from the bitwise "or" operation is sequential.
 	 * 
 	 * @param maskValue
-	 * @param segmentPrefixLength
 	 * @return
 	 */
 	public boolean isBitwiseOrCompatibleWithRange(int maskValue) {
@@ -462,7 +460,6 @@ protected static BitwiseOrer bitwiseOrRange(long value, long upperValue, long ma
 	 * See {@link #maskRange(long, long, long)}
 	 * 
 	 * @param maskValue
-	 * @param segmentPrefixLength
 	 * @return
 	 */
 	public static BitwiseOrResult bitwiseOrRange(long value, long upperValue, long maskValue) {