diff --git a/maven-plugin-testing-harness/pom.xml b/maven-plugin-testing-harness/pom.xml index e04e50a..ba54ffa 100644 --- a/maven-plugin-testing-harness/pom.xml +++ b/maven-plugin-testing-harness/pom.xml @@ -64,7 +64,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml ${mavenVersion} diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java index e27e108..7f8244b 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java @@ -47,7 +47,6 @@ import org.apache.maven.internal.impl.model.DefaultPluginManagementInjector; import org.apache.maven.internal.impl.model.DefaultProfileInjector; import org.apache.maven.internal.impl.model.DefaultProfileSelector; -import org.apache.maven.internal.impl.model.ProfileActivationFilePathInterpolator; import org.apache.maven.internal.impl.model.rootlocator.DefaultRootLocator; import org.apache.maven.internal.impl.resolver.DefaultArtifactDescriptorReader; import org.apache.maven.internal.impl.resolver.DefaultModelResolver; @@ -140,6 +139,7 @@ import org.eclipse.aether.spi.artifact.ArtifactPredicateFactory; import org.eclipse.aether.spi.artifact.decorator.ArtifactDecoratorFactory; import org.eclipse.aether.spi.artifact.generator.ArtifactGeneratorFactory; +import org.eclipse.aether.spi.artifact.transformer.ArtifactTransformer; import org.eclipse.aether.spi.checksums.ProvidedChecksumsSource; import org.eclipse.aether.spi.checksums.TrustedChecksumsSource; import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; @@ -752,6 +752,7 @@ protected Installer createInstaller() { getRepositoryEventDispatcher(), getArtifactGeneratorFactories(), getMetadataGeneratorFactories(), + getArtifactTransformers(), getSyncContextFactory()); } @@ -774,6 +775,7 @@ protected Deployer createDeployer() { getUpdateCheckManager(), getArtifactGeneratorFactories(), getMetadataGeneratorFactories(), + getArtifactTransformers(), getSyncContextFactory(), getOfflineController()); } @@ -933,6 +935,20 @@ protected Map createArtifactDecoratorFactories return new HashMap<>(); } + protected Map artifactTransformers; + + public final Map getArtifactTransformers() { + checkClosed(); + if (artifactTransformers == null) { + artifactTransformers = createArtifactTransformers(); + } + return artifactTransformers; + } + + protected Map createArtifactTransformers() { + return new HashMap<>(); + } + // Maven provided private Map metadataGeneratorFactories; @@ -1058,13 +1074,13 @@ protected ModelBuilder createModelBuilder() { new DefaultDependencyManagementInjector(), new DefaultDependencyManagementImporter(), new DefaultPluginConfigurationExpander(), - new ProfileActivationFilePathInterpolator( - new DefaultPathTranslator(), new DefaultRootLocator(), new DefaultInterpolator()), new DefaultModelVersionParser(getVersionScheme()), List.of(), new DefaultModelCacheFactory(), new DefaultModelResolver(), - new DefaultInterpolator()); + new DefaultInterpolator(), + new DefaultPathTranslator(), + new DefaultRootLocator()); } private RepositorySystem repositorySystem; diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java index f8562d0..3997fe1 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java @@ -158,18 +158,18 @@ public static InternalSession getMockSession(LocalRepository localRepository) { .installArtifacts(any(Collection.class)); doAnswer(iom -> { artifactInstaller.install(ArtifactInstallerRequest.build( - session, Arrays.asList(iom.getArgument(0, Artifact[].class)))); + session, Arrays.asList(iom.getArgument(0, ProducedArtifact[].class)))); return null; }) .when(session) - .installArtifacts(any(Artifact[].class)); + .installArtifacts(any(ProducedArtifact[].class)); doAnswer(iom -> { artifactInstaller.install(ArtifactInstallerRequest.build( iom.getArgument(0, Session.class), iom.getArgument(1, Collection.class))); return null; }) .when(artifactInstaller) - .install(any(Session.class), ArgumentMatchers.>any()); + .install(any(Session.class), ArgumentMatchers.>any()); when(session.getService(ArtifactInstaller.class)).thenReturn(artifactInstaller); // @@ -180,7 +180,7 @@ public static InternalSession getMockSession(LocalRepository localRepository) { artifactDeployer.deploy(ArtifactDeployerRequest.build( iom.getArgument(0, Session.class), iom.getArgument(1, RemoteRepository.class), - Arrays.asList(iom.getArgument(2, Artifact[].class)))); + Arrays.asList(iom.getArgument(2, ProducedArtifact[].class)))); return null; }) .when(session) diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java index f9c2390..3190b0e 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java @@ -341,13 +341,13 @@ public List resolveVersionRange(ArtifactCoordinates artifact, List artifacts) {} + public void installArtifacts(Collection artifacts) {} @Override - public void deployArtifact(RemoteRepository repository, Artifact... artifacts) {} + public void deployArtifact(RemoteRepository repository, ProducedArtifact... artifacts) {} @Override public void setArtifactPath(ProducedArtifact artifact, Path path) {} diff --git a/pom.xml b/pom.xml index 35baf93..bb066a4 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 3.5.1 - 4.0.0-beta-5 + 4.0.0-rc-2 plugin-testing-archives/LATEST 17 2024-11-08T07:31:16Z