Prepare release 40

apache · Jun 12, 2023 · f8cd129 · f8cd129
1 parent 662beea
commit f8cd129
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 12 deletions.
diff --git a/doxia-tools/site-pom.xml b/doxia-tools/site-pom.xml
@@ -27,7 +27,7 @@ under the License.
     <!-- 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>40-SNAPSHOT</version>
+    <version>40</version>
     <relativePath>../site-pom.xml</relativePath>
   </parent>
 

diff --git a/maven-extensions/site-pom.xml b/maven-extensions/site-pom.xml
@@ -28,7 +28,7 @@ under the License.
     <!-- 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>40-SNAPSHOT</version>
+    <version>40</version>
     <relativePath>../site-pom.xml</relativePath>
   </parent>
 

diff --git a/maven-plugins/site-pom.xml b/maven-plugins/site-pom.xml
@@ -28,7 +28,7 @@ under the License.
     <!-- 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>40-SNAPSHOT</version>
+    <version>40</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
@@ -56,7 +56,7 @@ mvn -Preporting site-deploy
 * History
 
 #if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 39 )
+#**##set( $prev = 40 )
   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
@@ -73,6 +73,8 @@ mvn -Preporting site-deploy
 *--------------+------------+
 || <<Version>> || <<Release Date>> ||
 *--------------+------------+
+#display( 40, '2023-06-12' )
+*--------------+------------+
 #display( 39, '2022-12-11' )
 *--------------+------------+
 #display( 38, '2022-11-21' )

diff --git a/maven-shared-components/site-pom.xml b/maven-shared-components/site-pom.xml
@@ -28,7 +28,7 @@ under the License.
     <!-- 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>40-SNAPSHOT</version>
+    <version>40</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
@@ -44,7 +44,7 @@ mvn -Preporting site-deploy
 * History
 
 #if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 39 )
+#**##set( $prev = 40 )
   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
@@ -61,6 +61,8 @@ mvn -Preporting site-deploy
 *--------------+------------+
 || <<Version>> || <<Release Date>> ||
 *--------------+------------+
+#display( 40, '2023-06-12' )
+*--------------+------------+
 #display( 39, '2022-12-11' )
 *--------------+------------+
 #display( 38, '2022-11-21' )

diff --git a/maven-skins/site-pom.xml b/maven-skins/site-pom.xml
@@ -28,7 +28,7 @@ under the License.
     <!-- 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>40-SNAPSHOT</version>
+    <version>40</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
@@ -34,7 +34,7 @@ Maven Skins Parent POM
 History
 
 #if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 39 )
+#**##set( $prev = 40 )
   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( 40, '2023-06-12' )
+*--------------+------------+
 #display( 39, '2022-12-11' )
 *--------------+------------+
 #display( 38, '2022-11-21' )

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>29</version>
+    <version>30</version>
     <relativePath>../asf/pom.xml</relativePath>
   </parent>
 
@@ -1141,7 +1141,6 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.3.0</version>
           <dependencies>
             <dependency>
               <groupId>org.codehaus.mojo</groupId>

diff --git a/site-pom.xml b/site-pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>40-SNAPSHOT</version>
+    <version>40</version>
     <relativePath>./pom.xml</relativePath>
   </parent>
 

diff --git a/src/site-docs/apt/index.apt.vm b/src/site-docs/apt/index.apt.vm
@@ -99,7 +99,7 @@ mvn scm-publish:publish-scm
 * History
 
 #if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 39 )
+#**##set( $prev = 40 )
   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}})
@@ -118,6 +118,8 @@ mvn scm-publish:publish-scm
 *--------------+------------+
 || <<Version>> || <<Release Date>> ||
 *--------------+------------+
+#display( 40, '2023-06-12' )
+*--------------+------------+
 #display( 39, '2022-12-11' )
 *--------------+------------+
 #display( 38, '2022-11-21' )