You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/04/30 21:46:53 UTC
[maven-archetypes] branch master updated: Upgrade Maven Archetype
Plugin to 3.1.0 Pass https.protocols Add groovy-xml to support XmlParser in
verify.groovy
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-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new a4f3a6a Upgrade Maven Archetype Plugin to 3.1.0 Pass https.protocols Add groovy-xml to support XmlParser in verify.groovy
a4f3a6a is described below
commit a4f3a6ad543ce63c6873333a4264773b504a6500
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Apr 30 23:46:43 2019 +0200
Upgrade Maven Archetype Plugin to 3.1.0
Pass https.protocols
Add groovy-xml to support XmlParser in verify.groovy
---
.../main/resources-filtered/archetype-resources/pom.xml | 5 +++++
.../main/resources-filtered/archetype-resources/pom.xml | 9 +++------
plugin-versions.properties | 2 +-
pom.xml | 14 ++++++++++++--
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
index 63029a0..7f8bb87 100644
--- a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -37,6 +37,11 @@
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
<version>${archetype}</version>
+ <configuration>
+ <properties>
+ <https.protocols>\${https.protocols}</https.protocols>
+ </properties>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
diff --git a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
index a571129..2dcba31 100644
--- a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
@@ -159,18 +159,12 @@
<profile>
<id>run-its</id>
<build>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>${invoker}</version>
<configuration>
- <debug>true</debug>
- <cloneProjectsTo>\${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>\${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
@@ -178,6 +172,9 @@
<goal>clean</goal>
<goal>test-compile</goal>
</goals>
+ <properties>
+ <https.protocols>\${https.protocols}</https.protocols>
+ </properties>
</configuration>
<executions>
<execution>
diff --git a/plugin-versions.properties b/plugin-versions.properties
index 9410e5f..691ce58 100644
--- a/plugin-versions.properties
+++ b/plugin-versions.properties
@@ -11,7 +11,7 @@ plugin 3.6.0
war 3.2.2
ear 3.0.1
rar 2.4
-archetype 3.0.1
+archetype 3.1.0
invoker 3.1.0
pir 3.0.0
javadoc 3.0.0
diff --git a/pom.xml b/pom.xml
index 56d48d3..3e9786c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@ under the License.
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</extension>
</extensions>
<resources>
@@ -103,10 +103,20 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
<configuration>
<ignoreEOLStyle>true</ignoreEOLStyle>
+ <properties>
+ <https.protocols>${https.protocols}</https.protocols>
+ </properties>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>2.4.16</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>