This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
The following commit(s) were added to refs/heads/master by this push:
new c4e15fa [ARCHETYPE-553] Allow additional properties for
IntegrationTestMojo's MavenInvoker
c4e15fa is described below
commit c4e15fa5c3949f928a16a2782a4e4d2201479959
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Oct 6 12:25:52 2018 +0200
[ARCHETYPE-553] Allow additional properties for IntegrationTestMojo's
MavenInvoker
---
Jenkinsfile | 2 +-
.../archetype/creator/FilesetArchetypeCreator.java | 8 ++++++++
maven-archetype-plugin/pom.xml | 4 ++++
.../invoker.properties | 0
.../pom.xml | 5 ++++-
.../resources/META-INF/maven/archetype-metadata.xml | 0
.../src/main/resources/archetype-resources/pom.xml | 0
.../archetype-resources/src/main/java/App.java | 0
.../resources/projects/archetype.pom.properties | 0
.../test/resources/projects/archetype.properties | 0
.../resources/projects/basic/archetype.properties | 0
.../src/test/resources/projects/basic/goal.txt | 0
.../test/resources/projects/basic/reference/pom.xml | 0
.../src/main/java/build/archetype/App.java | 0
.../src/test/resources/projects/basic/verify.groovy | 0
.../test-settings.xml | 0
.../verify.bsh | 0
.../src/it/projects/build-archetype/pom.xml | 6 +++++-
.../invoker.properties | 0
.../pom.xml | 5 ++++-
.../setup.bsh | 0
.../resources/META-INF/maven/archetype-metadata.xml | 0
.../src/main/resources/archetype-resources/pom.xml | 0
.../archetype-resources/src/main/java/App.java | 0
.../__packageInPathFormat__/__package__.properties | 0
.../main/resources/test-__artifactId__.properties | 0
.../src/site/apt/__artifactId__.apt | 0
.../resources/projects/basic/archetype.properties | 0
.../src/test/resources/projects/basic/goal.txt | 0
.../test/resources/projects/basic/reference/pom.xml | 0
.../src/main/java/build/archetype/App.java | 0
.../build/archetype/build.archetype.properties | 0
.../src/main/resources/test-basic.properties | 0
.../src/site/build/archetype/apt/basic.apt | 0
.../src/test/resources/projects/basic/verify.groovy | 0
.../test-settings.xml | 0
.../verify.bsh | 0
.../maven/archetype/mojos/IntegrationTestMojo.java | 21 +++++++++++++++++++++
38 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 09ac70f..ddbf133 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpStdBuild()
+asfMavenTlpPlgnBuild(tmpWs: true)
diff --git
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
index 7a87419..747d73e 100644
---
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
+++
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
@@ -286,6 +286,14 @@ public class FilesetArchetypeCreator
{
internalRequest.setLocalRepositoryDirectory( new File(
request.getLocalRepository().getBasedir() ) );
}
+
+ String httpsProtocols = System.getProperty( "https.protocols" );
+ if ( httpsProtocols != null )
+ {
+ Properties userProperties = new Properties();
+ userProperties.setProperty( "https.protocols", httpsProtocols
);
+ internalRequest.setProperties( userProperties );
+ }
InvocationResult invokerResult = invoker.execute( internalRequest
);
if ( invokerResult.getExitCode() != 0 )
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index fccb897..d3435ba 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -232,6 +232,10 @@
<repository.proxy.url>${mrm.repository.url}</repository.proxy.url>
<archetype-repo.proxy.url>${archetype-repo.proxy.url}</archetype-repo.proxy.url>
</filterProperties>
+ <properties>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting
with Central -->
+ <https.protocols>${https.protocols}</https.protocols>
+ </properties>
</configuration>
<executions>
<execution>
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/invoker.properties
b/maven-archetype-plugin/src/it/projects/build-and-run-its/invoker.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/invoker.properties
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/invoker.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml
b/maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml
similarity index 92%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml
rename to maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml
index d9ef111..4261595 100644
---
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml
@@ -53,8 +53,11 @@ under the License.
<settingsFile>${basedir}/test-settings.xml</settingsFile>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<ignoreEOLStyle>true</ignoreEOLStyle>
+ <properties>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting
with Central -->
+ <https.protocols>${https.protocols}</https.protocols>
+ </properties>
</configuration>
-
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/META-INF/maven/archetype-metadata.xml
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/pom.xml
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/pom.xml
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/main/resources/archetype-resources/pom.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/java/App.java
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/main/resources/archetype-resources/src/main/java/App.java
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/java/App.java
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/main/resources/archetype-resources/src/main/java/App.java
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.pom.properties
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/archetype.pom.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.pom.properties
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/archetype.pom.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.properties
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/archetype.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.properties
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/archetype.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/archetype.properties
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/archetype.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/archetype.properties
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/archetype.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/goal.txt
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/goal.txt
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/goal.txt
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/goal.txt
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/pom.xml
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/reference/pom.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/pom.xml
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/reference/pom.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/verify.groovy
b/maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/verify.groovy
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/verify.groovy
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/src/test/resources/projects/basic/verify.groovy
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/test-settings.xml
b/maven-archetype-plugin/src/it/projects/build-and-run-its/test-settings.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/test-settings.xml
rename to
maven-archetype-plugin/src/it/projects/build-and-run-its/test-settings.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/verify.bsh
b/maven-archetype-plugin/src/it/projects/build-and-run-its/verify.bsh
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/verify.bsh
rename to maven-archetype-plugin/src/it/projects/build-and-run-its/verify.bsh
diff --git a/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml
b/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml
index 31b8dad..37f7aef 100644
--- a/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml
@@ -50,11 +50,15 @@ under the License.
<artifactId>maven-archetype-plugin</artifactId>
<version>@project.version@</version>
<configuration>
+ <debug>true</debug>
<settingsFile>${basedir}/test-settings.xml</settingsFile>
<localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
<ignoreEOLStyle>true</ignoreEOLStyle>
+ <properties>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting
with Central -->
+ <https.protocols>${https.protocols}</https.protocols>
+ </properties>
</configuration>
-
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/invoker.properties
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/invoker.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/invoker.properties
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/invoker.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml
similarity index 92%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml
rename to maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml
index 833ee27..ae35464 100644
---
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml
@@ -56,8 +56,11 @@ under the License.
<configuration>
<settingsFile>${basedir}/test-settings.xml</settingsFile>
<localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
+ <properties>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting
with Central -->
+ <https.protocols>${https.protocols}</https.protocols>
+ </properties>
</configuration>
-
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/setup.bsh
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/setup.bsh
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/setup.bsh
rename to maven-archetype-plugin/src/it/projects/build-ignore-eol/setup.bsh
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/META-INF/maven/archetype-metadata.xml
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/pom.xml
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/pom.xml
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/pom.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/src/main/java/App.java
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/main/java/App.java
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/src/main/java/App.java
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/main/java/App.java
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/archetype.properties
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/archetype.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/archetype.properties
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/archetype.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/goal.txt
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/goal.txt
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/goal.txt
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/goal.txt
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/pom.xml
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/pom.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/pom.xml
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/pom.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/verify.groovy
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/verify.groovy
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/verify.groovy
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/src/test/resources/projects/basic/verify.groovy
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/test-settings.xml
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/test-settings.xml
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/test-settings.xml
rename to
maven-archetype-plugin/src/it/projects/build-ignore-eol/test-settings.xml
diff --git
a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/verify.bsh
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/verify.bsh
similarity index 100%
rename from
maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/verify.bsh
rename to maven-archetype-plugin/src/it/projects/build-ignore-eol/verify.bsh
diff --git
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
index d1d1ba0..32e9815 100644
---
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
+++
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
@@ -270,6 +270,14 @@ public class IntegrationTestMojo
@Parameter( property = "archetype.test.settingsFile" )
private File settingsFile;
+ /**
+ * Common set of properties to pass in on each project's command line, via
-D parameters.
+ *
+ * @since 3.0.2
+ */
+ @Parameter
+ private Map<String, String> properties = new HashMap<String, String>();
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -656,6 +664,19 @@ public class IntegrationTestMojo
request.setOutputHandler( logger );
}
+
+ if ( !properties.isEmpty() )
+ {
+ Properties props = new Properties();
+ for ( Map.Entry<String, String> entry : properties.entrySet() )
+ {
+ if ( entry.getValue() != null )
+ {
+ props.setProperty( entry.getKey(), entry.getValue() );
+ }
+ }
+ request.setProperties( props );
+ }
File interpolatedSettingsFile = null;
if ( settingsFile != null )
