Updated groovy and build dependencies.

Change-Id: Id6459f68169a571f10c70731ce7bd4cc628e3cf0
repaint-io · May 27, 2020 · 2a0c010 · 2a0c010
1 parent 16269cb
commit 2a0c010
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
 
   <properties>
     <mavenVersion>3.6.3</mavenVersion>
-    <groovyVersion>2.5.8</groovyVersion>
+    <groovyVersion>3.0.4</groovyVersion>
     <repaint.release>dev</repaint.release>
   </properties>
 
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>com.bluetrainsoftware.composite</groupId>
       <artifactId>composite-unit-test</artifactId>
-      <version>[1.1,2)</version>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -163,7 +163,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>2.0.0</version>
+            <version>3.2.1</version>
             <configuration>
               <projectsDirectory>src/it</projectsDirectory>
               <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -208,7 +208,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M1</version>
+        <version>3.0.0-M3</version>
         <!-- Invocation is defined by the release plugin goal set hence no executions -->
         <configuration>
           <rules>
@@ -305,7 +305,7 @@
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
         <executions>
           <execution>
             <goals>
@@ -335,7 +335,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>

diff --git a/src/main/groovy/io/repaint/maven/tiles/TileModel.groovy b/src/main/groovy/io/repaint/maven/tiles/TileModel.groovy
@@ -3,6 +3,7 @@ package io.repaint.maven.tiles
 import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
 import groovy.xml.XmlUtil
+import groovy.xml.XmlSlurper
 import org.apache.maven.artifact.Artifact
 import org.apache.maven.model.Model
 import org.apache.maven.model.Plugin
@@ -29,7 +30,7 @@ class TileModel {
 	@CompileStatic(TypeCheckingMode.SKIP)
 	Reader strippedPom() {
 		return tilePom.withReader { Reader reader ->
-			def slurper = new XmlSlurper(false, false).parse(reader)
+			def slurper = new XmlSlurper(false, false, true).parse(reader)
 
 			if (slurper.tiles) {
 				slurper.tiles.tile.each { tile ->