Add 'springVersion' and 'groovyVersion' variables for use in BuildConfig

grails · May 8, 2014 · 82275e9 · 82275e9
1 parent 2f426d2
commit 82275e9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy b/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
@@ -1372,6 +1372,8 @@ class BuildSettings extends AbstractBuildSettings {
                 grailsVersion: grailsVersion,
                 userHome: userHome,
                 grailsSettings: this,
+                groovyVersion: "${->coreDependencies?.groovyVersion}",
+                springVersion: "${->coreDependencies?.springVersion}",
                 appName: Metadata.getCurrent().getApplicationName(),
                 appVersion: Metadata.getCurrent().getApplicationVersion())
         return slurper

diff --git a/...rap/src/main/groovy/org/codehaus/groovy/grails/resolve/DependencyManagerConfigurer.groovy b/...rap/src/main/groovy/org/codehaus/groovy/grails/resolve/DependencyManagerConfigurer.groovy
@@ -55,6 +55,7 @@ class DependencyManagerConfigurer {
 
         final coreDeps = classLoader.loadClass("org.codehaus.groovy.grails.resolve.maven.aether.config.GrailsAetherCoreDependencies")
             .newInstance(grailsVersion, buildSettings.servletVersion, !org.codehaus.groovy.grails.plugins.GrailsVersionUtils.isVersionGreaterThan("1.5", buildSettings.compilerTargetLevel), buildSettings.isGrailsProject())
+        buildSettings.coreDependencies = (GrailsCoreDependencies)coreDeps
         prepareAetherDependencies(aetherDependencyManager, buildSettings, coreDeps)
 
         if (buildSettings.proxySettings) {

diff --git a/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java b/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
@@ -32,6 +32,7 @@ public class GrailsCoreDependencies {
     public final String grailsVersion;
     public final String servletVersion;
     protected final String groovyVersion = "2.3.0";
+    protected final String springVersion = "4.0.4";
     protected final String log4jVersion = "1.2.17";
     protected final String h2Version = "1.3.173";
     protected final String jaxbVersion = "2.0";
@@ -129,6 +130,18 @@ public String getGrailsVersion() {
         return grailsVersion;
     }
 
+    public String getGroovyVersion() {
+        return groovyVersion;
+    }
+
+    public String getServletVersion() {
+        return servletVersion;
+    }
+
+    public String getSpringVersion() {
+        return springVersion;
+    }
+
     public boolean isJava5compatible() {
         return java5compatible;
     }