Fix tests / upgrade dependencies

Author: graemerocher

build.gradle

@@ -34,7 +34,7 @@ ext {
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.2"
     commonsLangVersion = "2.6"
-    datastoreVersion = "6.0.8.BUILD-SNAPSHOT"
+    datastoreVersion = "6.0.8.RELEASE"
     gdocEngineVersion = "1.0.1"
     groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.9"
     ivyVersion = "2.3.0"
@@ -49,7 +49,7 @@ ext {
     springBootVersion = "1.4.4.RELEASE"
     springLoadedVersion = "1.2.6.RELEASE"
     springLoadedCommonOptions = "-Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true"
-    springVersion = "4.3.6.RELEASE"
+    springVersion = "4.3.7.RELEASE"
     ehcacheVersion = "2.4.6"
     junitVersion = "4.12"
     concurrentlinkedhashmapVersion = "1.4.2"

grails-bom/plugins.properties

@@ -1,16 +1,16 @@
-hibernate4=6.0.8.BUILD-SNAPSHOT
-hibernate5=6.0.8.BUILD-SNAPSHOT
-mongodb=6.0.8.BUILD-SNAPSHOT
+hibernate4=6.0.8
+hibernate5=6.0.8
+mongodb=6.0.8
 rx-gorm-rest-client=1.0.4.RELEASE
-rx-mongodb=6.0.8.BUILD-SNAPSHOT
-neo4j=6.0.8.BUILD-SNAPSHOT
+rx-mongodb=6.0.8
+neo4j=6.0.8
 cache=3.0.3
 asset-pipeline=3.2.1
 asset-pipeline-grails=2.11.6
 scaffolding=3.2.1
 fields=2.1.3
 geb=1.0.2
-rxjava=1.0.1
+rxjava=1.1.0
 views-json=1.1.5
 views-json-templates=1.1.5
 views-markup=1.1.5

grails-bootstrap/src/main/groovy/grails/util/Environment.java

@@ -260,11 +260,20 @@ private void initialize() {
      * @return The current environment.
      */
     public static Environment getCurrent() {
+        String envName = System.getProperty(Environment.KEY);
+        Environment env;
+        if(!isBlank(envName)) {
+            env = getEnvironment(envName);
+            if(env != null) {
+                return env;
+            }
+        }
+
+
         Environment current = cachedCurrentEnvironment.get();
         if (current != null) {
             return current;
         }
-
         return cacheCurrentEnvironment();
     }
 
@@ -311,6 +320,14 @@ public static Environment getCurrentEnvironment() {
         return getCurrent();
     }
 
+    /**
+     * Reset the current environment
+     */
+    public static void reset() {
+        cachedCurrentEnvironment.set(null);
+        Metadata.reset();
+    }
+
     /**
      * Returns true if the application is running in development mode (within grails run-app)
      *

grails-bootstrap/src/test/groovy/grails/util/EnvironmentTests.groovy

@@ -12,6 +12,7 @@ class EnvironmentTests extends GroovyTestCase {
         System.setProperty(Environment.RELOAD_LOCATION, "")
 
         Metadata.reset()
+        Environment.reset()
     }
 
     void testExecuteForEnvironment() {
@@ -176,6 +177,7 @@ grails:
         assertEquals Environment.PRODUCTION, Environment.getCurrent()
 
         Metadata.getInstance(new ByteArrayInputStream(''.bytes))
+        Environment.reset()
         assertEquals Environment.DEVELOPMENT, Environment.getCurrent()
     }
 

grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMappingSpec.groovy

@@ -158,7 +158,7 @@ class UrlMappingsHandlerMappingSpec extends AbstractUrlMappingsSpec {
         def result = handlerAdapter.handle(request, webRequest.response, handlerChain.handler)
 
         then:"The model and view is correct"
-        result.viewName == '/foo/fooBar'
+        result.viewName == 'fooBar'
         !result.model
 
     }