Bump parent pom to 41

apache · Dec 22, 2023 · 3f2261d · 3f2261d
1 parent 0da7166
commit 3f2261d
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 76 deletions.
diff --git a/maven-archetype-archetype/pom.xml b/maven-archetype-archetype/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,8 +30,6 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Archetype Archetype</name>
-  <description>
-    An archetype which contains a sample archetype.
-  </description>
+  <description>An archetype which contains a sample archetype.</description>
 
 </project>
diff --git a/maven-archetype-j2ee-simple/pom.xml b/maven-archetype-j2ee-simple/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,8 +30,6 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Simple J2EE Archetype</name>
-  <description>
-    An archetype which contains a simplified sample J2EE application.
-  </description>
+  <description>An archetype which contains a simplified sample J2EE application.</description>
 
 </project>
diff --git a/maven-archetype-plugin-site/pom.xml b/maven-archetype-plugin-site/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,9 +30,7 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Plugin Site Archetype</name>
-  <description>
-    An archetype which contains a sample Maven plugin site. This archetype can be layered upon an
-    existing Maven plugin project.
-  </description>
+  <description>An archetype which contains a sample Maven plugin site. This archetype can be layered upon an
+    existing Maven plugin project.</description>
 
 </project>
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,8 +30,6 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Plugin Archetype</name>
-  <description>
-    An archetype which contains a sample Maven plugin.
-  </description>
+  <description>An archetype which contains a sample Maven plugin.</description>
 
 </project>
diff --git a/maven-archetype-portlet/pom.xml b/maven-archetype-portlet/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,8 +30,6 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Portlet Archetype</name>
-  <description>
-    An archetype which contains a sample JSR-268 Portlet.
-  </description>
+  <description>An archetype which contains a sample JSR-268 Portlet.</description>
 
 </project>
diff --git a/maven-archetype-quickstart/pom.xml b/maven-archetype-quickstart/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,9 +30,7 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Quickstart Archetype</name>
-  <description>
-    An archetype which contains a sample Maven project.
-  </description>
+  <description>An archetype which contains a sample Maven project.</description>
 
   <dependencies>
     <dependency>

diff --git a/maven-archetype-simple/pom.xml b/maven-archetype-simple/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,8 +30,6 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Simple Project Archetype</name>
-  <description>
-    An archetype which contains a simple Maven project.
-  </description>
+  <description>An archetype which contains a simple Maven project.</description>
 
 </project>
diff --git a/maven-archetype-site-simple/pom.xml b/maven-archetype-site-simple/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,7 +30,5 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Archetype for Simple Site</name>
-  <description>
-    An archetype which contains a sample Maven site.
-  </description>
+  <description>An archetype which contains a sample Maven site.</description>
 </project>
diff --git a/maven-archetype-site-skin/pom.xml b/maven-archetype-site-skin/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,7 +30,5 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Site Skin Archetype</name>
-  <description>
-    An archetype which contains a sample Maven Site Skin.
-  </description>
+  <description>An archetype which contains a sample Maven Site Skin.</description>
 </project>
diff --git a/maven-archetype-site/pom.xml b/maven-archetype-site/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,11 +30,9 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Site Archetype</name>
-  <description>
-    An archetype which contains a sample Maven site which demonstrates some of the supported document types like
+  <description>An archetype which contains a sample Maven site which demonstrates some of the supported document types like
     APT, XDoc, and FML and demonstrates how to i18n your site. This archetype can be layered
-    upon an existing Maven project.
-  </description>
+    upon an existing Maven project.</description>
 
   <build>
     <plugins>

diff --git a/maven-archetype-webapp/pom.xml b/maven-archetype-webapp/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,7 +17,6 @@ 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>
 
@@ -32,7 +30,5 @@ under the License.
   <packaging>maven-archetype</packaging>
 
   <name>Maven Webapp Archetype</name>
-  <description>
-    An archetype which contains a sample Maven Webapp project.
-  </description>
+  <description>An archetype which contains a sample Maven Webapp project.</description>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,14 +17,14 @@ 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>34</version>
+    <version>41</version>
+    <relativePath />
   </parent>
 
   <groupId>org.apache.maven.archetypes</groupId>
@@ -55,8 +54,8 @@ under the License.
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-archetypes.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archetypes.git</developerConnection>
-    <url>https://github.com/apache/maven-archetypes/tree/${project.scm.tag}</url>
     <tag>master</tag>
+    <url>https://github.com/apache/maven-archetypes/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -80,36 +79,30 @@ under the License.
   </properties>
 
   <repositories>
-    <repository><!-- useful to resolve maven-archetype-plugin when it is a SNAPSHOT -->
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>https://repository.apache.org/snapshots</url>
+    <repository>
       <releases>
         <enabled>false</enabled>
       </releases>
+      <!-- useful to resolve maven-archetype-plugin when it is a SNAPSHOT -->
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>https://repository.apache.org/snapshots</url>
     </repository>
   </repositories>
 
   <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>3.2.0</version>
-      </extension>
-    </extensions>
+    <filters>
+      <filter>../plugin-versions.properties</filter>
+    </filters>
     <resources>
       <resource>
         <directory>src/main/resources</directory>
       </resource>
       <resource>
-        <directory>src/main/resources-filtered</directory>
         <filtering>true</filtering>
+        <directory>src/main/resources-filtered</directory>
       </resource>
     </resources>
-    <filters>
-      <filter>../plugin-versions.properties</filter>
-    </filters>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -139,5 +132,12 @@ under the License.
         </plugin>
       </plugins>
     </pluginManagement>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>3.2.0</version>
+      </extension>
+    </extensions>
   </build>
 </project>