Merge pull request #7 from DirectProjectJavaRI/develop

Fixes for 6.0.2 release.

Author: Greg Meyer

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>gateway</artifactId>    
     <name>Direct Project Agent Gateways.</name>
-    <version>6.0.1</version>
+    <version>6.0.2</version>
     <description>Direct Project security agent gateways and bridges.</description>
     <inceptionYear>2010</inceptionYear>
     <url>https://github.com/DirectProjectJavaRI/gateway</url>        
@@ -28,7 +28,7 @@
    <parent>
 	   <groupId>org.springframework.boot</groupId>
 	   <artifactId>spring-boot-dependencies</artifactId>
-	   <version>2.1.2.RELEASE</version>
+	   <version>2.1.3.RELEASE</version>
    </parent>    
   <scm>
      <url>https://nhin-d.googlecode.com/hg/java/gateway/</url>  
@@ -45,14 +45,14 @@
 		  <dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.1.2.RELEASE</version>
+				<version>2.1.3.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 		  </dependency>		
 		  <dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-parent</artifactId>
-				<version>Greenwich.RELEASE</version>
+				<version>Greenwich.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 		  </dependency>  
@@ -62,7 +62,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>agent</artifactId>
-	        <version>6.0.1</version>
+	        <version>6.0.2</version>
 	    </dependency> 
 	    <dependency>
 	        <groupId>org.nhind</groupId>
@@ -103,7 +103,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>agent</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.2</version>
 	         <type>test-jar</type>
 	        <scope>test</scope>
 	    </dependency>      
@@ -156,7 +156,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>config-service-jar</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.1</version>
 	        <scope>test</scope>	        
 	    </dependency>							
 	    <dependency>
@@ -288,81 +288,11 @@
                   <!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> -->
                </archive>
             </configuration>
-         </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 
-        the generate site. -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>book</id>
-              <phase>pre-site</phase>
-              <configuration>
-                <tasks>
-                  <copy todir="${project.build.directory}/generated-site/xdoc/users-guide/images/">
-                    <fileset dir="${basedir}/src/books/users-guide/images/" />
-                  </copy>
-                  <copy todir="${project.build.directory}/site/users-guide/images/">
-                    <fileset dir="${basedir}/src/books/users-guide/images/" />
-                  </copy>                  
-                </tasks>
-              </configuration>
-              <goals>
-                <goal>run</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>        
-	    <plugin>
-			<groupId>org.apache.maven.doxia</groupId>
-			<artifactId>doxia-maven-plugin</artifactId>
-			<version>1.2</version>
-			<executions>
-				<execution>
-					<phase>pre-site</phase>
-					<goals>
-						<goal>render-books</goal>
-					</goals>
-				</execution>
-			</executions>
-			<configuration>
-				<books>
-					<book>
-						<directory>src/books/users-guide</directory>
-						<descriptor>src/books/users-guide.xml</descriptor>
-						<formats>
-							<format>
-								<id>xdoc</id>
-							</format>													
-						</formats>
-					</book>
-				</books>
-			</configuration>
-			<dependencies>
-				<dependency>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-utils</artifactId>
-					<version>1.5.12</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.maven.doxia</groupId>
-					<artifactId>doxia-decoration-model</artifactId>
-					<version>1.2</version>
-				</dependency>
-                <dependency>
-                    <groupId>org.apache.maven.doxia</groupId>
-                    <artifactId>doxia-module-confluence</artifactId>
-                    <version>1.2</version>
-                </dependency>
-			</dependencies>
-		</plugin>   			
+         </plugin>   			
 	      <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>
@@ -413,7 +343,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>