From f475127c6dc1da21ba6cf63ce9172db678f5865c Mon Sep 17 00:00:00 2001
From: gm2552 <gm2552@localhost>
Date: Wed, 23 Jan 2019 18:15:50 -0600
Subject: [PATCH] Updating pom and release notes for release.  Ready for 6.0
 release.

---
 pom.xml                                       | 151 ++++++------------
 src/site/apt/releaseNotes.apt                 |  24 +++
 ...tChainValidator_IntermidiateCert_Test.java |  16 --
 3 files changed, 75 insertions(+), 116 deletions(-)

diff --git a/pom.xml b/pom.xml
index 844142c..74e3294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>agent</artifactId>    
     <name>Direct Project Security And Trust Agent</name>
-    <version>6.0-SNAPSHOT</version>
+    <version>6.0</version>
     <description>Direct Project Security And Trust Agent</description>
     <inceptionYear>2010</inceptionYear>
-    <url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/agent/${project.version}</url> 
+    <url>https://github.com/DirectProjectJavaRI/agent</url> 
     <developers>
         <developer>
             <name>Greg Meyer</name>
@@ -41,13 +41,9 @@
 	   <version>2.1.2.RELEASE</version>
    </parent>	    
   <scm>
-     <url>http://code.google.com/p/nhin-d/source/browse/#hg/java/agent</url>  
-     <connection>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/agent</connection>
-  </scm> 
-  <issueManagement>
-     <system>Google Code</system>
-     <url>http://code.google.com/p/nhin-d/issues/list</url>
-  </issueManagement>	
+     <url>https://github.com/DirectProjectJavaRI/agent.git</url>  
+     <connection>scm:git:https://github.com/DirectProjectJavaRI/agent.git</connection>
+  </scm> 	
   <licenses>
      <license>
         <name>New BSD License</name>
@@ -58,17 +54,17 @@
 		<dependency>
 		  <groupId>org.nhind</groupId>
 		  <artifactId>direct-policy</artifactId>
-		  <version>6.0-SNAPSHOT</version>
+		  <version>6.0</version>
 		</dependency>	  
 		<dependency>
 		  <groupId>org.nhind</groupId>
 		  <artifactId>direct-common</artifactId>
-		  <version>6.0-SNAPSHOT</version>		  
+		  <version>6.0</version>		  
 		</dependency>	
 		<dependency>
 		  <groupId>org.nhind</groupId>
 		  <artifactId>direct-msg-monitor-model</artifactId>
-		  <version>6.0-SNAPSHOT</version>
+		  <version>6.0</version>
 		</dependency>			    
 	    <dependency>
 	        <groupId>commons-codec</groupId>
@@ -164,26 +160,21 @@
   </dependencies>      
   <build>
   	<extensions>
-  		<extension>
- 	 		<groupId>org.apache.maven.wagon</groupId> 
-  			<artifactId>wagon-webdav</artifactId> 
-  			<version>RELEASE</version> 
-  		</extension>
-	    <extension>
-	      <groupId>org.apache.maven.wagon</groupId>
-	       <artifactId>wagon-ssh-external</artifactId>
-	       <version>2.2</version>
-	    </extension>
-	    <extension>
-	      <groupId>org.apache.maven.wagon</groupId>
-	       <artifactId>wagon-ssh</artifactId>
-	       <version>2.2</version>
-	    </extension>  	
-	    <extension>
-	      <groupId>org.apache.maven.wagon</groupId>
-	       <artifactId>wagon-ssh-common</artifactId>
-	       <version>2.2</version>
-	    </extension>  	    	
+		<extension>
+			<groupId>org.apache.maven.wagon</groupId>
+			<artifactId>wagon-webdav-jackrabbit</artifactId>
+			<version>3.1.0</version>
+		</extension>
+		<extension>
+			<groupId>org.apache.maven.wagon</groupId>
+			<artifactId>wagon-ssh-external</artifactId>
+			<version>3.1.0</version>
+		</extension>
+		<extension>
+			<groupId>org.apache.maven.wagon</groupId>
+			<artifactId>wagon-ssh</artifactId>
+			<version>3.1.0</version>
+		</extension>		    	
    	</extensions>
     <resources>
       <resource>
@@ -243,17 +234,16 @@
           </execution>
         </executions>
       </plugin>    	    
-         <plugin>
+      <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
             <configuration>
                <archive>
                   <index>true</index>
-                  <!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> -->
                </archive>
             </configuration>
-         </plugin>
-         <plugin>
+      </plugin>
+      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
        <executions>
@@ -263,7 +253,7 @@
            </goals>
          </execution>
        </executions>
-     </plugin>
+      </plugin> 
         <!-- DOXIA does not yet copy resources to the generated-site or site location.  Bug
         DOXIA-355 was submitted in July of 09 and is listed to be resolved in DOXIA 1.2.
         This plugin a is work around for copying the resources from the book source to 
@@ -333,23 +323,23 @@
                     <version>1.2</version>
                 </dependency>	
 			</dependencies>			
-		</plugin>
-		<!--  for release only       
+		</plugin>    
         <plugin>
 	      	<groupId>org.apache.maven.plugins</groupId> 
 	        <artifactId>maven-javadoc-plugin</artifactId>
 	        <version>2.6.1</version>
 	        <configuration>
-	          <charset>UTF-8</charset>
-	          <docencoding>UTF-8</docencoding>
-	          <docfilessubdirs>true</docfilessubdirs>
-              <detectJavaApiLink>true</detectJavaApiLink>
-              <detectLinks>true</detectLinks>
-	          <source>1.8</source>
-	          <show>public</show>
-	          <excludePackageNames>
+			    <additionalparam>-Xdoclint:none</additionalparam>
+				<charset>UTF-8</charset>
+				<docencoding>UTF-8</docencoding>
+				<docfilessubdirs>true</docfilessubdirs>
+				<detectJavaApiLink>true</detectJavaApiLink>
+				<detectLinks>true</detectLinks>
+				<source>1.8</source>
+				<show>public</show>
+	            <excludePackageNames>
 	              org.nhindirect.stagent.annotation:org.nhindirect.stagent.cert.impl:org.nhindirect.stagent.cert.impl.annotation:org.nhindirect.stagent.cert.impl.module:org.nhindirect.stagent.cert.impl.provider:org.nhindirect.stagent.cryptography.annotation:org.nhindirect.stagent.module:org.nhindirect.stagent.provider:org.nhindirect.stagent.trust.annotation:org.nhindirect.stagent.trust.provider:org.nhindirect.stagent.utils:org.nhindirect.stagent.policy.impl
-	          </excludePackageNames>          	          
+	            </excludePackageNames>          	          
 	        </configuration>
             <executions>
               <execution>
@@ -361,7 +351,7 @@
               </execution>
             </executions>	        
 	      </plugin>		
-
+		<!--  for release only   
 	      <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-gpg-plugin</artifactId>
@@ -376,42 +366,10 @@
             </executions>
          </plugin>
          -->
-    </plugins>
-    <pluginManagement>
-       <plugins>
-          <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5.3</version>
-          </plugin>
-          <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-site-plugin</artifactId>
-             <version>3.6</version>
-             <dependencies>
-               <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.1</version>
-                <exclusions>
-                 <exclusion>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-                 </exclusion>
-               </exclusions>
-             </dependency>
-            </dependencies>
-          </plugin>	
-       </plugins>
-    </pluginManagement>		    
+    </plugins>    
   </build>                        
   <reporting>
 		<plugins>
-	       <plugin>
-	          <groupId>org.apache.maven.plugins</groupId>
-	          <artifactId>maven-site-plugin</artifactId>
-	          <version>3.6</version>
-	       </plugin>   
 	       <plugin>
 	          <groupId>org.apache.maven.plugins</groupId>
 	          <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -422,16 +380,17 @@
 	        <artifactId>maven-javadoc-plugin</artifactId>
 	        <version>2.6.1</version>
 	        <configuration>
-	          <charset>UTF-8</charset>
-	          <docencoding>UTF-8</docencoding>
-	          <docfilessubdirs>true</docfilessubdirs>
-              <detectJavaApiLink>true</detectJavaApiLink>
-              <detectLinks>true</detectLinks>
-	          <source>1.8</source>
-	          <show>public</show>
-	          <excludePackageNames>
+			    <additionalparam>-Xdoclint:none</additionalparam>
+				<charset>UTF-8</charset>
+				<docencoding>UTF-8</docencoding>
+				<docfilessubdirs>true</docfilessubdirs>
+				<detectJavaApiLink>true</detectJavaApiLink>
+				<detectLinks>true</detectLinks>
+				<source>1.8</source>
+				<show>public</show>
+	            <excludePackageNames>
 	              org.nhindirect.stagent.annotation:org.nhindirect.stagent.cert.impl:org.nhindirect.stagent.cert.impl.annotation:org.nhindirect.stagent.cert.impl.module:org.nhindirect.stagent.cert.impl.provider:org.nhindirect.stagent.cryptography.annotation:org.nhindirect.stagent.module:org.nhindirect.stagent.provider:org.nhindirect.stagent.trust.annotation:org.nhindirect.stagent.trust.provider:org.nhindirect.stagent.utils:org.nhindirect.stagent.policy.impl
-	          </excludePackageNames>          	          
+	            </excludePackageNames>          	          
 	        </configuration>
 	      </plugin>
 			<plugin>
@@ -449,17 +408,9 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
 			</plugin>		
-	        <plugin>
-	            <groupId>org.codehaus.mojo</groupId>
-	            <artifactId>clirr-maven-plugin</artifactId>
-	            <configuration>
-	                <minSeverity>info</minSeverity>
-	            </configuration>
-	        </plugin> 
 	        <plugin>
 	            <groupId>org.codehaus.mojo</groupId> 
-	            <artifactId>findbugs-maven-plugin</artifactId>
-	            <version>2.5</version> 
+                <artifactId>findbugs-maven-plugin</artifactId>
 	            <configuration>
 	                <effort>Max</effort>
 	                <excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>
diff --git a/src/site/apt/releaseNotes.apt b/src/site/apt/releaseNotes.apt
index 8dd7101..6b59e1d 100644
--- a/src/site/apt/releaseNotes.apt
+++ b/src/site/apt/releaseNotes.apt
@@ -6,6 +6,30 @@
         Greg Meyer
         ---
 
+{6.0}
+
+    Changes included with release 6.0
+    
+    []
+    
+    Enhancements
+    
+ 	* Requires Java 8
+ 	
+ 	* Incorporation/Upgrade to Spring 5, SpringBoot 2.1, and SpringCloud Greenwich.
+ 	
+ 	* Refactoring of common classes (such as OptionsManager and CrytptoExtensions) to direct common.
+ 	
+ 	* Removal of Google Guice IoC framework
+ 	
+ 	* Updating to bcprov-jdk15on library.  This removes custom "split brain" logic when working with HSMs.
+
+    [] 
+     
+    Bug Fixes
+
+    * NA
+
 {2.2.4}
 
     Changes included with release 2.2.4
diff --git a/src/test/java/org/nhindirect/stagent/trust/TrustChainValidator_IntermidiateCert_Test.java b/src/test/java/org/nhindirect/stagent/trust/TrustChainValidator_IntermidiateCert_Test.java
index 8be5514..6b708f1 100644
--- a/src/test/java/org/nhindirect/stagent/trust/TrustChainValidator_IntermidiateCert_Test.java
+++ b/src/test/java/org/nhindirect/stagent/trust/TrustChainValidator_IntermidiateCert_Test.java
@@ -91,22 +91,6 @@ private X509Certificate certFromData(byte[] data)
         return retVal;
     }
     
-    public void testValidateCertAgainstNonRootCA_CertGenToolCerts() throws Exception
-    {
-    	X509Certificate anchor = certFromData(getCertificateFileData("messaging.cerner.com.der"));
-    	X509Certificate certToValidate = certFromData(getCertificateFileData("greg@messaging.cerner.com.p12"));
-    	
-    	TrustChainValidator validator = new TrustChainValidator();
-    	
-    	boolean isTrusted = false;
-    	try
-    	{	
-    		isTrusted = validator.isTrusted(certToValidate, Arrays.asList(anchor));
-    	}
-    	catch (Exception e) {}
-    	
-    	assertTrue(isTrusted);
-    }
     
     public void testValidateCertAgainstNonRootCA_OpenSSLCerts() throws Exception
     {