This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch mvn4rc1
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 46f1a786e1598d712b4a6a6b77c59e1d527c7957
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Fri Nov 29 01:10:26 2024 +0100
Switch to Maven 4.0rc1
---
pom.xml | 2 +-
.../apache/maven/shared/filtering/StubSession.java | 85 +++++++++++++++-------
2 files changed, 60 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 183c454..eea8669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<properties>
<javaVersion>17</javaVersion>
- <mavenVersion>4.0.0-beta-3</mavenVersion>
+ <mavenVersion>4.0.0-rc-1</mavenVersion>
<hamcrestVersion>3.0</hamcrestVersion>
<junitVersion>5.10.1</junitVersion>
diff --git a/src/test/java/org/apache/maven/shared/filtering/StubSession.java
b/src/test/java/org/apache/maven/shared/filtering/StubSession.java
index 0fec2f0..d63a299 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubSession.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubSession.java
@@ -30,6 +30,7 @@ import org.apache.maven.api.*;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.model.Repository;
+import org.apache.maven.api.services.VersionResolverException;
import org.apache.maven.api.settings.Settings;
/**
@@ -198,102 +199,134 @@ public class StubSession implements Session {
}
@Override
- public ArtifactCoordinate createArtifactCoordinate(String s, String s1,
String s2, String s3) {
+ public ProducedArtifact createProducedArtifact(String s, String s1, String
s2, String s3) {
return null;
}
@Override
- public ArtifactCoordinate createArtifactCoordinate(String coordString) {
+ public ProducedArtifact createProducedArtifact(String s, String s1, String
s2, String s3, String s4, String s5) {
return null;
}
@Override
- public ArtifactCoordinate createArtifactCoordinate(
- String s, String s1, String s2, String s3, String s4, String s5) {
+ public ArtifactCoordinates createArtifactCoordinates(String s, String s1,
String s2, String s3) {
return null;
}
@Override
- public ArtifactCoordinate createArtifactCoordinate(Artifact artifact) {
+ public ArtifactCoordinates createArtifactCoordinates(String coordString) {
return null;
}
@Override
- public DependencyCoordinate createDependencyCoordinate(ArtifactCoordinate
artifactCoordinate) {
+ public ArtifactCoordinates createArtifactCoordinates(
+ String s, String s1, String s2, String s3, String s4, String s5) {
return null;
}
@Override
- public DependencyCoordinate createDependencyCoordinate(Dependency
dependency) {
+ public ArtifactCoordinates createArtifactCoordinates(Artifact artifact) {
return null;
}
@Override
- public Map.Entry<Artifact, Path> resolveArtifact(Artifact artifact) {
+ public DependencyCoordinates
createDependencyCoordinates(ArtifactCoordinates artifactCoordinate) {
return null;
}
@Override
- public Map.Entry<Artifact, Path> resolveArtifact(ArtifactCoordinate
coordinate) {
+ public DependencyCoordinates createDependencyCoordinates(Dependency
dependency) {
return null;
}
@Override
- public Map<Artifact, Path> resolveArtifacts(ArtifactCoordinate...
artifactCoordinates) {
+ public DownloadedArtifact resolveArtifact(Artifact artifact) {
return null;
}
@Override
- public Map<Artifact, Path> resolveArtifacts(Collection<? extends
ArtifactCoordinate> collection) {
+ public DownloadedArtifact resolveArtifact(Artifact artifact,
List<RemoteRepository> list) {
return null;
}
@Override
- public Map<Artifact, Path> resolveArtifacts(Artifact... artifacts) {
+ public DownloadedArtifact resolveArtifact(ArtifactCoordinates coordinate) {
return null;
}
@Override
- public List<Node> flattenDependencies(Node node, PathScope scope) {
+ public DownloadedArtifact resolveArtifact(ArtifactCoordinates
artifactCoordinates, List<RemoteRepository> list) {
return null;
}
@Override
- public List<Path> resolveDependencies(DependencyCoordinate
dependencyCoordinate) {
+ public Collection<DownloadedArtifact>
resolveArtifacts(ArtifactCoordinates... artifactCoordinates) {
return null;
}
@Override
- public List<Path> resolveDependencies(List<DependencyCoordinate>
dependencyCoordinates) {
+ public Collection<DownloadedArtifact> resolveArtifacts(Collection<?
extends ArtifactCoordinates> collection) {
return null;
}
@Override
- public List<Path> resolveDependencies(Project project, PathScope scope) {
+ public Collection<DownloadedArtifact> resolveArtifacts(
+ Collection<? extends ArtifactCoordinates> collection,
List<RemoteRepository> list) {
+ return List.of();
+ }
+
+ @Override
+ public Collection<DownloadedArtifact> resolveArtifacts(Artifact...
artifacts) {
+ return null;
+ }
+
+ @Override
+ public void installArtifacts(ProducedArtifact... producedArtifacts) {}
+
+ @Override
+ public void installArtifacts(Collection<ProducedArtifact> collection) {}
+
+ @Override
+ public void deployArtifact(RemoteRepository remoteRepository,
ProducedArtifact... producedArtifacts) {}
+
+ @Override
+ public void setArtifactPath(ProducedArtifact producedArtifact, Path path)
{}
+
+ @Override
+ public List<Node> flattenDependencies(Node node, PathScope scope) {
return null;
}
@Override
- public Version resolveVersion(ArtifactCoordinate artifact) {
+ public List<Path> resolveDependencies(DependencyCoordinates
dependencyCoordinate) {
return null;
}
@Override
- public List<Version> resolveVersionRange(ArtifactCoordinate artifact) {
+ public List<Path> resolveDependencies(List<DependencyCoordinates>
dependencyCoordinates) {
return null;
}
@Override
- public void installArtifacts(Artifact... artifacts) {}
+ public List<Path> resolveDependencies(Project project, PathScope scope) {
+ return null;
+ }
@Override
- public void installArtifacts(Collection<Artifact> artifacts) {}
+ public Version resolveVersion(ArtifactCoordinates artifact) {
+ return null;
+ }
@Override
- public void deployArtifact(RemoteRepository repository, Artifact...
artifacts) {}
+ public List<Version> resolveVersionRange(ArtifactCoordinates artifact) {
+ return null;
+ }
@Override
- public void setArtifactPath(Artifact artifact, Path path) {}
+ public List<Version> resolveVersionRange(ArtifactCoordinates
artifactCoordinates, List<RemoteRepository> list)
+ throws VersionResolverException {
+ return List.of();
+ }
@Override
public Optional<Path> getArtifactPath(Artifact artifact) {
@@ -306,17 +339,17 @@ public class StubSession implements Session {
}
@Override
- public Node collectDependencies(Artifact artifact) {
+ public Node collectDependencies(Artifact artifact, PathScope pathScope) {
return null;
}
@Override
- public Node collectDependencies(Project project) {
+ public Node collectDependencies(Project project, PathScope pathScope) {
return null;
}
@Override
- public Node collectDependencies(DependencyCoordinate dependencyCoordinate)
{
+ public Node collectDependencies(DependencyCoordinates
dependencyCoordinates, PathScope pathScope) {
return null;
}
@@ -347,7 +380,7 @@ public class StubSession 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();
}
