[MACR-30] Add LifecycleMapping and ArtifactHandler from maven-core to target packaging plugin
o The maven-acr-plugin already had the mapping for a long time
only improved it a little bit.
o Changed the location from src/main/resources to src/main/filtered-resources
instead to make it more clear and using the project.version to always use
the current version of the plugin.
o Added some comments in the components.xml
o Upgraded plugins
o maven-compiler-plugin from 3.3 to 3.5.1
o Using ${project.version} for the acr plugin.
o No need to add a supplemental IT cause they are using already
extensions=true.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1741760 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index b965bbf..3ee3b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,14 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
<profiles>
<profile>
<id>run-its</id>
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/filtered-resources/META-INF/plexus/components.xml
similarity index 86%
rename from src/main/resources/META-INF/plexus/components.xml
rename to src/main/filtered-resources/META-INF/plexus/components.xml
index ea8da90..60f08a0 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/filtered-resources/META-INF/plexus/components.xml
@@ -20,6 +20,9 @@
*/-->
<component-set>
<components>
+ <!--
+ | ACR
+ |-->
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>app-client</role-hint>
@@ -31,6 +34,14 @@
<addedToClasspath>true</addedToClasspath>
</configuration>
</component>
+ <!--
+ | Defining the phases with their appropriate plugins
+ ! and versions which will be executed during the 'default'
+ ! life cycle.
+ -->
+ <!--
+ | ACR
+ |-->
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
<role-hint>app-client</role-hint>
@@ -44,19 +55,19 @@
org.apache.maven.plugins:maven-resources-plugin:2.7:resources
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.3:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
org.apache.maven.plugins:maven-resources-plugin:2.7:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.18.1:test
</test>
<package>
- org.apache.maven.plugins:maven-acr-plugin:acr
+ org.apache.maven.plugins:maven-acr-plugin:${project.version}:acr
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:2.5.2:install
