This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new f2825208d [MAINTENANCE] Bump apache parent pom to 34
f2825208d is described below
commit f2825208d2a102b3a5d72cf1e5f7d68782400a1e
Author: Dominik Przybysz <[email protected]>
AuthorDate: Tue Mar 18 20:08:05 2025 +0100
[MAINTENANCE] Bump apache parent pom to 34
---
parent/pom.xml | 20 ++++++--------------
pom.xml | 2 +-
pushstream/pom.xml | 13 +++----------
spi-fly/pom.xml | 2 +-
spi-fly/spi-fly-itests/test.bndrun | 12 ++++++------
5 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1f62803ff..2343713a2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath/>
</parent>
@@ -185,17 +185,15 @@
<slf4j.version>2.0.17</slf4j.version>
<!--Plugin versions-->
- <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
- <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
+
<animal-sniffer-enforcer-rule.version>1.24</animal-sniffer-enforcer-rule.version>
+ <depgraph-maven-plugin.version>4.0.3</depgraph-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
+ <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
- <!-- TODO do not override javadoc plugin version when apache parent
v34 is released-->
- <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
- <maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
<maven-paxexam-plugin.version>1.2.4</maven-paxexam-plugin.version>
+ <maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
<org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
-
<animal-sniffer-enforcer-rule.version>1.24</animal-sniffer-enforcer-rule.version>
- <depgraph-maven-plugin.version>4.0.3</depgraph-maven-plugin.version>
+ <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
<!--Other-->
<java.source.version>8</java.source.version>
@@ -392,11 +390,6 @@
<artifactId>maven-paxexam-plugin</artifactId>
<version>${maven-paxexam-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -627,7 +620,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
<reportSets>
<reportSet>
<reports>
diff --git a/pom.xml b/pom.xml
index 0c6247436..1aecda198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>33</version>
+ <version>34</version>
</parent>
<!-- This pom is for convenience in building several aries subprojects at
once.
diff --git a/pushstream/pom.xml b/pushstream/pom.xml
index b81baf156..3162b28cc 100644
--- a/pushstream/pom.xml
+++ b/pushstream/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>34</version>
<relativePath/>
</parent>
@@ -43,8 +43,8 @@
</modules>
<properties>
- <java.source.version>1.8</java.source.version>
- <java.target.version>1.8</java.target.version>
+ <java.source.version>8</java.source.version>
+ <java.target.version>8</java.target.version>
<bnd-maven-plugin.version>6.4.0</bnd-maven-plugin.version>
<junit.version>4.13.2</junit.version>
@@ -97,13 +97,6 @@
<target>${java.target.version}</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
index c54bcd394..3878afca1 100644
--- a/spi-fly/pom.xml
+++ b/spi-fly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath/>
</parent>
diff --git a/spi-fly/spi-fly-itests/test.bndrun
b/spi-fly/spi-fly-itests/test.bndrun
index 6a505eb01..5a0a0d03e 100644
--- a/spi-fly/spi-fly-itests/test.bndrun
+++ b/spi-fly/spi-fly-itests/test.bndrun
@@ -52,12 +52,12 @@
-runbundles: \
assertj-core;version='[3.27.3,3.27.4)',\
- junit-jupiter-api;version='[5.11.4,5.11.5)',\
- junit-jupiter-engine;version='[5.11.4,5.11.5)',\
- junit-jupiter-params;version='[5.11.4,5.11.5)',\
- junit-platform-commons;version='[1.12.0,1.12.1)',\
- junit-platform-engine;version='[1.12.0,1.12.1)',\
- junit-platform-launcher;version='[1.12.0,1.12.1)',\
+ junit-jupiter-api;version='[5.12.1,5.12.2)',\
+ junit-jupiter-engine;version='[5.12.1,5.12.2)',\
+ junit-jupiter-params;version='[5.12.1,5.12.2)',\
+ junit-platform-commons;version='[1.12.1,1.12.2)',\
+ junit-platform-engine;version='[1.12.1,1.12.2)',\
+ junit-platform-launcher;version='[1.12.1,1.12.2)',\
net.bytebuddy.byte-buddy;version='[1.15.11,1.15.12)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.8,1.3.9)',\
org.apache.aries.spifly.examples.spi.bundle;version='[1.0.6,1.0.7)',\
