You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/02/24 21:09:54 UTC

svn commit: r1825276 - in /maven/archetypes/trunk: ./ maven-archetype-archetype/src/main/resources-filtered/ maven-archetype-archetype/src/main/resources-filtered/archetype-resources/ maven-archetype-archetype/src/main/resources-filtered/archetype-reso...

Author: hboutemy
Date: Sat Feb 24 21:09:54 2018
New Revision: 1825276

URL: http://svn.apache.org/viewvc?rev=1825276&view=rev
Log:
[MARCHETYPES-54] added pluginManagement section to projects generated from archetypes

Added:
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-plugin/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-profiles/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-webapp/src/main/resources-filtered/
    maven/archetypes/trunk/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/
    maven/archetypes/trunk/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml
    maven/archetypes/trunk/plugin-versions.properties
Removed:
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-plugin/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
Modified:
    maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
    maven/archetypes/trunk/pom.xml

Added: maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+  <packaging>maven-archetype</packaging>
+
+  <name>Archetype - \${artifactId}</name>
+
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.compiler.source>1.7</project.compiler.source>
+    <project.compiler.target>1.7</project.compiler.target>
+  </properties>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>${archetype}</version>
+      </extension>
+    </extensions>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>${archetype}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+  <packaging>pom</packaging>
+
+  <name>\${artifactId}</name>
+
+  <modules>
+    <module>projects</module>
+    <module>primary-source</module>
+    <module>servlets</module>
+    <module>ejbs</module>
+    <module>ear</module>
+  </modules>
+
+  <distributionManagement>
+    <site>
+      <id>site</id>
+      <name>project website</name>
+      <url>scp://local.company.com/websites/project.company.com/</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>\${groupId}</groupId>
+        <artifactId>logging</artifactId>
+        <version>\${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>\${groupId}</groupId>
+        <artifactId>primary-source</artifactId>
+        <version>\${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>\${groupId}</groupId>
+        <artifactId>servlet</artifactId>
+        <version>\${version}</version>
+        <type>war</type>
+      </dependency>
+      <dependency>
+        <groupId>\${groupId}</groupId>
+        <artifactId>ejbs</artifactId>
+        <version>\${version}</version>
+        <type>ejb</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>${war}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-ear-plugin</artifactId>
+          <version>${ear}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-ejb-plugin</artifactId>
+          <version>${ejb}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+
+  <name>Maven</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://maven.apache.org/</url>
+  <inceptionYear>2001</inceptionYear>
+
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>file://\${basedir}/target/deployed-site</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Added: maven/archetypes/trunk/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+##
+## Copyright 2001-2005 The Apache Software Foundation.
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+  <packaging>maven-plugin</packaging>
+
+  <name>\${artifactId} Maven Plugin</name>
+
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.compiler.source>1.7</project.compiler.source>
+    <project.compiler.target>1.7</project.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>${plugin}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_maven-plugin_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${plugin}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>${invoker}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+        </configuration>
+        <executions>
+          <execution>
+            <id>mojo-descriptor</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>help-goal</id>
+            <goals>
+              <goal>helpmojo</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <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>
+              <goals>
+                <goal>clean</goal>
+                <goal>test-compile</goal>
+              </goals>
+            </configuration>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>install</goal>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+
+      </build>
+    </profile>
+  </profiles>
+</project>

Added: maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+  <packaging>war</packaging>
+
+  <name>Maven Portlet Archetype</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.compiler.source>1.7</project.compiler.source>
+    <project.compiler.target>1.7</project.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>portlet-api</groupId>
+      <artifactId>portlet-api</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jetspeed</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-war-plugin</artifactId>
+            <version>2.0-beta-2</version>
+            <configuration>
+              <webXml>src/main/jetspeed/web.xml</webXml>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>${war}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+
+  <name>Maven Quick Start Archetype</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.compiler.source>1.7</project.compiler.source>
+    <project.compiler.target>1.7</project.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+
+  <name>\${artifactId}</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.compiler.source>1.7</project.compiler.source>
+    <project.compiler.target>1.7</project.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+
+  <name>\${artifactId}</name>
+  <description>A simple \${artifactId}.</description>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.compiler.source>1.7</project.compiler.source>
+    <project.compiler.target>1.7</project.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>${site}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>${pir}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+  <packaging>pom</packaging>
+
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>scp://webhost.company.com/www/website</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>${site}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>${pir}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>

Modified: maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml?rev=1825276&r1=1825275&r2=1825276&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml Sat Feb 24 21:09:54 2018
@@ -21,13 +21,22 @@
   </properties>
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.3</version>
-      </plugin>
-    </plugins>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.9</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
 </project>

Added: maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+
+  <name>Maven</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://maven.apache.org/</url>
+  <inceptionYear>2001</inceptionYear>
+
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>scp://webhost.company.com/www/website</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>${site}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>${pir}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <locales>en,fr</locales>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/archetypes/trunk/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml (added)
+++ maven/archetypes/trunk/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml Sat Feb 24 21:09:54 2018
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
+  <packaging>war</packaging>
+
+  <name>\${artifactId} Maven Webapp</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.compiler.source>1.7</project.compiler.source>
+    <project.compiler.target>1.7</project.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>\${artifactId}</finalName>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${clean}</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${resources}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>${war}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${install}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${deploy}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/archetypes/trunk/plugin-versions.properties
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/plugin-versions.properties?rev=1825276&view=auto
==============================================================================
--- maven/archetypes/trunk/plugin-versions.properties (added)
+++ maven/archetypes/trunk/plugin-versions.properties Sat Feb 24 21:09:54 2018
@@ -0,0 +1,16 @@
+clean     3.0.0
+site      3.7
+install   2.5.2
+deploy    2.8.2
+resources 3.0.2
+compiler  3.7.0
+surefire  2.20.1
+jar       3.0.2
+ejb       3.0.0
+plugin    3.5.1
+war       3.2.0
+ear       2.10.1
+rar       2.4
+archetype 3.0.1
+invoker   3.0.1
+pir       2.9

Modified: maven/archetypes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/pom.xml?rev=1825276&r1=1825275&r2=1825276&view=diff
==============================================================================
--- maven/archetypes/trunk/pom.xml (original)
+++ maven/archetypes/trunk/pom.xml Sat Feb 24 21:09:54 2018
@@ -81,6 +81,18 @@ under the License.
         <version>3.0.1</version>
       </extension>
     </extensions>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/resources-filtered</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <filters>
+      <filter>../plugin-versions.properties</filter>
+    </filters>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -96,6 +108,13 @@ under the License.
             <autoVersionSubmodules>true</autoVersionSubmodules>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <configuration>
+            <escapeString>\</escapeString>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>