Merge pull request #5 from DirectProjectJavaRI/develop

Greg Meyer · web-flow · commit d47594635d48 · 2020-01-23T12:26:20.000-06:00
Releasing 7.0.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nhind</groupId>
 	<artifactId>config-model</artifactId>
-	<version>6.0</version>
+	<version>7.0</version>
 	<packaging>jar</packaging>
 	<name>NHIN Direct Java RI - Configuration Service Data Model</name>
     <description>NHIN Direct Java RI Configurstion Service Data Model</description>
@@ -15,7 +15,7 @@
 	<parent>
 	   <groupId>org.springframework.boot</groupId>
 	   <artifactId>spring-boot-dependencies</artifactId>
-	   <version>2.1.2.RELEASE</version>
+	   <version>2.2.4.RELEASE</version>
 	</parent>	
     <developers>
         <developer>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>org.nhind</groupId>
 			<artifactId>direct-policy</artifactId>
-			<version>6.0</version>
+			<version>7.0</version>
 			<type>jar</type>
 		</dependency>	
 	    <dependency>
@@ -48,7 +48,7 @@
 		<dependency>
 		    <groupId>org.apache.commons</groupId>
 		    <artifactId>commons-collections4</artifactId>
-		    <version>4.2</version>
+		    <version>4.4</version>
 		</dependency>    
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
@@ -63,7 +63,7 @@
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>
 		    <artifactId>bcprov-jdk15on</artifactId>
-		    <version>1.60</version>    
+		    <version>1.64</version>    
 		</dependency> 
 		<dependency>
 		    <groupId>dnsjava</groupId>
@@ -179,7 +179,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.9.1</version>
 				<configuration>
 				    <additionalparam>-Xdoclint:none</additionalparam>
 					<charset>UTF-8</charset>
@@ -199,8 +199,7 @@
 	                </goals>
 	              </execution>
 	            </executions>					
-			</plugin>	
-			<!--  for releases only 					
+			</plugin>						
 	        <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-gpg-plugin</artifactId>
@@ -214,7 +213,6 @@
                  </execution>
                </executions>
             </plugin>
-            -->	
 		</plugins>	
 	</build>
 	<reporting>
@@ -227,7 +225,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.9.1</version>
 				<configuration>
 				    <additionalparam>-Xdoclint:none</additionalparam>
 					<charset>UTF-8</charset>
diff --git a/src/main/java/org/nhindirect/config/model/Address.java b/src/main/java/org/nhindirect/config/model/Address.java
@@ -33,7 +33,7 @@ public class Address
 {
     private String emailAddress;
 
-    private long id;
+    private long id = -1;
 
     private String displayName;
     
diff --git a/src/main/java/org/nhindirect/config/model/Anchor.java b/src/main/java/org/nhindirect/config/model/Anchor.java
@@ -46,7 +46,7 @@ public class Anchor
     private String thumbprint;
     private long certificateId;
     private byte[] certificateData;
-    private long id;
+    private long id = -1;
     private Calendar createTime;
     private Calendar validStartDate;
     private Calendar validEndDate;
diff --git a/src/main/java/org/nhindirect/config/model/Certificate.java b/src/main/java/org/nhindirect/config/model/Certificate.java
@@ -33,7 +33,7 @@ public class Certificate
 {
     private String owner;
     private String thumbprint;
-    private long id;
+    private long id = -1;
     private byte[] data;
     private Calendar createTime;
     private Calendar validStartDate;
diff --git a/src/main/java/org/nhindirect/config/model/DNSRecord.java b/src/main/java/org/nhindirect/config/model/DNSRecord.java
@@ -31,7 +31,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 ///CLOVER:OFF
 public class DNSRecord 
 {
-    private long id;
+    private long id = -1;
 	private String name;
 	private int type;
 	private int dclass;
diff --git a/src/main/java/org/nhindirect/config/model/Domain.java b/src/main/java/org/nhindirect/config/model/Domain.java
@@ -44,7 +44,7 @@ public class Domain
 
     private Collection<Address> addresses;
 
-    private long id;
+    private long id = -1;
 
     private EntityStatus status;
     
diff --git a/src/main/java/org/nhindirect/config/model/Setting.java b/src/main/java/org/nhindirect/config/model/Setting.java
@@ -33,7 +33,7 @@ public class Setting
 {
     private String name;
     private String value;
-    private long id;
+    private long id = -1;
     private Calendar createTime;
     private Calendar updateTime;
     private EntityStatus status;
diff --git a/src/main/java/org/nhindirect/config/model/TrustBundle.java b/src/main/java/org/nhindirect/config/model/TrustBundle.java
@@ -44,7 +44,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 public class TrustBundle
 {
 	
-	private long id;
+	private long id = -1;
 	private String bundleName;
 	private String bundleURL;
     private byte[] signingCertificateData;
diff --git a/src/main/java/org/nhindirect/config/model/TrustBundleAnchor.java b/src/main/java/org/nhindirect/config/model/TrustBundleAnchor.java
@@ -39,7 +39,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 ///CLOVER:OFF
 public class TrustBundleAnchor 
 {
-    private long id;
+    private long id = -1;
     private byte[] anchorData;
     private String thumbprint;
     private Calendar validStartDate;
diff --git a/src/main/java/org/nhindirect/config/model/TrustBundleDomainReltn.java b/src/main/java/org/nhindirect/config/model/TrustBundleDomainReltn.java
@@ -29,7 +29,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 ///CLOVER:OFF
 public class TrustBundleDomainReltn 
 {
-	private long id;
+	private long id = -1;
 	
 	private Domain domain;
 	
diff --git a/src/site/apt/releaseNotes.apt b/src/site/apt/releaseNotes.apt
@@ -6,6 +6,24 @@
         Greg Meyer
         ---
 
+{7.0}
+
+    Changes included with release 7.0
+    
+    []
+    
+    Enhancements
+    
+ 	* Updating to SpringBoot 2.2.4
+ 	
+ 	* Defaulting unassigned model object ids to -1.
+
+    [] 
+     
+    Bug Fixes
+
+    * NA
+
 {6.0}
 
     Changes included with release 6.0

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class Address`
`33`	`33`	`{`
`34`	`34`	`private String emailAddress;`
`35`	`35`
`36`		`- private long id;`
	`36`	`+ private long id = -1;`
`37`	`37`
`38`	`38`	`private String displayName;`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class Certificate`
`33`	`33`	`{`
`34`	`34`	`private String owner;`
`35`	`35`	`private String thumbprint;`
`36`		`- private long id;`
	`36`	`+ private long id = -1;`
`37`	`37`	`private byte[] data;`
`38`	`38`	`private Calendar createTime;`
`39`	`39`	`private Calendar validStartDate;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY`
`31`	`31`	`///CLOVER:OFF`
`32`	`32`	`public class DNSRecord`
`33`	`33`	`{`
`34`		`- private long id;`
	`34`	`+ private long id = -1;`
`35`	`35`	`private String name;`
`36`	`36`	`private int type;`
`37`	`37`	`private int dclass;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class Setting`
`33`	`33`	`{`
`34`	`34`	`private String name;`
`35`	`35`	`private String value;`
`36`		`- private long id;`
	`36`	`+ private long id = -1;`
`37`	`37`	`private Calendar createTime;`
`38`	`38`	`private Calendar updateTime;`
`39`	`39`	`private EntityStatus status;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY`
`44`	`44`	`public class TrustBundle`
`45`	`45`	`{`
`46`	`46`
`47`		`- private long id;`
	`47`	`+ private long id = -1;`
`48`	`48`	`private String bundleName;`
`49`	`49`	`private String bundleURL;`
`50`	`50`	`private byte[] signingCertificateData;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY`
`39`	`39`	`///CLOVER:OFF`
`40`	`40`	`public class TrustBundleAnchor`
`41`	`41`	`{`
`42`		`- private long id;`
	`42`	`+ private long id = -1;`
`43`	`43`	`private byte[] anchorData;`
`44`	`44`	`private String thumbprint;`
`45`	`45`	`private Calendar validStartDate;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY`
`29`	`29`	`///CLOVER:OFF`
`30`	`30`	`public class TrustBundleDomainReltn`
`31`	`31`	`{`
`32`		`- private long id;`
	`32`	`+ private long id = -1;`
`33`	`33`
`34`	`34`	`private Domain domain;`
`35`	`35`