Merge branch 'master' of github.com:grails/grails-maven

grails · Sep 23, 2015 · 180aa97 · 180aa97
2 parents 64e5576 + 85a3112
commit 180aa97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.grails</groupId>
     <artifactId>grails-maven-plugin</artifactId>
-    <version>2.4.4</version>
+    <version>2.4.6</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven plugin for GRAILS applications</name>
@@ -48,8 +48,8 @@
         <maven.version>3.1.0</maven.version>
 
         <!-- Dependencies -->
-        <groovy.version>2.3.7</groovy.version>
-        <grails.version>2.4.4</grails.version>
+        <groovy.version>2.4.4</groovy.version>
+        <grails.version>2.5.1</grails.version>
         <grails-launcher.version>1.0.5</grails-launcher.version>
         <aether.version>1.0.0.v20140518</aether.version>
         <maven-model.version>${maven.version}</maven-model.version>

diff --git a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java
@@ -68,7 +68,7 @@ public abstract class AbstractGrailsMojo extends AbstractMojo {
     public static final String APP_GRAILS_VERSION = "app.grails.version";
     public static final String APP_VERSION = "app.version";
     public static final String APP_NAME = "app.name";
-    public static final String SPRING_LOADED_VERSION = "1.2.0.RELEASE";
+    public static final String SPRING_LOADED_VERSION = "1.2.4.RELEASE";
     public static final List<String> COMPILE_PLUS_RUNTIME_SCOPE = Arrays.asList("compile", "runtime");
 
     /**
@@ -705,10 +705,10 @@ private boolean syncVersions(Properties metadata) {
         }
 
         Object appName = metadata.get(APP_NAME);
-        if (!project.getName().equals(appName)) {
+        if (!project.getArtifactId().equals(appName)) {
             metadata.put(APP_NAME, project.getName());
             result = true;
-        }
+        } 
 
         return result;
     }
@@ -749,11 +749,14 @@ private void configureMavenProxy() {
             if (activeProxy != null) {
                 String host = activeProxy.getHost();
                 int port = activeProxy.getPort();
+                String noProxy = activeProxy.getNonProxyHosts();
                 String username = activeProxy.getUsername();
                 String password = activeProxy.getPassword();
-
                 System.setProperty("http.proxyHost", host);
                 System.setProperty("http.proxyPort", String.valueOf(port));
+                if (noProxy != null) {
+                    System.setProperty("http.nonProxyHosts", noProxy);
+                }
                 if (username != null) {
                     System.setProperty("http.proxyUser", username);
                 }