inteligr8/maven-tiles
1
0
Fork 0
mirror of https://github.com/bmlong137/maven-tiles synced 2025-09-17 14:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies and README for 2.11

Browse Source 
Change-Id: I3979e9f440a975dab3fb60226dcb6961ef026f46
This commit is contained in:
Mark Derricutt
2018-03-27 15:59:01 +13:00
parent 39fc76e6b1
commit e5a3a91ac3
5 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.adoc
View File

@@ -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>

30
pom.xml
View File

@@ -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>

2
src/main/groovy/io/repaint/maven/tiles/AbstractTileMojo.groovy
View File

@@ -41,7 +41,7 @@ abstract class AbstractTileMojo extends AbstractMojo {
@Component
Logger logger
@Component
@Parameter( defaultValue = "\${session}", readonly = true )
MavenSession mavenSession
@Component

5
src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
View File

@@ -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
@@ -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)
}

2
src/main/groovy/io/repaint/maven/tiles/ValidateTileMojo.groovy
View File

@@ -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 {