Merge branch 'master' of github.com:apache/brooklyn-library

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 75fca62..5fd1e30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM maven:3.5.4-jdk-8-alpine
+FROM maven:3.5.2-jdk-8-alpine
 
-# Install necessary binaries to build brooklyn-library
-RUN apk add --no-cache git procps
+# Install necessary binaries to build brooklyn-server
+RUN apk add --no-cache git
 
 RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
 ENV MAVEN_CONFIG=/var/maven/.m2
-

software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java

diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
index 74960bd..278f0aa 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
@@ -203,6 +203,7 @@
 
         @Override
         public HostGeoInfo getHostGeoInfo(InetAddress address) throws Exception {
+            if (isHostGeoLookupGloballyDisabled()) return null;
             // Saw strange test failure on jenkins: hence paranoid logging, just in case exception is swallowed somehow.
             try {
                 HostGeoInfo result;