[maven-release-plugin] copy for tag maven-parent-22
git-svn-id: https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-22@1371600 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 9b21a0a..7bdee2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>../asf/pom.xml</relativePath>
</parent>
@@ -43,14 +43,13 @@
<!-- Developers listed by PMC Chair, PMC, Committers, Contributers, all alphabetical-->
<developers>
<developer>
- <id>jdcasey</id>
- <name>John Casey</name>
- <email>jdcasey@apache.org</email>
- <organization>ASF</organization>
+ <id>olamy</id>
+ <name>Olivier Lamy</name>
+ <email>olamy@apache.org</email>
<roles>
<role>PMC Chair</role>
</roles>
- <timezone>-5</timezone>
+ <timezone>Europe/Paris</timezone>
</developer>
<developer>
<id>aheritier</id>
@@ -157,6 +156,16 @@
<timezone>Europe/Paris</timezone>
</developer>
<developer>
+ <id>jdcasey</id>
+ <name>John Casey</name>
+ <email>jdcasey@apache.org</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
<id>kenney</id>
<name>Kenney Westerhof</name>
<email>kenney@apache.org</email>
@@ -176,20 +185,27 @@
<timezone>+1</timezone>
</developer>
<developer>
- <id>oching</id>
- <name>Maria Odea B. Ching</name>
+ <id>markh</id>
+ <name>Mark Hobson</name>
+ <email>markh@apache.org</email>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>0</timezone>
+ </developer>
+ <developer>
+ <id>mkleint</id>
+ <name>Milos Kleint</name>
<roles>
<role>PMC Member</role>
</roles>
</developer>
<developer>
- <id>olamy</id>
- <name>Olivier Lamy</name>
- <email>olamy@apache.org</email>
+ <id>oching</id>
+ <name>Maria Odea B. Ching</name>
<roles>
<role>PMC Member</role>
</roles>
- <timezone>+1</timezone>
</developer>
<developer>
<id>pgier</id>
@@ -267,18 +283,6 @@
</roles>
<timezone>-6</timezone>
</developer>
- <developer>
- <id>bimargulies</id>
- <name>Benson Margulies</name>
- <email>bimargulies@apache.org</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- <role>Committer</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
-
<!--Committers-->
<developer>
@@ -406,22 +410,6 @@
</roles>
</developer>
<developer>
- <id>markh</id>
- <name>Mark Hobson</name>
- <email>markh@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>0</timezone>
- </developer>
- <developer>
- <id>mkleint</id>
- <name>Milos Kleint</name>
- <roles>
- <role>Committer</role>
- </roles>
- </developer>
- <developer>
<id>nicolas</id>
<name>Nicolas de Loof</name>
<roles>
@@ -448,6 +436,16 @@
<timezone>+1</timezone>
</developer>
<developer>
+ <id>tchemit</id>
+ <name>Tony Chemit</name>
+ <email>tchemit@apache.org</email>
+ <organization>CodeLutin</organization>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Paris</timezone>
+ </developer>
+ <developer>
<id>vmassol</id>
<name>Vincent Massol</name>
<email>vmassol@apache.org</email>
@@ -622,6 +620,14 @@
</roles>
<timezone>-7</timezone>
</developer>
+ <developer>
+ <id>jruiz</id>
+ <name>Johnny Ruiz III</name>
+ <email>jruiz@apache.org</email>
+ <roles>
+ <role>Emeritus</role>
+ </roles>
+ </developer>
</developers>
<mailingLists>
@@ -704,7 +710,7 @@
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/hudson/view/M-R/view/Maven</url>
+ <url>https://builds.apache.org/view/M-R/view/Maven</url>
<notifiers>
<notifier>
<type>mail</type>
@@ -725,6 +731,16 @@
<sonar.host.url>https://analysis.apache.org/</sonar.host.url>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -777,7 +793,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.2</version>
</plugin>
</plugins>
</pluginManagement>
@@ -811,7 +827,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7.1</version>
<configuration>
<targetJdk>1.5</targetJdk>
<rulesets>
@@ -859,17 +875,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.9</version>
+ <version>2.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
<configuration>
<configLocation>config/maven_checks.xml</configLocation>
<headerLocation>config/maven-header.txt</headerLocation>
@@ -878,7 +894,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7.1</version>
<configuration>
<targetJdk>1.5</targetJdk>
<rulesets>
@@ -898,7 +914,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<!-- Taglist Plugin must be executed after JXR Plugin -->
<plugin>
@@ -909,7 +925,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.8.1</version>
<configuration>
<links>
<link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
@@ -922,7 +938,7 @@
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.5</version>
+ <version>3.1</version>
</tagletArtifact>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
@@ -948,7 +964,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.sonar-plugins</groupId>
diff --git a/site-pom.xml b/site-pom.xml
index e0a6801..7fbe942 100644
--- a/site-pom.xml
+++ b/site-pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>21</version>
+ <version>22-SNAPSHOT</version>
<relativePath>./pom.xml</relativePath>
</parent>
diff --git a/src/site-docs/apt/index.apt b/src/site-docs/apt/index.apt
index ff2a12e..434b790 100644
--- a/src/site-docs/apt/index.apt
+++ b/src/site-docs/apt/index.apt
@@ -4,7 +4,7 @@
Benson Margulies
Hervé Boutemy
-----
- 2011-07-03
+ 2012-05-03
-----
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -58,13 +58,15 @@
*--------------+------------+
|| <<Version>> || <<Release Date>> ||
*--------------+------------+
+| {{{http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?view=markup}22}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-22/pom.xml?r1=HEAD&r2=1157980&diff_format=h}diff}}) | 2012-08-08 |
+*--------------+------------+
| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-21/pom.xml?view=markup}21}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-21/pom.xml?r1=HEAD&r2=1134934&diff_format=h}diff}}) | 2011-08-18 |
*--------------+------------+
-| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-20/pom.xml?view=markup}20}} ({{{http://svn.apache.org/viewvc/maven/pom/trunk/tags/maven-parent-20/pom.xml?r1=HEAD&r2=1069626&diff_format=h}diff}}) | 2011-06-15 |
+| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-20/pom.xml?view=markup}20}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-20/pom.xml?r1=HEAD&r2=1069626&diff_format=h}diff}}) | 2011-06-15 |
*--------------+------------+
-| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-19/pom.xml?view=markup}19}} ({{{http://svn.apache.org/viewvc/maven/pom/trunk/tags/maven-parent-19/pom.xml?r1=HEAD&r2=1038256&diff_format=h}diff}}) | 2011-02-15 |
+| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-19/pom.xml?view=markup}19}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-19/pom.xml?r1=HEAD&r2=1038256&diff_format=h}diff}}) | 2011-02-15 |
*--------------+------------+
-| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-18/pom.xml?view=markup}18}} ({{{http://svn.apache.org/viewvc/maven/pom/trunk/tags/maven-parent-18/pom.xml?r1=HEAD&r2=1029850&diff_format=h}diff}}) | 2010-11-26 |
+| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-18/pom.xml?view=markup}18}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-18/pom.xml?r1=HEAD&r2=1029850&diff_format=h}diff}}) | 2010-11-26 |
*--------------+------------+
-| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-17/pom.xml?view=markup}17}} ({{{http://svn.apache.org/viewvc/maven/pom/trunk/tags/maven-parent-17/pom.xml?r1=HEAD&r2=905048&diff_format=h}diff}}) | 2010-11-04 |
+| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-17/pom.xml?view=markup}17}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-17/pom.xml?r1=HEAD&r2=905048&diff_format=h}diff}}) | 2010-11-04 |
*--------------+------------+
diff --git a/src/site-docs/site.xml b/src/site-docs/site.xml
index 8cee406..5f21c3a 100644
--- a/src/site-docs/site.xml
+++ b/src/site-docs/site.xml
@@ -33,7 +33,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
</skin>
<publishDate format="yyyy-MM-dd" position="right" />
diff --git a/src/site/site.xml b/src/site/site.xml
index 7aa40d8..caa2ecc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,8 +19,8 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
<bannerLeft>
<name>${project.name}</name>
<src>http://maven.apache.org/images/apache-maven-project-2.png</src>
@@ -33,7 +33,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</skin>
<publishDate format="yyyy-MM-dd" position="right" />
@@ -52,9 +52,6 @@
<!-- Breadcrumbs that every project will inherit -->
<breadcrumbs>
<item name="Apache" href="http://www.apache.org/" />
- <!-- NOTE: This only works with stylus-skin-1.3,
- remove again if reverting to 1.2
- -->
<item name="Maven" href="http://maven.apache.org/index.html" />
</breadcrumbs>
