You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/07/31 12:58:19 UTC

[maven-archetype] branch buildfix updated: mrm-maven-plugin:1.2.0 and split invoker:run to two goals

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch buildfix
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git


The following commit(s) were added to refs/heads/buildfix by this push:
     new 1afaf76  mrm-maven-plugin:1.2.0 and split invoker:run to two goals
1afaf76 is described below

commit 1afaf762fecd12d2443939d3ecbba46f67ea5100
Author: tibordigana <ti...@apache.org>
AuthorDate: Wed Jul 31 14:58:07 2019 +0200

    mrm-maven-plugin:1.2.0 and split invoker:run to two goals
---
 maven-archetype-plugin/pom.xml | 71 +++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 28 deletions(-)

diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index 5b99d27..943f691 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -194,7 +194,7 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>mrm-maven-plugin</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.0</version>
             <executions>
               <execution>
                 <id>mirror</id>
@@ -234,40 +234,55 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
             <version>3.2.0</version>
-            <configuration>
-              <showErrors>true</showErrors>
-              <debug>true</debug>
-              <projectsDirectory>src/it/projects</projectsDirectory>
-              <cloneClean>true</cloneClean>
-              <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo>
-              <pomIncludes>
-                <pomInclude>*</pomInclude>
-              </pomIncludes>
-              <preBuildHookScript>setup</preBuildHookScript>
-              <postBuildHookScript>verify</postBuildHookScript>
-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-              <settingsFile>src/it/mrm/settings.xml</settingsFile>
-              <filterProperties>
-                <repository.proxy.url>${mrm.repository.url}</repository.proxy.url>
-                <archetype-repo.proxy.url>${archetype-repo.proxy.url}</archetype-repo.proxy.url>
-              </filterProperties>
-              <properties>
-                <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
-                <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
-                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
-                <https.protocols>${https.protocols}</https.protocols>
-              </properties>
-              <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures>
-            </configuration>
             <executions>
               <execution>
-                <id>integration-test</id>
+                <id>invoker-install</id>
                 <goals>
                   <goal>install</goal>
-                  <goal>run</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>invoker-it</id>
+                <goals>
+                  <goal>integration-test</goal>
+                </goals>
+                <configuration>
+                  <showErrors>true</showErrors>
+                  <debug>true</debug>
+                  <projectsDirectory>src/it/projects</projectsDirectory>
+                  <cloneClean>true</cloneClean>
+                  <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo>
+                  <pomIncludes>
+                    <pomInclude>*</pomInclude>
+                  </pomIncludes>
+                  <preBuildHookScript>setup</preBuildHookScript>
+                  <postBuildHookScript>verify</postBuildHookScript>
+                  <settingsFile>src/it/mrm/settings.xml</settingsFile>
+                  <filterProperties>
+                    <repository.proxy.url>${mrm.repository.url}</repository.proxy.url>
+                    <archetype-repo.proxy.url>${archetype-repo.proxy.url}</archetype-repo.proxy.url>
+                  </filterProperties>
+                  <properties>
+                    <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+                    <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+                    <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+                    <https.protocols>${https.protocols}</https.protocols>
+                  </properties>
+                </configuration>
+              </execution>
+              <execution>
+                <id>invoker-verify</id>
+                <goals>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures>
+                </configuration>
+              </execution>
             </executions>
+            <configuration>
+              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+            </configuration>
           </plugin>
         </plugins>
       </build>