Merge pull request #8 from DirectProjectJavaRI/develop

Releasing 6.0.3

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.2</version>
+    <version>6.0.3</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.3.RELEASE</version>
+	   <version>2.1.9.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.3.RELEASE</version>
+				<version>2.1.9.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 		  </dependency>		
 		  <dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-parent</artifactId>
-				<version>Greenwich.SR1</version>
+				<version>Greenwich.SR3</version>
 				<type>pom</type>
 				<scope>import</scope>
 		  </dependency>  
@@ -67,7 +67,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>direct-common</artifactId>
-	        <version>6.0</version>
+	        <version>6.0.1</version>
 	    </dependency> 	
 	    <dependency>
 	        <groupId>org.nhind</groupId>
@@ -156,7 +156,7 @@
 	    <dependency>
 	        <groupId>org.nhind</groupId>
 	        <artifactId>config-service-jar</artifactId>
-	        <version>6.0.1</version>
+	        <version>6.0.4</version>
 	        <scope>test</scope>	        
 	    </dependency>							
 	    <dependency>
@@ -205,17 +205,17 @@
 		<extension>
 			<groupId>org.apache.maven.wagon</groupId>
 			<artifactId>wagon-webdav-jackrabbit</artifactId>
-			<version>3.1.0</version>
+			<version>3.3.3</version>
 		</extension>
 		<extension>
 			<groupId>org.apache.maven.wagon</groupId>
 			<artifactId>wagon-ssh-external</artifactId>
-			<version>3.1.0</version>
+			<version>3.3.3</version>
 		</extension>
 		<extension>
 			<groupId>org.apache.maven.wagon</groupId>
 			<artifactId>wagon-ssh</artifactId>
-			<version>3.1.0</version>
+			<version>3.3.3</version>
 		</extension>
    	</extensions>
     <resources>

src/main/java/org/nhindirect/gateway/springconfig/DNSResolverConfig.java

@@ -1,6 +1,8 @@
 package org.nhindirect.gateway.springconfig;
 
 import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.List;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -11,6 +13,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.xbill.DNS.ExtendedResolver;
 import org.xbill.DNS.Resolver;
+import org.xbill.DNS.ResolverConfig;
 import org.xbill.DNS.SimpleResolver;
 
 @Configuration
@@ -43,24 +46,23 @@ public ExtendedResolver getDNSResolver() throws Exception
 			}
 		}
 
-		if (!StringUtils.isEmpty(dnsServers)) 
+		final List<String> servers = getDNSServers();
+		
+		for (String server : servers) 
 		{
-			for (String server : dnsServers.split(",")) 
-			{
-				// support for IP addresses instead of names
-				server = server.replaceFirst("\\.$", "");
+			// support for IP addresses instead of names
+			server = server.replaceFirst("\\.$", "");
 
-				try 
-				{
-					// create and add a SimpleResolver for each server
-					SimpleResolver simpleResolver = new SimpleResolver(server);
-					extendedResolver.addResolver(simpleResolver);
-				} 
-				catch (UnknownHostException e) 
-				{
-					LOGGER.warn("Unable to add resolver for " + server, e);
-					continue;
-				}
+			try 
+			{
+				// create and add a SimpleResolver for each server
+				SimpleResolver simpleResolver = new SimpleResolver(server);
+				extendedResolver.addResolver(simpleResolver);
+			} 
+			catch (UnknownHostException e) 
+			{
+				LOGGER.warn("Unable to add resolver for " + server, e);
+				continue;
 			}
 		}
 
@@ -69,4 +71,12 @@ public ExtendedResolver getDNSResolver() throws Exception
 
 		return extendedResolver;
 	}		
+	
+	protected List<String> getDNSServers()
+	{
+		final String[] configedServers = (!StringUtils.isEmpty(dnsServers)) ? dnsServers.split(",") :
+			ResolverConfig.getCurrentConfig().servers();
+		
+		return Arrays.asList(configedServers);
+	}
 }

src/test/java/org/nhindirect/stagent/TestApplication.java

@@ -1,5 +1,6 @@
 package org.nhindirect.stagent;
 
+import org.nhindirect.gateway.springconfig.KeyStoreProtectionMgrConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -9,7 +10,7 @@
 @SpringBootApplication
 @ComponentScan({"org.nhindirect.config", "org.nhind.config"})
 @EnableFeignClients({"org.nhind.config.rest.feign"})
-@Import(StreamsConfiguration.class)
+@Import({StreamsConfiguration.class, KeyStoreProtectionMgrConfig.class})
 public class TestApplication
 {
     public static void main(String[] args)