This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/develop by this push:
new 2dddd51 chore: Updated plugin versions and cleaned up the parent-pom
relations
2dddd51 is described below
commit 2dddd510ff75a432e4c4c92b58ac28052dc21fe0
Author: Christofer Dutz <[email protected]>
AuthorDate: Tue Jul 11 14:35:18 2023 +0200
chore: Updated plugin versions and cleaned up the parent-pom relations
---
content/Apache/ComDev/pom.xml | 8 +++-----
content/Apache/PLC4X/pom.xml | 8 +++-----
content/Apache/Training/pom.xml | 1 -
content/IoT/pom.xml | 1 -
pom.xml | 2 +-
tools/content-parent-pom/pom.xml | 18 +++++++++---------
tools/pom.xml | 5 ++---
7 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/content/Apache/ComDev/pom.xml b/content/Apache/ComDev/pom.xml
index 5b3af20..1ca0047 100644
--- a/content/Apache/ComDev/pom.xml
+++ b/content/Apache/ComDev/pom.xml
@@ -23,14 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.training</groupId>
- <artifactId>content-parent-pom</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.training.content</groupId>
+ <artifactId>training-content-apache</artifactId>
+ <version>0.4.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.training.content</groupId>
<artifactId>training-content-apache-comdev</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Training: Content: Apache: ComDev</name>
diff --git a/content/Apache/PLC4X/pom.xml b/content/Apache/PLC4X/pom.xml
index 043b2e3..fb4a6d7 100644
--- a/content/Apache/PLC4X/pom.xml
+++ b/content/Apache/PLC4X/pom.xml
@@ -23,14 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.training</groupId>
- <artifactId>content-parent-pom</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.training.content</groupId>
+ <artifactId>training-content-apache</artifactId>
+ <version>0.4.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.training.content</groupId>
<artifactId>training-content-apache-plc4x</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Training: Content: Apache: PLC4X</name>
diff --git a/content/Apache/Training/pom.xml b/content/Apache/Training/pom.xml
index 076588a..6f2fc5f 100644
--- a/content/Apache/Training/pom.xml
+++ b/content/Apache/Training/pom.xml
@@ -28,7 +28,6 @@
<version>0.4.0-SNAPSHOT</version>
</parent>
-
<artifactId>training-content-apache-training</artifactId>
<packaging>pom</packaging>
diff --git a/content/IoT/pom.xml b/content/IoT/pom.xml
index 4769213..509eacc 100644
--- a/content/IoT/pom.xml
+++ b/content/IoT/pom.xml
@@ -29,7 +29,6 @@
</parent>
<artifactId>training-content-iot</artifactId>
- <version>0.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Training: Content: IoT</name>
diff --git a/pom.xml b/pom.xml
index f701913..3b0a330 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>27</version>
+ <version>30</version>
</parent>
<groupId>org.apache.training</groupId>
diff --git a/tools/content-parent-pom/pom.xml b/tools/content-parent-pom/pom.xml
index 59a5d6a..29d3fee 100644
--- a/tools/content-parent-pom/pom.xml
+++ b/tools/content-parent-pom/pom.xml
@@ -46,21 +46,21 @@
<java.version>1.8</java.version>
- <asciidoctorj.version>2.5.7</asciidoctorj.version>
+ <asciidoctorj.version>2.5.10</asciidoctorj.version>
<asciidoctorj-revealjs.version>5.0.0.rc1</asciidoctorj-revealjs.version>
- <asciidoctorj.diagram.version>2.2.4</asciidoctorj.diagram.version>
+ <asciidoctorj.diagram.version>2.2.9</asciidoctorj.diagram.version>
<!-- Reveal.JS 4.x doesn't seem to work yet -->
<revealjs.version>3.9.2</revealjs.version>
- <!--revealjs.version>4.3.1</revealjs.version-->
+ <!--revealjs.version>4.5.0</revealjs.version-->
-
<asciidoctor-maven-plugin.version>2.2.3</asciidoctor-maven-plugin.version>
- <download-maven-plugin.version>1.6.8</download-maven-plugin.version>
+
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
+ <download-maven-plugin.version>1.7.0</download-maven-plugin.version>
<groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
- <jetty-maven-plugin.version>11.0.14</jetty-maven-plugin.version>
- <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
- <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
+ <jetty-maven-plugin.version>11.0.15</jetty-maven-plugin.version>
+ <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+ <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
</properties>
<dependencies>
diff --git a/tools/pom.xml b/tools/pom.xml
index 513fe5a..61702d7 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>29</version>
+ <version>30</version>
<!-- Required in our case as per
http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent -->
<relativePath />
@@ -64,7 +64,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>process-resource-bundles</id>
@@ -91,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
<configuration>
<finalName>apache-training-incubating-tools-${project.version}</finalName>
</configuration>