Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg
--- a/.gitignore
+++ b/.gitignore
+target/
+.project
+.classpath
+.settings/
+.svn/
+bin/
+# Intellij
+*.ipr
+*.iml
+.idea
+out/
+.DS_Store
+/bootstrap
+/dependencies.xml
+.java-version
--- a/Jenkinsfile
+++ b/Jenkinsfile
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+asfMavenTlpStdBuild(jdks:['8'])
--- a/apache-resource-bundles/pom.xml
+++ b/apache-resource-bundles/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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>
+
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent</artifactId>
+    <version>31</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.apache.resources</groupId>
+  <artifactId>apache-resource-bundles</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Resource Bundles</name>
+  <inceptionYear>2006</inceptionYear>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/MASFRES</url>
+  </issueManagement>
+
+  <ciManagement>
+    <url>https://builds.apache.org/job/maven-project-resources/</url>
+    <system>Jenkins</system>
+  </ciManagement>
+
+  <!-- There is no distributionManagement for this project. The site is a part of the main Maven site. -->
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-changes-plugin</artifactId>
+          <configuration>
+            <issueManagementSystems>
+              <issueManagementSystem>JIRA</issueManagementSystem>
+            </issueManagementSystems>
+            <maxEntries>1000</maxEntries>
+            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+            <versionPrefix>${project.artifactId}-</versionPrefix>
+            <!-- Used by announcement-generate goal -->
+<!-- TODO Which template should we use for Apache Resource Bundles?            
+            <templateDirectory>org/apache/maven/shared</templateDirectory>
+-->
+            <!-- Used by announcement-mail goal -->
+            <subject>[ANN] ${project.name} ${project.version} Released</subject>
+            <toAddresses>
+              <toAddress implementation="java.lang.String">announce@apache.org</toAddress>
+              <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
+              <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
+            </toAddresses>
+            <ccAddresses>
+              <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
+            </ccAddresses>
+            <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
+            <fromDeveloperId>${apache.availid}</fromDeveloperId>
+            <smtpHost>${smtp.host}</smtpHost>
+          </configuration>
+          <dependencies>
+            <!-- Used by announcement-generate goal -->
+<!-- Uncomment this when we have decided which template to use
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-shared-resources</artifactId>
+              <version>1</version>
+            </dependency>
+-->
+          </dependencies>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!-- Turn this into a lifecycle -->
+      <plugin>      
+        <artifactId>maven-remote-resources-plugin</artifactId>        
+        <executions>
+          <execution>
+            <goals>
+              <goal>bundle</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
--- a/debian/changelog
+++ b/debian/changelog
-maven-parent (27-3) UNRELEASED; urgency=medium
+maven-parent (31-1) unstable; urgency=medium

  * Team upload.
+
+  [ Stephen Kitt ]
  * Update debian/watch to pull from GitHub.

- -- Stephen Kitt <skitt@debian.org>  Sun, 04 Mar 2018 19:31:55 +0100
+  [ Emmanuel Bourg ]
+  * New upstream release
+    - Ignore the new modules
+    - Ignore the failsafe and the changes plugins
+    - Relocate the version 27 to the current one
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889431)
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+  * Use XZ compression for the upstream tarball
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 13 Jun 2018 15:36:07 +0200

 maven-parent (27-2) unstable; urgency=medium


--- a/debian/compat
+++ b/debian/compat
-10
+11
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,14 @@ Source: maven-parent
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude@laposte.net>,
-           Damien Raude-Morvan <drazzib@debian.org>
-Build-Depends: debhelper (>= 10),
+Uploaders: Ludovic Claude <ludovic.claude@laposte.net>
+Build-Depends: debhelper (>= 11~),
               default-jdk,
               libapache-pom-java (>= 7),
-               maven-repo-helper (>= 1.5~)
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-parent.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-parent.git
+               maven-repo-helper (>= 1.9.3~)
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/maven-parent.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-parent
 Homepage: http://maven.apache.org/

 Package: libmaven-parent-java

--- a/debian/libmaven-parent-java.poms
+++ b/debian/libmaven-parent-java.poms
@@ -17,4 +17,10 @@
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
 #   --dest-jar=<path>: the destination for the real jar
 #
-pom.xml --has-package-version --site-xml=src/site-docs/site.xml --keep-elements=build
+pom.xml --has-package-version --site-xml=src/site-docs/site.xml --keep-elements=build --relocate=org.apache.maven:maven-parent:27
+apache-resource-bundles/pom.xml --ignore
+doxia-tools/pom.xml --ignore
+maven-archetype-bundles/pom.xml --ignore
+maven-plugins/pom.xml --ignore
+maven-shared-components/pom.xml --ignore
+maven-skins/pom.xml --ignore
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,8 +14,10 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/

+org.apache.maven.plugins maven-changes-plugin
 org.apache.maven.plugins maven-checkstyle-plugin
 org.apache.maven.plugins maven-enforcer-plugin
+org.apache.maven.plugins maven-failsafe-plugin
 org.apache.maven.plugins maven-gpg-plugin
 org.apache.maven.plugins maven-jxr-plugin
 org.apache.maven.plugins maven-pmd-plugin

--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,3 @@

 %:
 	dh $@ --with maven_repo_helper
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
--- a/debian/watch
+++ b/debian/watch
 version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  https://github.com/apache/maven-parent/releases .*/maven-parent-([\d\.]+).tar.gz
+opts="repack,compression=xz,uversionmangle=s/-(alpha|beta)-/~$1/" \
+https://github.com/apache/maven-parent/tags .*/maven-parent-(\d.*).tar.gz
--- a/doxia-tools/pom.xml
+++ b/doxia-tools/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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>
+
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent</artifactId>
+    <version>31</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.maven.doxia</groupId>
+  <artifactId>doxia-tools</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Maven Doxia Tools</name>
+  <description>A set of tools for working with Doxia documents.</description>
+  <url>https://maven.apache.org/doxia/doxia-tools/</url>
+  <inceptionYear>2005</inceptionYear>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/DOXIATOOLS</url>
+  </issueManagement>
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://builds.apache.org/job/doxia-tools/</url>
+  </ciManagement>
+
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven-doxia/content/doxia-tools-archives/</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <projectVersion>${project.version}</projectVersion>
+    <maven.site.path>doxia-tools-archives/${project.artifactId}-LATEST</maven.site.path>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- Plexus -->
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>1.0-alpha-30</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>3.0.22</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags</tagBase>
+          </configuration>
+        </plugin>
+        <!-- publish mono-module site with "mvn site-deploy" -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <configuration>
+            <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+          </configuration>
+          <executions>
+            <execution>
+              <id>scm-publish</id>
+              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+              <goals>
+                <goal>publish-scm</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
--- a/doxia-tools/site-pom.xml
+++ b/doxia-tools/site-pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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>
+
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent.</artifactId>
+    <version>31</version>
+    <relativePath>../site-pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.maven.doxia</groupId>
+  <artifactId>doxia-tools</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Maven Doxia Tools Parent POM</name>
+  <description>This project consists of a POM that contains settings that are likely to be useful to any Maven Doxia Tool that is building and releasing code with Maven.</description>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/MPOM/component/12328319</url>
+  </issueManagement>
+</project>
--- a/doxia-tools/src/site-docs/apt/index.apt.vm
+++ b/doxia-tools/src/site-docs/apt/index.apt.vm
+ -----
+ Introduction
+ -----
+ Hervé Boutemy
+ -----
+ 2015-11-21
+ -----
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ https://maven.apache.org/doxia/references/apt-format.html
+
+${project.name}
+
+    This POM is the common parent of all of the {{{/doxia/doxia-tools/}Maven Doxia Tools}}
+    in the Apache Maven project.
+
+* Site Publication
+
+    Since Doxia Tools are always mono-module builds, this parent POM has configured <<<maven-scm-publish-plugin>>>
+    {{{/plugins/maven-scm-publish-plugin/examples/one-module-configuration.html}mono module optimization}}
+    to ease site build & deployment in only one integrated and simplified command:
+
+-----+
+mvn -Preporting site-deploy
+-----+
--- a/doxia-tools/src/site-docs/site.xml
+++ b/doxia-tools/src/site-docs/site.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
+  <body>
+    <breadcrumbs>
+      <item name="Maven" href="https://maven.apache.org/pom/maven/index.html" />
+      <item name="Doxia Tools" href="https://maven.apache.org/pom/maven/doxia-tools/index.html" />
+    </breadcrumbs>
+
+    <menu name="Maven Parent POMs">
+      <item name="Maven" href="../index.html"/>
+      <item name="Archetypes" href="../maven-archetypes-bundles/index.html"/>
+      <item name="Plugins" href="../maven-plugins/index.html"/>
+      <item name="Shared Components" href="../maven-shared-components/index.html"/>
+      <item name="Skins" href="../maven-skins/index.html"/>
+      <item name="Doxia Tools" href="../doxia-tools/index.html"/>
+    </menu>
+
+    <menu ref="parent" />
+  </body>
+</project>
\ No newline at end of file
--- a/doxia-tools/src/site/site.xml
+++ b/doxia-tools/src/site/site.xml
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
+  <bannerRight>
+    <name>Doxia</name>
+    <src>images/doxia-logo.png</src>
+    <href>https://maven.apache.org/doxia/</href>
+  </bannerRight>
+
+  <body>
+    <breadcrumbs>
+      <item name="Doxia" href="https://maven.apache.org/doxia/index.html" />
+      <item name="Doxia Tools" href="https://maven.apache.org/doxia/doxia-tools/index.html" />
+    </breadcrumbs>
+
+    <menu name="Modules">
+      <item name="Doxia Book Maven Plugin" href="./doxia-book-maven-plugin/index.html" />
+      <item name="Doxia Book Renderer" href="./doxia-book-renderer/index.html" />
+      <item name="Doxia Converter" href="./doxia-converter/index.html" />
+      <item name="Doxia Linkcheck" href="./doxia-linkcheck/index.html" />
+    </menu>
+  </body>
+</project>
--- a/maven-archetype-bundles/pom.xml
+++ b/maven-archetype-bundles/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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>
+
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent</artifactId>
+    <version>31</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.maven.archetypes</groupId>
+  <artifactId>maven-archetype-bundles</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Maven Archetypes</name>
+  <description>Archetypes provided by Maven.</description>
+  <url>https://maven.apache.org/archetypes/</url>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/MARCHETYPES</url>
+  </issueManagement>
+
+  <properties>
+    <maven.site.path>archetypes-archives/${project.artifactId}-LATEST</maven.site.path>
+  </properties>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>3.0.1</version>
+      </extension>
+    </extensions>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>3.0.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/archetypes/tags/</tagBase>
+          </configuration>
+        </plugin>
+        <!-- publish mono-module site with "mvn site-deploy" -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <configuration>
+            <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+          </configuration>
+          <executions>
+            <execution>
+              <id>scm-publish</id>
+              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+              <goals>
+                <goal>publish-scm</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>.gitignore</exclude>
+            <exclude>DEPENDENCIES</exclude>
+            <exclude>README.txt</exclude>
+            <exclude>*.sh</exclude>
+            <exclude>.git/**</exclude>
+            <exclude>.idea/**</exclude>
+            <exclude>**/generated-sources/**</exclude>
+            <exclude>**/.gitattributes</exclude>
+            <!-- disable test directories -->
+            <exclude>src/test/**</exclude>
+            <exclude>src/it/**</exclude>
+            <exclude>.repository/**</exclude><!-- for CI -->
+            <exclude>**/archetype-resources/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
--- a/maven-archetype-bundles/site-pom.xml
+++ b/maven-archetype-bundles/site-pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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>
+
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent.</artifactId>
+    <version>31</version>
+    <relativePath>../site-pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.maven.archetypes</groupId>
+  <artifactId>maven-archetypes-bundles</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Maven Archetypes Parent POM</name>
+  <description>This project consists of a POM that contains settings that are likely to be useful to any Maven Archetype that is building and releasing code with Maven.</description>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/MPOM/component/12328304</url>
+  </issueManagement>
+</project>
--- a/maven-archetype-bundles/src/site-docs/apt/index.apt.vm
+++ b/maven-archetype-bundles/src/site-docs/apt/index.apt.vm
+ -----
+ Introduction
+ -----
+ Hervé Boutemy
+ -----
+ 2015-11-21
+ -----
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ https://maven.apache.org/doxia/references/apt-format.html
+
+${project.name}
+
+    This POM is the common parent of all of the {{{/doxia/doxia-tools/}Maven Doxia Tools}}
+    in the Apache Maven project.
+
+* Site Publication
+
+    Since Doxia Tools are always mono-module builds, this parent POM has configured <<<maven-scm-publish-plugin>>>
+    {{{/plugins/maven-scm-publish-plugin/examples/one-module-configuration.html}mono module optimization}}
+    to ease site build & deployment in only one integrated and simplified command:
+
+-----+
+mvn -Preporting site-deploy
+-----+
--- a/maven-archetype-bundles/src/site-docs/site.xml
+++ b/maven-archetype-bundles/src/site-docs/site.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
+  <body>
+    <breadcrumbs>
+      <item name="Maven" href="https://maven.apache.org/pom/maven/index.html" />
+      <item name="Archetypes" href="https://maven.apache.org/pom/maven/maven-archetype-bundles/index.html" />
+    </breadcrumbs>
+
+    <menu name="Maven Parent POMs">
+      <item name="Maven" href="../index.html"/>
+      <item name="Archetypes" href="../maven-archetypes-bundles/index.html"/>
+      <item name="Plugins" href="../maven-plugins/index.html"/>
+      <item name="Shared Components" href="../maven-shared-components/index.html"/>
+      <item name="Skins" href="../maven-skins/index.html"/>
+      <item name="Doxia Tools" href="../doxia-tools/index.html"/>
+    </menu>
+
+    <menu ref="parent" />
+  </body>
+</project>
\ No newline at end of file
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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>
+
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent</artifactId>
+    <version>31</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.maven.plugins</groupId>
+  <artifactId>maven-plugins</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Maven Plugins</name>
+  <description>Maven Plugins</description>
+  <url>https://maven.apache.org/plugins/</url>
+
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://builds.apache.org/job/maven-plugins/</url>
+  </ciManagement>
+
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/plugins-archives/</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <maven.site.path>plugins-archives/${project.artifactId}-LATEST</maven.site.path>
+  </properties>
+
+  <dependencies>
+    <!-- dependencies to annotations -->
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-changes-plugin</artifactId>
+          <configuration>
+            <issueManagementSystems>
+              <issueManagementSystem>JIRA</issueManagementSystem>
+            </issueManagementSystems>
+            <maxEntries>1000</maxEntries>
+            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+            <!-- Used by announcement-generate goal -->
+            <templateDirectory>org/apache/maven/plugins</templateDirectory>
+            <!-- Used by announcement-mail goal -->
+            <subject>[ANN] ${project.name} ${project.version} Released</subject>
+            <toAddresses>
+              <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
+              <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
+            </toAddresses>
+            <ccAddresses>
+              <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
+            </ccAddresses>
+            <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
+            <fromDeveloperId>${apache.availid}</fromDeveloperId>
+            <smtpHost>${smtp.host}</smtpHost>
+          </configuration>
+          <dependencies>
+            <!-- Used by announcement-generate goal -->
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-shared-resources</artifactId>
+              <version>2</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <configuration>
+            <tagletArtifacts>
+              <tagletArtifact combine.id="org.apache.maven.plugin-tools:maven-plugin-tools-javadoc">
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-tools-javadoc</artifactId>
+                <version>${mavenPluginToolsVersion}</version>
+              </tagletArtifact>
+            </tagletArtifacts>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/plugins/tags</tagBase>
+            <releaseProfiles>apache-release,run-its</releaseProfiles>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${mavenPluginToolsVersion}</version>
+          <executions>
+            <execution>
+              <id>default-descriptor</id>
+              <phase>process-classes</phase>
+            </execution>
+            <execution>
+              <id>generate-helpmojo</id>
+              <goals>
+                <goal>helpmojo</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- publish mono-module site with "mvn site-deploy" -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <configuration>
+            <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+          </configuration>
+          <executions>
+            <execution>
+              <id>scm-publish</id>
+              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+              <goals>
+                <goal>publish-scm</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <id>ensure-no-container-api</id>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>org.codehaus.plexus:plexus-component-api</exclude>
+                  </excludes>
+                  <message>The new containers are not supported. You probably added a dependency that is missing the exclusions.</message>
+                </bannedDependencies>
+              </rules>
+              <fail>true</fail>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>${mavenPluginToolsVersion}</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>quality-checks</id>
+      <activation>
+        <property>
+          <name>quality-checks</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-docck-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>docck-check</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>run-its</id>
+      <properties>
+        <!-- when testing with JDK9, change these values to 1.6 from cmdline -->
+        <invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source>
+        <invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <debug>true</debug>
+              <projectsDirectory>src/it</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+              <preBuildHookScript>setup</preBuildHookScript>
+              <postBuildHookScript>verify</postBuildHookScript>
+              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <properties>
+                <maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
+                <maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
+              </properties>
+            </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>
+    <profile>
+      <id>reporting</id>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+  </profiles>
+</project>