From d3bdbcf7f2abc0f0c27a06cf4bdfcec7f74700af Mon Sep 17 00:00:00 2001 From: "J. John Pease" Date: Tue, 27 Jan 2015 16:42:10 -0500 Subject: [PATCH 1/5] Added support for nonProxyHosts when using an active maven proxy --- src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java index 91ba7e7..e941a33 100755 --- a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java +++ b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java @@ -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)); + System.setProperty("http.nonProxyHosts", noProxy); + if (username != null) { System.setProperty("http.proxyUser", username); } From 731080ba01e4318469b0f7ab4f2e14d509173ff4 Mon Sep 17 00:00:00 2001 From: John Pease Date: Tue, 27 Jan 2015 21:11:02 -0500 Subject: [PATCH 2/5] Only set http.nonProxyHosts if noProxy != null --- .../java/org/grails/maven/plugin/AbstractGrailsMojo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java index e941a33..f0e2d17 100755 --- a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java +++ b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java @@ -752,11 +752,11 @@ private void configureMavenProxy() { String noProxy = activeProxy.getNonProxyHosts(); String username = activeProxy.getUsername(); String password = activeProxy.getPassword(); - System.setProperty("http.proxyHost", host); System.setProperty("http.proxyPort", String.valueOf(port)); - System.setProperty("http.nonProxyHosts", noProxy); - + if (noProxy != null) { + System.setProperty("http.nonProxyHosts", noProxy); + } if (username != null) { System.setProperty("http.proxyUser", username); } From 6d94c69b857f78a96b2371ac0087315aea8385a4 Mon Sep 17 00:00:00 2001 From: Mike Thomsen Date: Mon, 2 Mar 2015 09:51:03 -0500 Subject: [PATCH 3/5] Fixed issue 63 Made it synchronize the app.name property with artifactId, not project.name since project.name is intended to be able to be a well-formatted, human-readable name. --- src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java index f0e2d17..81353f4 100755 --- a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java +++ b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java @@ -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; } From 1474acd165ac14c1ffb48beb540e5f3dbfd93d18 Mon Sep 17 00:00:00 2001 From: ben_t_mcguire Date: Wed, 22 Jul 2015 23:10:33 -0700 Subject: [PATCH 4/5] Updated project version and groovy version Resolve the issues of groovy version mismatch for Grails 2.5.0. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cfc9bb1..6b0388b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.grails grails-maven-plugin - 2.4.3 + 2.4.5 maven-plugin Maven plugin for GRAILS applications @@ -48,7 +48,7 @@ 3.1.0 - 2.3.3 + 2.4.3 2.4.3 1.0.5 1.0.0.v20140518 From c64bda7f265945a8f8f952c44677e9f7df0469a2 Mon Sep 17 00:00:00 2001 From: Mike Date: Tue, 11 Aug 2015 12:26:28 -0400 Subject: [PATCH 5/5] Upgraded SpringLoaded to address issue #70 for now. --- pom.xml | 4 ++-- src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6b0388b..c79f1c1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.grails grails-maven-plugin - 2.4.5 + 2.4.6 maven-plugin Maven plugin for GRAILS applications @@ -48,7 +48,7 @@ 3.1.0 - 2.4.3 + 2.4.4 2.4.3 1.0.5 1.0.0.v20140518 diff --git a/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java b/src/main/java/org/grails/maven/plugin/AbstractGrailsMojo.java index 81353f4..7d92200 100755 --- 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 COMPILE_PLUS_RUNTIME_SCOPE = Arrays.asList("compile", "runtime"); /**