From e5a3a91ac3557601e03094e90ba3ba824a01e028 Mon Sep 17 00:00:00 2001
From: Mark Derricutt <mark.derricutt@smxemail.com>
Date: Tue, 27 Mar 2018 15:59:01 +1300
Subject: [PATCH] Update dependencies and README for 2.11

Change-Id: I3979e9f440a975dab3fb60226dcb6961ef026f46
---
 README.adoc                                   |  8 ++---
 pom.xml                                       | 30 ++++++++-----------
 .../maven/tiles/AbstractTileMojo.groovy       |  2 +-
 .../TilesMavenLifecycleParticipant.groovy     |  7 ++++-
 .../maven/tiles/ValidateTileMojo.groovy       |  2 --
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/README.adoc b/README.adoc
index 0f53dda..0635846 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-= Tiles Maven Plugin - Version 2.10
+= Tiles Maven Plugin - Version 2.11
 
 image:https://travis-ci.org/repaint-io/maven-tiles.svg[caption="Travis Build Status"] image:https://badges.gitter.im/repaint-io/maven-tiles.svg[link="https://gitter.im/repaint-io/maven-tiles?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 
@@ -62,7 +62,7 @@ you specify a configuration.
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.10</version>
+        <version>2.11</version>
         <extensions>true</extensions>
         <configuration>
           <filtering>false</filtering>
@@ -160,7 +160,7 @@ If you need to use them, add them to your configuration section:
     <plugin>
       <groupId>io.repaint.maven</groupId>
       <artifactId>tiles-maven-plugin</artifactId>
-      <version>2.10</version>
+      <version>2.11</version>
       <configuration>
         <buildSmells>dependencymanagement, dependencies, repositories, pluginrepositories</buildSmells>
         <tiles>
@@ -233,7 +233,7 @@ be applied (in this case before `P`) resulting in the desired structure:
     <plugin>
       <groupId>io.repaint.maven</groupId>
       <artifactId>tiles-maven-plugin</artifactId>
-      <version>2.10</version>
+      <version>2.11</version>
       <configuration>
         <applyBefore>group:P</applyBefore>
         <tiles>
diff --git a/pom.xml b/pom.xml
index 50eccc1..2e5e96e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,12 +47,8 @@
     </developer>
   </developers>
 
-  <prerequisites>
-    <maven>3.0.4</maven>
-  </prerequisites>
-
   <properties>
-    <mavenVersion>3.3.3</mavenVersion>
+    <mavenVersion>3.5.3</mavenVersion>
     <repaint.release>dev</repaint.release>
   </properties>
 
@@ -80,7 +76,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>2.4.8</version>
+      <version>2.4.14</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -192,12 +188,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.4.1</version>
+        <version>3.0.0-M1</version>
         <!-- Invocation is defined by the release plugin goal set hence no executions -->
         <configuration>
           <rules>
             <requireMavenVersion>
-              <version>[3.2.2,)</version>
+              <version>[3.5.3,)</version>
             </requireMavenVersion>
             <requireReleaseDeps>
               <!--  Don't allow releases with snapshop deps or parents -->
@@ -234,17 +230,17 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.7.0</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-        <version>1.5.5</version>
+        <version>1.7.1</version>
         <executions>
           <execution>
             <goals>
@@ -257,7 +253,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.5</version>
+        <version>3.5.1</version>
         <configuration>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
         </configuration>
@@ -282,21 +278,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>2.21.0</version>
       </plugin>
 
       <!-- not supporting mixed java/groovy compilation -->
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
-        <version>1.5</version>
+        <version>1.6</version>
         <executions>
           <execution>
             <goals>
               <goal>addSources</goal>
               <goal>addTestSources</goal>
               <goal>compile</goal>
-              <goal>testCompile</goal>
+              <goal>compileTests</goal>
             </goals>
           </execution>
         </executions>
@@ -306,7 +302,7 @@
       <plugin>
         <groupId>com.bluetrainsoftware.maven</groupId>
         <artifactId>groovydoc-maven-plugin</artifactId>
-        <version>1.3</version>
+        <version>2.1</version>
         <executions>
           <execution>
             <id>attach-docs</id>
diff --git a/src/main/groovy/io/repaint/maven/tiles/AbstractTileMojo.groovy b/src/main/groovy/io/repaint/maven/tiles/AbstractTileMojo.groovy
index a2ae79e..5fd9bdf 100644
--- a/src/main/groovy/io/repaint/maven/tiles/AbstractTileMojo.groovy
+++ b/src/main/groovy/io/repaint/maven/tiles/AbstractTileMojo.groovy
@@ -41,7 +41,7 @@ abstract class AbstractTileMojo extends AbstractMojo {
 	@Component
 	Logger logger
 
-	@Component
+	@Parameter( defaultValue = "\${session}", readonly = true )
 	MavenSession mavenSession
 
 	@Component
diff --git a/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy b/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
index 8c5181a..0460d31 100644
--- a/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
+++ b/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
@@ -36,6 +36,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolver
 import org.apache.maven.artifact.versioning.VersionRange
 import org.apache.maven.execution.MavenSession
 import org.apache.maven.model.Build
+import org.apache.maven.model.Dependency
 import org.apache.maven.model.DistributionManagement
 import org.apache.maven.model.Model
 import org.apache.maven.model.Parent
@@ -513,7 +514,7 @@ public class TilesMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
 
 		return new ModelResolver() {
 			ModelSource2 resolveModel(String groupId, String artifactId, String version) throws UnresolvableModelException {
-				Artifact artifact = new DefaultArtifact(groupId, artifactId, VersionRange.createFromVersion(version), "compile",
+                                Artifact artifact = new DefaultArtifact(groupId, artifactId, VersionRange.createFromVersion(version), "compile",
 					"pom", null, new DefaultArtifactHandler("pom"))
 
 				mavenVersionIsolate.resolveVersionRange(artifact)
@@ -522,6 +523,10 @@ public class TilesMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
 				return createModelSource(artifact.file)
 			}
 
+			ModelSource2 resolveModel(Dependency dependency) throws UnresolvableModelException {
+				return resolveModel(dependency.groupId, dependency.artifactId, dependency.version)
+			}
+
 			ModelSource2 resolveModel(Parent parent) throws UnresolvableModelException {
 				return resolveModel(parent.groupId, parent.artifactId, parent.version)
 			}
diff --git a/src/main/groovy/io/repaint/maven/tiles/ValidateTileMojo.groovy b/src/main/groovy/io/repaint/maven/tiles/ValidateTileMojo.groovy
index 33cc2ac..d0fc3c1 100644
--- a/src/main/groovy/io/repaint/maven/tiles/ValidateTileMojo.groovy
+++ b/src/main/groovy/io/repaint/maven/tiles/ValidateTileMojo.groovy
@@ -16,8 +16,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope
 @CompileStatic
 @Mojo(name = "validate", requiresProject = true, requiresDependencyResolution = ResolutionScope.NONE)
 class ValidateTileMojo extends AbstractTileMojo {
-	@Component
-	MavenSession session
 
 	@Override
 	void execute() throws MojoExecutionException, MojoFailureException {