This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new e2eae7a  Upgrade to Maven 4.0.0-beta-5 (#46)
e2eae7a is described below

commit e2eae7a3d3b456017e14c0fe9426a891943ad3f7
Author: Guillaume Nodet <gno...@apache.org>
AuthorDate: Wed Oct 23 08:19:19 2024 +0200

    Upgrade to Maven 4.0.0-beta-5 (#46)
---
 .../maven/api/plugin/testing/MojoExtension.java    |  2 +-
 .../api/plugin/testing/stubs/ArtifactStub.java     | 10 +--
 .../plugin/testing/stubs/ProducedArtifactStub.java | 33 +++++++++
 .../api/plugin/testing/stubs/ProjectStub.java      | 12 ++--
 .../testing/stubs/RepositorySystemSupplier.java    | 56 +++++++++++----
 .../api/plugin/testing/stubs/SessionMock.java      | 58 +++++++++++++--
 .../api/plugin/testing/stubs/SessionStub.java      | 82 ++++++++++++++++------
 pom.xml                                            |  6 +-
 8 files changed, 205 insertions(+), 54 deletions(-)

diff --git 
a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
index b855dde..9e96ab5 100644
--- 
a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
+++ 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
@@ -342,7 +342,7 @@ public class MojoExtension extends MavenDIExtension 
implements ParameterResolver
             private Project createProject(InternalSession s) {
                 ProjectStub stub = new ProjectStub();
                 if (!"pom".equals(model.getPackaging())) {
-                    ArtifactStub artifact = new ArtifactStub(
+                    ProducedArtifactStub artifact = new ProducedArtifactStub(
                             model.getGroupId(), model.getArtifactId(), "", 
model.getVersion(), model.getPackaging());
                     stub.setMainArtifact(artifact);
                 }
diff --git 
a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
index b9b6416..df9e5c2 100644
--- 
a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
+++ 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
@@ -21,12 +21,12 @@ package org.apache.maven.api.plugin.testing.stubs;
 import java.util.Objects;
 
 import org.apache.maven.api.Artifact;
-import org.apache.maven.api.ArtifactCoordinate;
+import org.apache.maven.api.ArtifactCoordinates;
 import org.apache.maven.api.Version;
 import org.apache.maven.api.VersionConstraint;
 import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.internal.impl.DefaultModelVersionParser;
 import org.apache.maven.internal.impl.DefaultVersionParser;
-import org.apache.maven.repository.internal.DefaultModelVersionParser;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 
 /**
@@ -120,8 +120,8 @@ public class ArtifactStub implements Artifact {
     }
 
     @Override
-    public ArtifactCoordinate toCoordinate() {
-        return new ArtifactCoordinate() {
+    public ArtifactCoordinates toCoordinates() {
+        return new ArtifactCoordinates() {
             @Override
             public String getGroupId() {
                 return groupId;
@@ -138,7 +138,7 @@ public class ArtifactStub implements Artifact {
             }
 
             @Override
-            public VersionConstraint getVersion() {
+            public VersionConstraint getVersionConstraint() {
                 return getParser().parseVersionConstraint(version);
             }
 
diff --git 
a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProducedArtifactStub.java
 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProducedArtifactStub.java
new file mode 100644
index 0000000..9575225
--- /dev/null
+++ 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProducedArtifactStub.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.api.plugin.testing.stubs;
+
+import org.apache.maven.api.ProducedArtifact;
+
+/**
+ *
+ */
+public class ProducedArtifactStub extends ArtifactStub implements 
ProducedArtifact {
+    public ProducedArtifactStub() {}
+
+    public ProducedArtifactStub(
+            String groupId, String artifactId, String classifier, String 
version, String extension) {
+        super(groupId, artifactId, classifier, version, extension);
+    }
+}
diff --git 
a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
index fd37fa5..b057c18 100644
--- 
a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
+++ 
b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
@@ -39,7 +39,7 @@ public class ProjectStub implements Project {
     private boolean topProject;
     private Path rootDirectory;
     private Map<String, String> properties = new HashMap<>();
-    private Artifact mainArtifact;
+    private ProducedArtifact mainArtifact;
 
     public void setModel(Model model) {
         this.model = model;
@@ -119,8 +119,8 @@ public class ProjectStub implements Project {
     }
 
     @Override
-    public List<Artifact> getArtifacts() {
-        Artifact pomArtifact = new ArtifactStub(getGroupId(), getArtifactId(), 
"", getVersion(), "pom");
+    public List<ProducedArtifact> getArtifacts() {
+        ProducedArtifact pomArtifact = new ProducedArtifactStub(getGroupId(), 
getArtifactId(), "", getVersion(), "pom");
         return mainArtifact != null ? Arrays.asList(pomArtifact, mainArtifact) 
: Arrays.asList(pomArtifact);
     }
 
@@ -138,13 +138,13 @@ public class ProjectStub implements Project {
 
     @Nonnull
     @Override
-    public List<DependencyCoordinate> getDependencies() {
+    public List<DependencyCoordinates> getDependencies() {
         return null;
     }
 
     @Nonnull
     @Override
-    public List<DependencyCoordinate> getManagedDependencies() {
+    public List<DependencyCoordinates> getManagedDependencies() {
         return null;
     }
 
@@ -212,7 +212,7 @@ public class ProjectStub implements Project {
         return this;
     }
 
-    public ProjectStub setMainArtifact(Artifact mainArtifact) {
+    public ProjectStub setMainArtifact(ProducedArtifact mainArtifact) {
         this.mainArtifact = mainArtifact;
         return this;
     }
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 0e709b3..e27e108 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
@@ -32,24 +32,25 @@ import 
org.apache.maven.internal.impl.DefaultModelXmlFactory;
 import org.apache.maven.internal.impl.DefaultPluginConfigurationExpander;
 import org.apache.maven.internal.impl.DefaultSuperPomProvider;
 import org.apache.maven.internal.impl.DefaultUrlNormalizer;
-import org.apache.maven.internal.impl.model.BuildModelTransformer;
 import 
org.apache.maven.internal.impl.model.DefaultDependencyManagementImporter;
 import 
org.apache.maven.internal.impl.model.DefaultDependencyManagementInjector;
 import org.apache.maven.internal.impl.model.DefaultInheritanceAssembler;
+import org.apache.maven.internal.impl.model.DefaultInterpolator;
 import org.apache.maven.internal.impl.model.DefaultModelBuilder;
+import org.apache.maven.internal.impl.model.DefaultModelCacheFactory;
 import org.apache.maven.internal.impl.model.DefaultModelInterpolator;
 import org.apache.maven.internal.impl.model.DefaultModelNormalizer;
 import org.apache.maven.internal.impl.model.DefaultModelPathTranslator;
 import org.apache.maven.internal.impl.model.DefaultModelProcessor;
 import org.apache.maven.internal.impl.model.DefaultModelValidator;
-import org.apache.maven.internal.impl.model.DefaultModelVersionProcessor;
 import org.apache.maven.internal.impl.model.DefaultPathTranslator;
 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.DefaultRootLocator;
 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;
 import org.apache.maven.internal.impl.resolver.DefaultVersionRangeResolver;
 import org.apache.maven.internal.impl.resolver.DefaultVersionResolver;
 import org.apache.maven.internal.impl.resolver.MavenArtifactRelocationSource;
@@ -79,7 +80,34 @@ import org.eclipse.aether.impl.UpdateCheckManager;
 import org.eclipse.aether.impl.UpdatePolicyAnalyzer;
 import org.eclipse.aether.impl.VersionRangeResolver;
 import org.eclipse.aether.impl.VersionResolver;
-import org.eclipse.aether.internal.impl.*;
+import org.eclipse.aether.internal.impl.DefaultArtifactPredicateFactory;
+import org.eclipse.aether.internal.impl.DefaultArtifactResolver;
+import org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider;
+import org.eclipse.aether.internal.impl.DefaultChecksumProcessor;
+import org.eclipse.aether.internal.impl.DefaultDeployer;
+import org.eclipse.aether.internal.impl.DefaultInstaller;
+import org.eclipse.aether.internal.impl.DefaultLocalPathComposer;
+import org.eclipse.aether.internal.impl.DefaultLocalPathPrefixComposerFactory;
+import org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider;
+import org.eclipse.aether.internal.impl.DefaultMetadataResolver;
+import org.eclipse.aether.internal.impl.DefaultOfflineController;
+import org.eclipse.aether.internal.impl.DefaultPathProcessor;
+import org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager;
+import org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider;
+import org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher;
+import org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider;
+import org.eclipse.aether.internal.impl.DefaultRepositorySystem;
+import org.eclipse.aether.internal.impl.DefaultRepositorySystemLifecycle;
+import org.eclipse.aether.internal.impl.DefaultTrackingFileManager;
+import org.eclipse.aether.internal.impl.DefaultTransporterProvider;
+import org.eclipse.aether.internal.impl.DefaultUpdateCheckManager;
+import org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
+import org.eclipse.aether.internal.impl.LocalPathComposer;
+import org.eclipse.aether.internal.impl.LocalPathPrefixComposerFactory;
+import org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.internal.impl.TrackingFileManager;
 import 
org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector;
 import org.eclipse.aether.internal.impl.checksum.Md5ChecksumAlgorithmFactory;
 import org.eclipse.aether.internal.impl.checksum.Sha1ChecksumAlgorithmFactory;
@@ -959,9 +987,7 @@ public class RepositorySystemSupplier implements 
Supplier<RepositorySystem> {
     protected ArtifactDescriptorReader createArtifactDescriptorReader() {
         // from maven-resolver-provider
         return new DefaultArtifactDescriptorReader(
-                getRemoteRepositoryManager(),
                 getVersionResolver(),
-                getVersionRangeResolver(),
                 getArtifactResolver(),
                 getModelBuilder(),
                 getRepositoryEventDispatcher(),
@@ -1015,10 +1041,13 @@ public class RepositorySystemSupplier implements 
Supplier<RepositorySystem> {
         DefaultModelProcessor modelProcessor = new DefaultModelProcessor(new 
DefaultModelXmlFactory(), List.of());
         return new DefaultModelBuilder(
                 modelProcessor,
-                new DefaultModelValidator(new DefaultModelVersionProcessor()),
+                new DefaultModelValidator(),
                 new DefaultModelNormalizer(),
                 new DefaultModelInterpolator(
-                        new DefaultPathTranslator(), new 
DefaultUrlNormalizer(), new DefaultRootLocator()),
+                        new DefaultPathTranslator(),
+                        new DefaultUrlNormalizer(),
+                        new DefaultRootLocator(),
+                        new DefaultInterpolator()),
                 new DefaultModelPathTranslator(new DefaultPathTranslator()),
                 new DefaultModelUrlNormalizer(new DefaultUrlNormalizer()),
                 new DefaultSuperPomProvider(modelProcessor),
@@ -1028,11 +1057,14 @@ public class RepositorySystemSupplier implements 
Supplier<RepositorySystem> {
                 new DefaultPluginManagementInjector(),
                 new DefaultDependencyManagementInjector(),
                 new DefaultDependencyManagementImporter(),
-                (m, r, b) -> m,
                 new DefaultPluginConfigurationExpander(),
-                new ProfileActivationFilePathInterpolator(new 
DefaultPathTranslator(), new DefaultRootLocator()),
-                new BuildModelTransformer(),
-                new DefaultModelVersionParser(getVersionScheme()));
+                new ProfileActivationFilePathInterpolator(
+                        new DefaultPathTranslator(), new DefaultRootLocator(), 
new DefaultInterpolator()),
+                new DefaultModelVersionParser(getVersionScheme()),
+                List.of(),
+                new DefaultModelCacheFactory(),
+                new DefaultModelResolver(),
+                new DefaultInterpolator());
     }
 
     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 c620b13..f8562d0 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
@@ -34,6 +34,7 @@ import java.util.function.Supplier;
 
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.LocalRepository;
+import org.apache.maven.api.ProducedArtifact;
 import org.apache.maven.api.Project;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Session;
@@ -55,11 +56,11 @@ import org.apache.maven.api.services.ProjectManager;
 import org.apache.maven.api.services.RepositoryFactory;
 import org.apache.maven.api.services.VersionParser;
 import org.apache.maven.api.services.xml.ModelXmlFactory;
+import org.apache.maven.internal.impl.DefaultModelVersionParser;
 import org.apache.maven.internal.impl.DefaultModelXmlFactory;
 import org.apache.maven.internal.impl.DefaultVersionParser;
 import org.apache.maven.internal.impl.InternalSession;
 import org.apache.maven.model.v4.MavenStaxReader;
-import org.apache.maven.repository.internal.DefaultModelVersionParser;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.mockito.ArgumentMatchers;
 
@@ -223,7 +224,7 @@ public class SessionMock {
                     Project project = iom.getArgument(1, Project.class);
                     String type = iom.getArgument(2, String.class);
                     Path path = iom.getArgument(3, Path.class);
-                    Artifact artifact = session.createArtifact(
+                    ProducedArtifact artifact = session.createProducedArtifact(
                             project.getGroupId(), project.getArtifactId(), 
project.getVersion(), null, null, type);
                     artifactManager.setPath(artifact, path);
                     attachedArtifacts
@@ -235,7 +236,7 @@ public class SessionMock {
                 .attachArtifact(same(session), any(Project.class), any(), 
any());
         doAnswer(iom -> {
                     Project project = iom.getArgument(0, Project.class);
-                    Artifact artifact = iom.getArgument(1, Artifact.class);
+                    ProducedArtifact artifact = iom.getArgument(1, 
ProducedArtifact.class);
                     Path path = iom.getArgument(2, Path.class);
                     artifactManager.setPath(artifact, path);
                     attachedArtifacts
@@ -244,7 +245,7 @@ public class SessionMock {
                     return null;
                 })
                 .when(projectManager)
-                .attachArtifact(any(Project.class), any(Artifact.class), 
any(Path.class));
+                .attachArtifact(any(Project.class), 
any(ProducedArtifact.class), any(Path.class));
         when(projectManager.getAttachedArtifacts(any()))
                 .then(iom ->
                         attachedArtifacts.computeIfAbsent(iom.getArgument(0, 
Project.class), p -> new ArrayList<>()));
@@ -275,6 +276,20 @@ public class SessionMock {
             return new ArtifactStub(
                     request.getGroupId(), request.getArtifactId(), classifier, 
request.getVersion(), extension);
         });
+        when(artifactFactory.createProduced(any())).then(iom -> {
+            ArtifactFactoryRequest request = iom.getArgument(0, 
ArtifactFactoryRequest.class);
+            String classifier = request.getClassifier();
+            String extension = request.getExtension();
+            String type = request.getType();
+            if (classifier == null) {
+                classifier = "";
+            }
+            if (extension == null) {
+                extension = type != null ? type : "";
+            }
+            return new ProducedArtifactStub(
+                    request.getGroupId(), request.getArtifactId(), classifier, 
request.getVersion(), extension);
+        });
         when(session.createArtifact(any(), any(), any(), any(), any(), 
any())).thenAnswer(iom -> {
             String groupId = iom.getArgument(0, String.class);
             String artifactId = iom.getArgument(1, String.class);
@@ -307,6 +322,39 @@ public class SessionMock {
                             .extension(extension)
                             .build());
         });
+        when(session.createProducedArtifact(any(), any(), any(), any(), any(), 
any()))
+                .thenAnswer(iom -> {
+                    String groupId = iom.getArgument(0, String.class);
+                    String artifactId = iom.getArgument(1, String.class);
+                    String version = iom.getArgument(2, String.class);
+                    String classifier = iom.getArgument(3, String.class);
+                    String extension = iom.getArgument(4, String.class);
+                    String type = iom.getArgument(5, String.class);
+                    return session.getService(ArtifactFactory.class)
+                            .createProduced(ArtifactFactoryRequest.builder()
+                                    .session(session)
+                                    .groupId(groupId)
+                                    .artifactId(artifactId)
+                                    .version(version)
+                                    .classifier(classifier)
+                                    .extension(extension)
+                                    .type(type)
+                                    .build());
+                });
+        when(session.createProducedArtifact(any(), any(), any(), 
any())).thenAnswer(iom -> {
+            String groupId = iom.getArgument(0, String.class);
+            String artifactId = iom.getArgument(1, String.class);
+            String version = iom.getArgument(2, String.class);
+            String extension = iom.getArgument(3, String.class);
+            return session.getService(ArtifactFactory.class)
+                    .createProduced(ArtifactFactoryRequest.builder()
+                            .session(session)
+                            .groupId(groupId)
+                            .artifactId(artifactId)
+                            .version(version)
+                            .extension(extension)
+                            .build());
+        });
         
when(session.getService(ArtifactFactory.class)).thenReturn(artifactFactory);
 
         //
@@ -319,7 +367,7 @@ public class SessionMock {
             Model model = new 
MavenStaxReader().read(request.getSource().get().openStream());
             ProjectStub projectStub = new ProjectStub();
             projectStub.setModel(model);
-            ArtifactStub artifactStub = new ArtifactStub(
+            ProducedArtifactStub artifactStub = new ProducedArtifactStub(
                     model.getGroupId(), model.getArtifactId(), "", 
model.getVersion(), model.getPackaging());
             if (!"pom".equals(model.getPackaging())) {
                 projectStub.setMainArtifact(artifactStub);
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 34b1820..f9c2390 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
@@ -27,10 +27,11 @@ import java.util.Map;
 import java.util.Optional;
 
 import org.apache.maven.api.Artifact;
-import org.apache.maven.api.ArtifactCoordinate;
+import org.apache.maven.api.ArtifactCoordinates;
 import org.apache.maven.api.Dependency;
-import org.apache.maven.api.DependencyCoordinate;
+import org.apache.maven.api.DependencyCoordinates;
 import org.apache.maven.api.DependencyScope;
+import org.apache.maven.api.DownloadedArtifact;
 import org.apache.maven.api.Language;
 import org.apache.maven.api.Listener;
 import org.apache.maven.api.LocalRepository;
@@ -38,6 +39,7 @@ import org.apache.maven.api.Node;
 import org.apache.maven.api.Packaging;
 import org.apache.maven.api.PathScope;
 import org.apache.maven.api.PathType;
+import org.apache.maven.api.ProducedArtifact;
 import org.apache.maven.api.Project;
 import org.apache.maven.api.ProjectScope;
 import org.apache.maven.api.RemoteRepository;
@@ -219,58 +221,87 @@ public class SessionStub implements Session {
     }
 
     @Override
-    public ArtifactCoordinate createArtifactCoordinate(String s, String s1, 
String s2, String s3) {
+    public ProducedArtifact createProducedArtifact(
+            String groupId, String artifactId, String version, String 
extension) {
         return null;
     }
 
     @Override
-    public ArtifactCoordinate createArtifactCoordinate(String coordString) {
+    public ProducedArtifact createProducedArtifact(
+            String groupId, String artifactId, String version, String 
classifier, String extension, String type) {
+        return null;
+    }
+
+    @Override
+    public ArtifactCoordinates createArtifactCoordinates(
+            String groupId, String artifactId, String version, String 
extension) {
+        return null;
+    }
+
+    @Override
+    public ArtifactCoordinates createArtifactCoordinates(String coordString) {
+        return null;
+    }
+
+    @Override
+    public ArtifactCoordinates createArtifactCoordinates(
+            String groupId, String artifactId, String version, String 
classifier, String extension, String type) {
         return null;
     }
 
     @Override
-    public ArtifactCoordinate createArtifactCoordinate(
-            String s, String s1, String s2, String s3, String s4, String s5) {
+    public ArtifactCoordinates createArtifactCoordinates(Artifact artifact) {
         return null;
     }
 
     @Override
-    public ArtifactCoordinate createArtifactCoordinate(Artifact artifact) {
+    public DependencyCoordinates 
createDependencyCoordinates(ArtifactCoordinates artifactCoordinates) {
         return null;
     }
 
     @Override
-    public DependencyCoordinate createDependencyCoordinate(ArtifactCoordinate 
artifactCoordinate) {
+    public DependencyCoordinates createDependencyCoordinates(Dependency 
dependency) {
         return null;
     }
 
     @Override
-    public DependencyCoordinate createDependencyCoordinate(Dependency 
dependency) {
+    public DownloadedArtifact resolveArtifact(Artifact artifact) {
         return null;
     }
 
     @Override
-    public Map.Entry<Artifact, Path> resolveArtifact(Artifact artifact) {
+    public DownloadedArtifact resolveArtifact(ArtifactCoordinates coordinate) {
         return null;
     }
 
     @Override
-    public Map.Entry<Artifact, Path> resolveArtifact(ArtifactCoordinate 
coordinate) {
+    public DownloadedArtifact resolveArtifact(ArtifactCoordinates coordinates, 
List<RemoteRepository> repositories) {
         return null;
     }
 
     @Override
-    public Map<Artifact, Path> resolveArtifacts(ArtifactCoordinate... 
artifactCoordinates) {
+    public DownloadedArtifact resolveArtifact(Artifact artifact, 
List<RemoteRepository> repositories) {
         return null;
     }
 
     @Override
-    public Map<Artifact, Path> resolveArtifacts(Collection<? extends 
ArtifactCoordinate> collection) {
+    public Collection<DownloadedArtifact> 
resolveArtifacts(ArtifactCoordinates... artifactCoordinates) {
         return null;
     }
 
     @Override
-    public Map<Artifact, Path> resolveArtifacts(Artifact... artifacts) {
+    public Collection<DownloadedArtifact> resolveArtifacts(Collection<? 
extends ArtifactCoordinates> collection) {
+        return null;
+    }
+
+    @Override
+    public Collection<DownloadedArtifact> resolveArtifacts(Artifact... 
artifacts) {
+        return null;
+    }
+
+    @Override
+    public Collection<DownloadedArtifact> resolveArtifacts(
+            Collection<? extends ArtifactCoordinates> coordinates, 
List<RemoteRepository> repositories) {
         return null;
     }
 
@@ -280,12 +311,12 @@ public class SessionStub implements Session {
     }
 
     @Override
-    public List<Path> resolveDependencies(DependencyCoordinate 
dependencyCoordinate) {
+    public List<Path> resolveDependencies(DependencyCoordinates 
dependencyCoordinates) {
         return null;
     }
 
     @Override
-    public List<Path> resolveDependencies(List<DependencyCoordinate> 
dependencyCoordinates) {
+    public List<Path> resolveDependencies(List<DependencyCoordinates> 
dependencyCoordinatess) {
         return null;
     }
 
@@ -295,12 +326,17 @@ public class SessionStub implements Session {
     }
 
     @Override
-    public Version resolveVersion(ArtifactCoordinate artifact) {
+    public Version resolveVersion(ArtifactCoordinates artifact) {
+        return null;
+    }
+
+    @Override
+    public List<Version> resolveVersionRange(ArtifactCoordinates artifact) {
         return null;
     }
 
     @Override
-    public List<Version> resolveVersionRange(ArtifactCoordinate artifact) {
+    public List<Version> resolveVersionRange(ArtifactCoordinates artifact, 
List<RemoteRepository> repositories) {
         return null;
     }
 
@@ -314,7 +350,7 @@ public class SessionStub implements Session {
     public void deployArtifact(RemoteRepository repository, Artifact... 
artifacts) {}
 
     @Override
-    public void setArtifactPath(Artifact artifact, Path path) {}
+    public void setArtifactPath(ProducedArtifact artifact, Path path) {}
 
     @Override
     public Optional<Path> getArtifactPath(Artifact artifact) {
@@ -327,17 +363,17 @@ public class SessionStub implements Session {
     }
 
     @Override
-    public Node collectDependencies(Artifact artifact) {
+    public Node collectDependencies(Artifact artifact, PathScope scope) {
         return null;
     }
 
     @Override
-    public Node collectDependencies(Project project) {
+    public Node collectDependencies(Project project, PathScope scope) {
         return null;
     }
 
     @Override
-    public Node collectDependencies(DependencyCoordinate dependencyCoordinate) 
{
+    public Node collectDependencies(DependencyCoordinates 
dependencyCoordinates, PathScope scope) {
         return null;
     }
 
@@ -368,7 +404,7 @@ public class SessionStub implements Session {
 
     @Override
     public Map<PathType, List<Path>> resolveDependencies(
-            DependencyCoordinate dependencyCoordinate, PathScope scope, 
Collection<PathType> desiredTypes) {
+            DependencyCoordinates dependencyCoordinates, PathScope scope, 
Collection<PathType> desiredTypes) {
         return Map.of();
     }
 
diff --git a/pom.xml b/pom.xml
index 40fd5ef..0f09129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,13 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <surefire.version>3.2.1</surefire.version>
-    <mavenVersion>4.0.0-beta-3</mavenVersion>
+    <surefire.version>3.5.1</surefire.version>
+    <mavenVersion>4.0.0-beta-5</mavenVersion>
     <maven.site.path>plugin-testing-archives/LATEST</maven.site.path>
     <javaVersion>17</javaVersion>
     
<project.build.outputTimestamp>2024-06-26T07:42:15Z</project.build.outputTimestamp>
+    <version.maven-site-plugin>4.0.0-M16</version.maven-site-plugin>
+    <version.maven-fluido-skin>2.0.0-M10</version.maven-fluido-skin>
   </properties>
 
 </project>

Reply via email to