You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/12/22 09:44:48 UTC
(maven-archetypes) branch parent-41 created (now d06bc86)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch parent-41
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
at d06bc86 Bump parent pom to 41
This branch includes the following new commits:
new d06bc86 Bump parent pom to 41
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-archetypes) 01/01: Bump parent pom to 41
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch parent-41
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
commit d06bc86215e35574679cc1179e41c2d642b2442d
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Fri Dec 22 00:01:00 2023 +0100
Bump parent pom to 41
---
maven-archetype-archetype/pom.xml | 6 +-----
maven-archetype-j2ee-simple/pom.xml | 6 +-----
maven-archetype-plugin-site/pom.xml | 8 ++------
maven-archetype-plugin/pom.xml | 6 +-----
maven-archetype-portlet/pom.xml | 6 +-----
maven-archetype-quickstart/pom.xml | 6 +-----
maven-archetype-simple/pom.xml | 6 +-----
maven-archetype-site-simple/pom.xml | 6 +-----
maven-archetype-site-skin/pom.xml | 6 +-----
maven-archetype-site/pom.xml | 8 ++------
maven-archetype-webapp/pom.xml | 6 +-----
pom.xml | 38 ++++++++++++++++++-------------------
12 files changed, 32 insertions(+), 76 deletions(-)
diff --git a/maven-archetype-archetype/pom.xml b/maven-archetype-archetype/pom.xml
index 268d0b1..4edd3c9 100644
--- 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
index 3dcc826..c10d41b 100644
--- 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
index 16cfec7..293a9b4 100644
--- 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
index f584150..76f59ec 100644
--- 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
index cb09754..1185a02 100644
--- 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
index b69bf7f..27b9f06 100644
--- 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
index db63aec..af3983f 100644
--- 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
index 557cf71..e35afe7 100644
--- 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
index 24afb3a..c4f7b7b 100644
--- 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
index 4e778da..f112eb0 100644
--- 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
index 5d578e0..44d5745 100644
--- 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
index c94c557..bf34197 100644
--- 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>