From 7d4c51b8dd37799b0b8a4892c144d7c28f989643 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 22 Oct 2024 21:06:43 +0200 Subject: [PATCH] Upgrade to beta-5 --- pom.xml | 2 +- .../plugin/compiler/AbstractCompilerMojo.java | 26 +++++++++---------- .../maven/plugin/compiler/CompilerMojo.java | 2 +- ...dinate.java => DependencyCoordinates.java} | 4 +-- .../plugin/compiler/CompilerMojoTestCase.java | 7 ++--- 5 files changed, 21 insertions(+), 20 deletions(-) rename src/main/java/org/apache/maven/plugin/compiler/{DependencyCoordinate.java => DependencyCoordinates.java} (96%) diff --git a/pom.xml b/pom.xml index 707b5305..22514fa8 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ under the License. 17 - 4.0.0-beta-3 + 4.0.0-beta-5 9.7 2.4.21 diff --git a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java index 83dd698b..e4fa71fa 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java @@ -48,8 +48,8 @@ import org.apache.maven.api.plugin.MojoException; import org.apache.maven.api.plugin.annotations.Parameter; import org.apache.maven.api.services.ArtifactManager; -import org.apache.maven.api.services.DependencyCoordinateFactory; -import org.apache.maven.api.services.DependencyCoordinateFactoryRequest; +import org.apache.maven.api.services.DependencyCoordinatesFactory; +import org.apache.maven.api.services.DependencyCoordinatesFactoryRequest; import org.apache.maven.api.services.DependencyResolver; import org.apache.maven.api.services.DependencyResolverRequest; import org.apache.maven.api.services.MessageBuilder; @@ -344,7 +344,7 @@ public abstract class AbstractCompilerMojo implements Mojo { * */ @Parameter - protected List annotationProcessorPaths; + protected List annotationProcessorPaths; /** *

@@ -1556,8 +1556,8 @@ private List resolveProcessorPathEntries() throws MojoException { try { Session session = this.session.withRemoteRepositories(projectManager.getRemoteProjectRepositories(project)); - List coords = - annotationProcessorPaths.stream().map(this::toCoordinate).collect(Collectors.toList()); + List coords = + annotationProcessorPaths.stream().map(this::toCoordinates).collect(Collectors.toList()); return session .getService(DependencyResolver.class) .resolve(DependencyResolverRequest.builder() @@ -1575,9 +1575,9 @@ private List resolveProcessorPathEntries() throws MojoException { } } - private org.apache.maven.api.DependencyCoordinate toCoordinate(DependencyCoordinate coord) { - return session.getService(DependencyCoordinateFactory.class) - .create(DependencyCoordinateFactoryRequest.builder() + private org.apache.maven.api.DependencyCoordinates toCoordinates(DependencyCoordinates coord) { + return session.getService(DependencyCoordinatesFactory.class) + .create(DependencyCoordinatesFactoryRequest.builder() .session(session) .groupId(coord.getGroupId()) .artifactId(coord.getArtifactId()) @@ -1607,13 +1607,13 @@ public String getArtifactId() { .toList(); } - private String getAnnotationProcessorPathVersion(DependencyCoordinate annotationProcessorPath) + private String getAnnotationProcessorPathVersion(DependencyCoordinates annotationProcessorPath) throws MojoException { String configuredVersion = annotationProcessorPath.getVersion(); if (configuredVersion != null) { return configuredVersion; } else { - List managedDependencies = project.getManagedDependencies(); + List managedDependencies = project.getManagedDependencies(); return findManagedVersion(annotationProcessorPath, managedDependencies) .orElseThrow(() -> new MojoException(String.format( "Cannot find version for annotation processor path '%s'. The version needs to be either" @@ -1623,15 +1623,15 @@ private String getAnnotationProcessorPathVersion(DependencyCoordinate annotation } private Optional findManagedVersion( - DependencyCoordinate dependencyCoordinate, - List managedDependencies) { + DependencyCoordinates dependencyCoordinate, + List managedDependencies) { return managedDependencies.stream() .filter(dep -> Objects.equals(dep.getGroupId(), dependencyCoordinate.getGroupId()) && Objects.equals(dep.getArtifactId(), dependencyCoordinate.getArtifactId()) && Objects.equals(dep.getClassifier(), dependencyCoordinate.getClassifier()) && Objects.equals(dep.getType().id(), dependencyCoordinate.getType())) .findAny() - .map(d -> d.getVersion().asString()); + .map(d -> d.getVersionConstraint().asString()); } private void writePlugin(MessageBuilder mb) { diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java index 2273d6b2..740214c6 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java @@ -73,7 +73,7 @@ public class CompilerMojo extends AbstractCompilerMojo { * Projects main artifact. */ @Parameter(defaultValue = "${project.mainArtifact}", readonly = true, required = true) - protected Artifact projectArtifact; + protected ProducedArtifact projectArtifact; /** * The directory for compiled classes. diff --git a/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java b/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinates.java similarity index 96% rename from src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java rename to src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinates.java index 19609499..09d4df10 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java +++ b/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinates.java @@ -27,7 +27,7 @@ * @author Andreas Gudian * @since 3.4 */ -public class DependencyCoordinate { +public class DependencyCoordinates { private String groupId; private String artifactId; @@ -104,7 +104,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) { return false; } - DependencyCoordinate other = (DependencyCoordinate) obj; + DependencyCoordinates other = (DependencyCoordinates) obj; return Objects.equals(groupId, other.groupId) && Objects.equals(artifactId, other.artifactId) && Objects.equals(version, other.version) diff --git a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java index 0dd6c997..5975b7aa 100644 --- a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java +++ b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java @@ -50,7 +50,7 @@ import org.apache.maven.api.plugin.testing.MojoExtension; import org.apache.maven.api.plugin.testing.MojoParameter; import org.apache.maven.api.plugin.testing.MojoTest; -import org.apache.maven.api.plugin.testing.stubs.ArtifactStub; +import org.apache.maven.api.plugin.testing.stubs.ProducedArtifactStub; import org.apache.maven.api.plugin.testing.stubs.ProjectStub; import org.apache.maven.api.plugin.testing.stubs.SessionMock; import org.apache.maven.api.services.ArtifactManager; @@ -456,7 +456,7 @@ private static InternalSession createSession() { .when(session) .getStartTime(); - Artifact junit = new ArtifactStub("junit", "junit", null, "3.8.1", "jar"); + ProducedArtifactStub junit = new ProducedArtifactStub("junit", "junit", null, "3.8.1", "jar"); MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory(); doReturn(messageBuilderFactory).when(session).getService(MessageBuilderFactory.class); @@ -513,7 +513,8 @@ private static InternalSession createSession() { @SuppressWarnings("unused") private static Project createProject() { ProjectStub stub = new ProjectStub(); - ArtifactStub artifact = new ArtifactStub("myGroupId", "myArtifactId", null, "1.0-SNAPSHOT", "jar"); + ProducedArtifactStub artifact = + new ProducedArtifactStub("myGroupId", "myArtifactId", null, "1.0-SNAPSHOT", "jar"); stub.setMainArtifact(artifact); stub.setModel(Model.newBuilder() .groupId(artifact.getGroupId())