This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 009c7535b CAY-2862 Cleanup and upgrade Maven plugins dependencies
009c7535b is described below
commit 009c7535bc2a47efc89e1613d1bf42931531851a
Author: Nikita Timofeev <[email protected]>
AuthorDate: Wed Jun 26 17:38:38 2024 +0400
CAY-2862 Cleanup and upgrade Maven plugins dependencies
---
RELEASE-NOTES.txt | 1 +
maven-plugins/cayenne-maven-plugin/pom.xml | 45 +++++-----------------
.../tools/MavenPluginClassLoaderManager.java | 4 +-
maven-plugins/cayenne-modeler-maven-plugin/pom.xml | 18 +--------
maven-plugins/pom.xml | 41 +++-----------------
5 files changed, 21 insertions(+), 88 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e917a361f..0131c1a78 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -72,6 +72,7 @@ CAY-2849 Switch documentation to `hugo-asciidoctorj-extension`
CAY-2856 Upgrade Gradle to 8.8
CAY-2857 Java 22 support
CAY-2858 Redesign Collection and Map Property API
+CAY-2862 Cleanup and upgrade Maven plugins dependencies
Bug Fixes:
diff --git a/maven-plugins/cayenne-maven-plugin/pom.xml
b/maven-plugins/cayenne-maven-plugin/pom.xml
index 4e915becd..8dd4d5948 100644
--- a/maven-plugins/cayenne-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-maven-plugin/pom.xml
@@ -37,44 +37,19 @@
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
+ <artifactId>maven-core</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
+ <artifactId>maven-compat</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-cgen</artifactId>
@@ -109,6 +84,12 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
@@ -130,12 +111,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-dbsync</artifactId>
diff --git
a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java
b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java
index 779c94a67..c2a3f7577 100644
---
a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java
+++
b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java
@@ -66,8 +66,8 @@ public class MavenPluginClassLoaderManager implements
ClassLoaderManager {
}
private ClassLoader buildClassLoader() {
- @SuppressWarnings("unchecked")
- final Set<Artifact> artifacts = project.getDependencyArtifacts();
+ @SuppressWarnings("deprecation")
+ Set<Artifact> artifacts = project.getDependencyArtifacts();
if (artifacts != null) {
for (final Artifact artifact : artifacts) {
addUrlFromArtifact(artifact);
diff --git a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
index 7d27fdcab..0c44acae6 100644
--- a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
@@ -33,22 +33,8 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
+ <artifactId>maven-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index a2c607293..2e9ff833f 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -16,6 +16,7 @@
<artifactId>cayenne-parent</artifactId>
<version>5.0-SNAPSHOT</version>
</parent>
+
<groupId>org.apache.cayenne.plugins</groupId>
<artifactId>cayenne-maven-plugins-parent</artifactId>
<name>cayenne-maven-plugins-parent: Maven Plugins parent</name>
@@ -31,54 +32,24 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>3.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>3.5.0</version>
+ <artifactId>maven-core</artifactId>
+ <version>3.9.8</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>3.0-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
- <version>3.5</version>
+ <artifactId>maven-compat</artifactId>
+ <version>3.9.8</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.5</version>
+ <version>3.13.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.3.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>3.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>3.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
-
<artifactId>plexus-container-default</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
- <version>1.24</version>
- </dependency>
</dependencies>
</dependencyManagement>
