This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4dca427f135 CAMEL-19462: remove maven 2.x compatibility layer from
plugins (#10886)
4dca427f135 is described below
commit 4dca427f135042dd078211ce1b4042f6374f80a4
Author: Jono Morris <jono.mor...@xtra.co.nz>
AuthorDate: Sat Jul 29 02:40:36 2023 +1200
CAMEL-19462: remove maven 2.x compatibility layer from plugins (#10886)
---
dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml | 4 ----
tooling/maven/bom-generator-maven-plugin/pom.xml | 4 ++--
.../camel/maven/bom/generator/BomGeneratorMojo.java | 16 +++++++++++-----
tooling/maven/sync-properties-maven-plugin/pom.xml | 4 ----
tooling/parent/pom.xml | 6 ++++++
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 9fcc7e35f63..73a605f5de1 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -66,10 +66,6 @@
<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.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
diff --git a/tooling/maven/bom-generator-maven-plugin/pom.xml
b/tooling/maven/bom-generator-maven-plugin/pom.xml
index 0d8a82ee814..69fa6b84f06 100644
--- a/tooling/maven/bom-generator-maven-plugin/pom.xml
+++ b/tooling/maven/bom-generator-maven-plugin/pom.xml
@@ -70,8 +70,8 @@
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git
a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
index d1e20d886fe..8c89faf0a07 100644
---
a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
+++
b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
@@ -50,7 +50,6 @@ import org.apache.camel.tooling.util.FileUtil;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
@@ -63,7 +62,10 @@ import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
/**
* Generate BOM by flattening the current project's dependency management
section and applying exclusions.
@@ -421,10 +423,14 @@ public class BomGeneratorMojo extends AbstractMojo {
private Artifact resolveArtifact(String groupId, String artifactId, String
version, String type) throws Exception {
Artifact art = artifactFactory.createArtifact(groupId, artifactId,
version, "runtime", type);
-
- artifactResolver.resolve(art, remoteRepositories, localRepository);
-
- return art;
+ ProjectBuildingRequest buildingRequest = new
DefaultProjectBuildingRequest();
+ buildingRequest
+ .setRemoteRepositories(remoteRepositories)
+ .setLocalRepository(localRepository);
+
+ return artifactResolver
+ .resolveArtifact(buildingRequest, art)
+ .getArtifact();
}
private MavenProject loadExternalProjectPom(File pomFile) throws Exception
{
diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml
b/tooling/maven/sync-properties-maven-plugin/pom.xml
index e97a5a397f4..a16f0d86019 100644
--- a/tooling/maven/sync-properties-maven-plugin/pom.xml
+++ b/tooling/maven/sync-properties-maven-plugin/pom.xml
@@ -81,10 +81,6 @@
<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-container-default</artifactId>
diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml
index 7e219d364f2..c29bef414bc 100644
--- a/tooling/parent/pom.xml
+++ b/tooling/parent/pom.xml
@@ -46,6 +46,7 @@
<plexus-xml-version>4.0.2</plexus-xml-version>
<maven-archiver-version>3.6.0</maven-archiver-version>
<plexus-archiver-version>4.8.0</plexus-archiver-version>
+
<maven-artifact-transfer-version>0.13.1</maven-artifact-transfer-version>
</properties>
<dependencyManagement>
@@ -146,6 +147,11 @@
<artifactId>maven-dependency-tree</artifactId>
<version>${maven-dependency-tree-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
+ <version>${maven-artifact-transfer-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
