fix for GRAILS-6133 and various other fixes to the POMs to ensure Grails 1.3.2 is compatible with the maven plugin

Author: graemerocher

maven/grails-bootstrap.pom.in

@@ -38,6 +38,12 @@
           <artifactId>gpars</artifactId>
           <version>0.9</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.ivy</groupId>
+            <artifactId>ivy</artifactId>
+            <version>2.1.0</version>
+        </dependency>
 
         <dependency>
             <groupId>org.codehaus.gant</groupId>

maven/grails-gorm.pom.in

@@ -62,27 +62,6 @@
             </exclusions>
         </dependency>
 
-        <!--
-          The next two are only needed if you use Hibernate annotations
-          in your project.
-        -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-annotations</artifactId>
-            <version>3.4.0.GA</version>            
-        </dependency>
-
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-commons-annotations</artifactId>
-            <version>3.1.0.GA</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>hibernate-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
 <!-- Grails Dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -161,9 +140,21 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-annotations</artifactId>
-            <version>3.4.0.ga</version>            
+            <version>3.4.0.GA</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-commons-annotations</artifactId>
+            <version>3.1.0.GA</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hibernate-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
         <dependency>
             <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>

src/java/org/codehaus/groovy/grails/resolve/PluginResolveEngine.groovy

@@ -47,7 +47,9 @@ final class PluginResolveEngine {
     IvyDependencyManager createFreshDependencyManager() {
         IvyDependencyManager dm = new IvyDependencyManager(dependencyManager.applicationName, dependencyManager.applicationVersion ?: "0.1", settings)
         dm.chainResolver = dependencyManager.chainResolver
-        dm.logger = dependencyManager.logger
+        if(dependencyManager.logger) {            
+            dm.logger = dependencyManager.logger
+        }
         return dm
     }