From 296a4af12a642837e5cf016c9c342617b86c9b2b Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Mon, 25 Jul 2022 11:47:22 +0200
Subject: [PATCH] Updating dependencies
---
.../mi-maven-archetype-helloworld/Readme.txt | 6 ++----
.../mi-maven-archetype-helloworld/pom.xml | 17 +++++++--------
.../resources/archetype-resources/pom.xml | 14 ++++++-------
.../mi-maven-archetype-quickstart/pom.xml | 14 ++++++-------
.../resources/archetype-resources/Readme.md | 17 +++++++--------
.../resources/archetype-resources/pom.xml | 10 ++++-----
ws/Archetypes/pom.xml | 21 +++++++++++++------
7 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/ws/Archetypes/mi-maven-archetype-helloworld/Readme.txt b/ws/Archetypes/mi-maven-archetype-helloworld/Readme.txt
index c18e8317d..35153c871 100644
--- a/ws/Archetypes/mi-maven-archetype-helloworld/Readme.txt
+++ b/ws/Archetypes/mi-maven-archetype-helloworld/Readme.txt
@@ -1,7 +1,5 @@
-Final success via http://maven.apache.org/archetype/maven-archetype-plugin/examples/create-with-property-file.html
-
-Create Project from local repository using:
+This archetype allows for maven project creation e.g. using:
mvn --batch-mode -e archetype:generate -DgroupId=de.hdm_stuttgart.mi.sd1 \
-DartifactId=first -Dversion=0.9 -DarchetypeGroupId=de.hdm_stuttgart.mi \
--DarchetypeArtifactId=mi-maven-archetype-helloworld -DarchetypeVersion=1.2
+-DarchetypeArtifactId=mi-maven-archetype-helloworld -DarchetypeVersion=1.6
diff --git a/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml b/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml
index 9eaccc631..90f4b1142 100644
--- a/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml
+++ b/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml
@@ -5,7 +5,7 @@
<groupId>de.hdm_stuttgart.mi</groupId>
<artifactId>mi-maven-archetype-helloworld</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
<packaging>maven-archetype</packaging>
@@ -13,9 +13,7 @@
<url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
- <description>
- This archetype provides a minimal Java project still allowing for executable jar generation.
- </description>
+ <description>This archetype provides a minimal Java project still allowing for executable jar generation.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,7 +31,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</extension>
</extensions>
@@ -42,7 +40,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</plugin>
</plugins>
</pluginManagement>
@@ -51,15 +49,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
- <configuration>
+ <configuration>
<!-- Required so that .gitignore gets included in archetypes; see https://issues.apache.org/jira/browse/MRESOURCES-190 -->
<addDefaultExcludes>false</addDefaultExcludes>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
<configuration>
<source>15</source>
<target>15</target>
@@ -67,5 +65,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git a/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml b/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
index 028b26ccc..02455cda9 100644
--- a/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
+++ b/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
@@ -23,36 +23,36 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
<configuration>
- <source>15</source>
- <target>15</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<configuration>
<linksource>true</linksource>
<additionalOptions>
<additionalOption>-html5</additionalOption>
</additionalOptions>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+ <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>3.12.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
+ <version>3.3.0</version>
<configuration>
<transformers>
<transformer
diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml b/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml
index f23211413..ab0c74c52 100644
--- a/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml
+++ b/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml
@@ -5,7 +5,7 @@
<groupId>de.hdm_stuttgart.mi</groupId>
<artifactId>mi-maven-archetype-quickstart</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<packaging>maven-archetype</packaging>
@@ -13,10 +13,8 @@
<url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
- <description>
- This archetype has been derived from https://maven.apache.org/archetypes/maven-archetype-quickstart
- providing Junit 4 tests and log4j2 logging.
- </description>
+ <description>This archetype has been derived from https://maven.apache.org/archetypes/maven-archetype-quickstart
+ providing both Junit 4 tests and log4j2 logging.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -34,7 +32,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</extension>
</extensions>
@@ -43,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</plugin>
</plugins>
</pluginManagement>
@@ -60,7 +58,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
<configuration>
<source>15</source>
<target>15</target>
diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/Readme.md b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/Readme.md
index e5c92af62..bce99a2e2 100644
--- a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/Readme.md
+++ b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/Readme.md
@@ -4,13 +4,12 @@ Java project template
General:
--------
This archetype is based on the
-[Maven Quickstart Archetype » 1.1](https://mvnrepository.com/artifact/org.apache.maven.archetypes/maven-archetype-quickstart/1.1).
+[Maven Quickstart Archetype » 1.1](https://mvnrepository.com/artifact/org.apache.maven.archetypes/maven-archetype-quickstart/1.1)
+providing the following updates / enhancements:
-The following updates / extensions are on offer:
-
-* Updated [JUnit » 4.12](https://mvnrepository.com/artifact/junit/junit/4.12) version.
-* [Apache Log4j Core » 2.7](https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/2.7)
-* [Apache Maven Compiler Plugin » 3.6.0](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin/3.6.0)
- setting project's Java 1.8 language level.
-* [Apache Maven Javadoc Plugin » 2.10.4](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin/2.10.4)
-* [Apache Maven Shade Plugin » 2.4.3](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-shade-plugin/2.4.3)
+* Updated [JUnit » 4.x](https://mvnrepository.com/artifact/junit/junit) version.
+* [Apache Log4j Core » 2.x](https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core)
+* [Apache Maven Compiler Plugin » 3.x](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin)
+ setting project's Java 15+ language level.
+* [Apache Maven Javadoc Plugin » 3.x](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin)
+* [Apache Maven Shade Plugin » 3.x](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-shade-plugin)
diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
index 560fa5442..c1f11952a 100644
--- a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.16.0</version>
+ <version>2.18.0</version>
</dependency>
</dependencies>
@@ -41,13 +41,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<configuration>
<linksource>true</linksource>
<detectJavaApiLink>false</detectJavaApiLink>
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
+ <version>3.3.0</version>
<configuration>
<transformers>
<transformer
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>3.12.0</version>
</plugin>
</plugins>
</build>
diff --git a/ws/Archetypes/pom.xml b/ws/Archetypes/pom.xml
index cdbaf1f5a..9fa284e5b 100644
--- a/ws/Archetypes/pom.xml
+++ b/ws/Archetypes/pom.xml
@@ -9,7 +9,7 @@
<name>MI Maven archetype master</name>
<description>Master file providing defaults for archetype creation.</description>
-
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -26,7 +26,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
</extension>
</extensions>
@@ -35,18 +35,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <!-- Required so that .gitignore gets included in archetypes; see https://issues.apache.org/jira/browse/MRESOURCES-190 -->
+ <addDefaultExcludes>false</addDefaultExcludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.10.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>15</source>
+ <target>15</target>
</configuration>
</plugin>
</plugins>
--
GitLab