This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-parent.git
The following commit(s) were added to refs/heads/master by this push: new 306ba81 prepare documentation for release 306ba81 is described below commit 306ba81b37e138cdb51a6dd33c1afa23baeaab18 Author: Slawomir Jaranowski <s.jaranow...@gmail.com> AuthorDate: Mon Apr 18 22:28:45 2022 +0200 prepare documentation for release --- doxia-tools/site-pom.xml | 4 +++- maven-extensions/site-pom.xml | 4 +++- maven-plugins/site-pom.xml | 4 +++- maven-plugins/src/site-docs/apt/index.apt.vm | 4 +++- maven-shared-components/site-pom.xml | 4 +++- maven-shared-components/src/site-docs/apt/index.apt.vm | 4 +++- maven-skins/site-pom.xml | 4 +++- maven-skins/src/site-docs/apt/index.apt.vm | 4 +++- site-pom.xml | 4 +++- src/site-docs/apt/index.apt.vm | 4 +++- 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/doxia-tools/site-pom.xml b/doxia-tools/site-pom.xml index 2d2ef60..abdd7e6 100644 --- a/doxia-tools/site-pom.xml +++ b/doxia-tools/site-pom.xml @@ -24,8 +24,10 @@ under the License. <parent> <groupId>org.apache.maven</groupId> + <!-- we need to have a different gav for pom.xml and site-pom.xml --> + <!-- dot at the end is on purpose --> <artifactId>maven-parent.</artifactId> - <version>36-SNAPSHOT</version> + <version>36</version> <relativePath>../site-pom.xml</relativePath> </parent> diff --git a/maven-extensions/site-pom.xml b/maven-extensions/site-pom.xml index 1ee67c0..b96405a 100644 --- a/maven-extensions/site-pom.xml +++ b/maven-extensions/site-pom.xml @@ -25,8 +25,10 @@ under the License. <parent> <groupId>org.apache.maven</groupId> + <!-- we need to have a different gav for pom.xml and site-pom.xml --> + <!-- dot at the end is on purpose --> <artifactId>maven-parent.</artifactId> - <version>36-SNAPSHOT</version> + <version>36</version> <relativePath>../site-pom.xml</relativePath> </parent> diff --git a/maven-plugins/site-pom.xml b/maven-plugins/site-pom.xml index 770ccba..66e76de 100644 --- a/maven-plugins/site-pom.xml +++ b/maven-plugins/site-pom.xml @@ -25,8 +25,10 @@ under the License. <parent> <groupId>org.apache.maven</groupId> + <!-- we need to have a different gav for pom.xml and site-pom.xml --> + <!-- dot at the end is on purpose --> <artifactId>maven-parent.</artifactId> - <version>36-SNAPSHOT</version> + <version>36</version> <relativePath>../site-pom.xml</relativePath> </parent> diff --git a/maven-plugins/src/site-docs/apt/index.apt.vm b/maven-plugins/src/site-docs/apt/index.apt.vm index 14a68c6..ed09eb0 100644 --- a/maven-plugins/src/site-docs/apt/index.apt.vm +++ b/maven-plugins/src/site-docs/apt/index.apt.vm @@ -56,7 +56,7 @@ mvn -Preporting site-deploy * History #if( $project.version.endsWith( "SNAPSHOT" ) ) -#**##set( $prev = 35 ) +#**##set( $prev = 36 ) master: {{{https://github.com/apache/maven-parent/tree/master/maven-plugins/pom.xml}$project.version}} ({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}}) #end @@ -72,6 +72,8 @@ mvn -Preporting site-deploy *--------------+------------+ || <<Version>> || <<Release Date>> || *--------------+------------+ +#display( 36, '2022-04-18' ) +*--------------+------------+ #display( 35, '2022-03-02' ) *--------------+------------+ #display( 34, '2020-01-30' ) diff --git a/maven-shared-components/site-pom.xml b/maven-shared-components/site-pom.xml index aaa2808..bf2b089 100644 --- a/maven-shared-components/site-pom.xml +++ b/maven-shared-components/site-pom.xml @@ -25,8 +25,10 @@ under the License. <parent> <groupId>org.apache.maven</groupId> + <!-- we need to have a different gav for pom.xml and site-pom.xml --> + <!-- dot at the end is on purpose --> <artifactId>maven-parent.</artifactId> - <version>36-SNAPSHOT</version> + <version>36</version> <relativePath>../site-pom.xml</relativePath> </parent> diff --git a/maven-shared-components/src/site-docs/apt/index.apt.vm b/maven-shared-components/src/site-docs/apt/index.apt.vm index ddc09ae..e133ca8 100644 --- a/maven-shared-components/src/site-docs/apt/index.apt.vm +++ b/maven-shared-components/src/site-docs/apt/index.apt.vm @@ -44,7 +44,7 @@ mvn -Preporting site-deploy * History #if( $project.version.endsWith( "SNAPSHOT" ) ) -#**##set( $prev = 35 ) +#**##set( $prev = 36 ) master: {{{https://github.com/apache/maven-parent/tree/master/maven-shared-components/pom.xml}$project.version}} ({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}}) #end @@ -60,6 +60,8 @@ mvn -Preporting site-deploy *--------------+------------+ || <<Version>> || <<Release Date>> || *--------------+------------+ +#display( 36, '2022-04-18' ) +*--------------+------------+ #display( 35, '2022-03-02' ) *--------------+------------+ #display( 34, '2020-01-30' ) diff --git a/maven-skins/site-pom.xml b/maven-skins/site-pom.xml index b5f2849..f7d20ef 100644 --- a/maven-skins/site-pom.xml +++ b/maven-skins/site-pom.xml @@ -25,8 +25,10 @@ under the License. <parent> <groupId>org.apache.maven</groupId> + <!-- we need to have a different gav for pom.xml and site-pom.xml --> + <!-- dot at the end is on purpose --> <artifactId>maven-parent.</artifactId> - <version>36-SNAPSHOT</version> + <version>36</version> <relativePath>../site-pom.xml</relativePath> </parent> diff --git a/maven-skins/src/site-docs/apt/index.apt.vm b/maven-skins/src/site-docs/apt/index.apt.vm index e494419..aea9e5e 100644 --- a/maven-skins/src/site-docs/apt/index.apt.vm +++ b/maven-skins/src/site-docs/apt/index.apt.vm @@ -34,7 +34,7 @@ Maven Skins Parent POM History #if( $project.version.endsWith( "SNAPSHOT" ) ) -#**##set( $prev = 35 ) +#**##set( $prev = 36 ) master: {{{https://github.com/apache/maven-parent/tree/master/maven-skins/pom.xml}$project.version}} ({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}}) #end @@ -47,6 +47,8 @@ History *--------------+------------+ || <<Version>> || <<Release Date>> || *--------------+------------+ +#display( 36, '2022-04-18' ) +*--------------+------------+ #display( 35, '2022-03-02' ) *--------------+------------+ #display( 34, '2020-01-30' ) diff --git a/site-pom.xml b/site-pom.xml index 8187d61..19d3c57 100644 --- a/site-pom.xml +++ b/site-pom.xml @@ -25,10 +25,12 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>36-SNAPSHOT</version> + <version>36</version> <relativePath>./pom.xml</relativePath> </parent> + <!-- we need to have a different gav for pom.xml and site-pom.xml --> + <!-- dot at the end is on purpose --> <artifactId>maven-parent.</artifactId> <packaging>pom</packaging> diff --git a/src/site-docs/apt/index.apt.vm b/src/site-docs/apt/index.apt.vm index 18809e0..308afed 100644 --- a/src/site-docs/apt/index.apt.vm +++ b/src/site-docs/apt/index.apt.vm @@ -88,7 +88,7 @@ mvn scm-publish:publish-scm * History #if( $project.version.endsWith( "SNAPSHOT" ) ) -#**##set( $prev = 35 ) +#**##set( $prev = 36 ) master: {{{https://github.com/apache/maven-parent/tree/master/pom.xml}$project.version}} ({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}}, {{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master}commits}}) @@ -106,6 +106,8 @@ mvn scm-publish:publish-scm *--------------+------------+ || <<Version>> || <<Release Date>> || *--------------+------------+ +#display( 36, '2022-04-18' ) +*--------------+------------+ #display( 35, '2022-03-02' ) *--------------+------------+ #display( 34, '2020-01-30' )