CAY-2862 Cleanup and upgrade Maven plugins dependencies

apache · Jun 26, 2024 · 009c753
1 parent 647621a
commit 009c753
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 88 deletions.
diff --git 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
@@ -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/...ne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java b/...ne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java
@@ -66,8 +66,8 @@ private void addUrlFromFile(final File file) {
  }
 
  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
@@ -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
@@ -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>