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-filtering.git
The following commit(s) were added to refs/heads/master by this push:
new a531823 [MSHARED-1474] Upgrade to Maven 4.0.0-rc-2 (#138)
a531823 is described below
commit a531823abb981b36b2eb15904f39c81a13f44d69
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Apr 3 20:07:16 2025 +0200
[MSHARED-1474] Upgrade to Maven 4.0.0-rc-2 (#138)
* Upgrade to Maven 4.0.0-rc-2
* Simplify GH Action
---------
Co-authored-by: Slawomir Jaranowski <s.jaranow...@gmail.com>
---
.github/workflows/maven-verify.yml | 5 +-
pom.xml | 20 ++++++--
.../apache/maven/shared/filtering/StubSession.java | 58 +++++++++++-----------
3 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/maven-verify.yml
b/.github/workflows/maven-verify.yml
index ae2e211..16a2a51 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -26,9 +26,6 @@ jobs:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
with:
- ff-maven: "4.0.0-rc-1" # Maven version for
fail-fast-build
- maven-matrix: '[ "4.0.0-rc-1" ]'
- maven4-enabled: true
- jdk-matrix: '[ "17", "21", "23" ]'
+ maven4-build: true
ff-goal: verify
verify-goal: verify
diff --git a/pom.xml b/pom.xml
index 9c059bd..8308e81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,12 +62,12 @@
<properties>
<javaVersion>17</javaVersion>
- <mavenVersion>4.0.0-rc-1</mavenVersion>
+ <mavenVersion>4.0.0-rc-2</mavenVersion>
<hamcrestVersion>3.0</hamcrestVersion>
<junitVersion>5.10.1</junitVersion>
- <mavenPluginTestingVersion>4.0.0-beta-2</mavenPluginTestingVersion>
<mockitoVersion>5.16.1</mockitoVersion>
+ <mavenPluginTestingVersion>4.0.0-beta-3</mavenPluginTestingVersion>
<plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
<plexusInterpolationVersion>1.27</plexusInterpolationVersion>
<slf4jVersion>2.0.13</slf4jVersion>
@@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -197,6 +197,20 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ <excludes>
+ <exclude>org.jline:jline</exclude>
+ </excludes>
+ </enforceBytecodeVersion>
+ </rules>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
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 7bc02e8..6387f18 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubSession.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubSession.java
@@ -60,9 +60,9 @@ import org.apache.maven.api.settings.Settings;
*/
public class StubSession implements Session {
- private final Map<String, String> userProperties;
+ private Map<String, String> userProperties;
- private final Map<String, String> systemProperties;
+ private Map<String, String> systemProperties;
private final Settings settings;
@@ -222,12 +222,14 @@ public class StubSession implements Session {
}
@Override
- public ProducedArtifact createProducedArtifact(String s, String s1, String
s2, String s3) {
+ public ProducedArtifact createProducedArtifact(
+ String groupId, String artifactId, String version, String
extension) {
return null;
}
@Override
- public ProducedArtifact createProducedArtifact(String s, String s1, String
s2, String s3, String s4, String s5) {
+ public ProducedArtifact createProducedArtifact(
+ String groupId, String artifactId, String version, String
classifier, String extension, String type) {
return null;
}
@@ -268,27 +270,27 @@ public class StubSession implements Session {
}
@Override
- public DownloadedArtifact resolveArtifact(Artifact artifact,
List<RemoteRepository> list) {
+ public DownloadedArtifact resolveArtifact(ArtifactCoordinates coordinate) {
return null;
}
@Override
- public DownloadedArtifact resolveArtifact(ArtifactCoordinates coordinate) {
+ public Collection<DownloadedArtifact>
resolveArtifacts(ArtifactCoordinates... artifactCoordinates) {
return null;
}
@Override
- public DownloadedArtifact resolveArtifact(ArtifactCoordinates
artifactCoordinates, List<RemoteRepository> list) {
+ public Collection<DownloadedArtifact> resolveArtifacts(Collection<?
extends ArtifactCoordinates> collection) {
return null;
}
@Override
- public Collection<DownloadedArtifact>
resolveArtifacts(ArtifactCoordinates... artifactCoordinates) {
+ public Collection<DownloadedArtifact> resolveArtifacts(Artifact...
artifacts) {
return null;
}
@Override
- public Collection<DownloadedArtifact> resolveArtifacts(Collection<?
extends ArtifactCoordinates> collection) {
+ public DownloadedArtifact resolveArtifact(ArtifactCoordinates
artifactCoordinates, List<RemoteRepository> list) {
return null;
}
@@ -299,21 +301,15 @@ public class StubSession implements Session {
}
@Override
- public Collection<DownloadedArtifact> resolveArtifacts(Artifact...
artifacts) {
+ public DownloadedArtifact resolveArtifact(Artifact artifact,
List<RemoteRepository> list) {
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)
{}
+ public List<Version> resolveVersionRange(ArtifactCoordinates
artifactCoordinates, List<RemoteRepository> list)
+ throws VersionResolverException {
+ return List.of();
+ }
@Override
public List<Node> flattenDependencies(Node node, PathScope scope) {
@@ -346,10 +342,16 @@ public class StubSession implements Session {
}
@Override
- public List<Version> resolveVersionRange(ArtifactCoordinates
artifactCoordinates, List<RemoteRepository> list)
- throws VersionResolverException {
- return List.of();
- }
+ public void installArtifacts(ProducedArtifact... artifacts) {}
+
+ @Override
+ public void installArtifacts(Collection<ProducedArtifact> artifacts) {}
+
+ @Override
+ public void deployArtifact(RemoteRepository repository,
ProducedArtifact... artifacts) {}
+
+ @Override
+ public void setArtifactPath(ProducedArtifact artifact, Path path) {}
@Override
public Optional<Path> getArtifactPath(Artifact artifact) {
@@ -362,17 +364,17 @@ public class StubSession implements Session {
}
@Override
- public Node collectDependencies(Artifact artifact, PathScope pathScope) {
+ public Node collectDependencies(Artifact artifact, PathScope scope) {
return null;
}
@Override
- public Node collectDependencies(Project project, PathScope pathScope) {
+ public Node collectDependencies(Project project, PathScope scope) {
return null;
}
@Override
- public Node collectDependencies(DependencyCoordinates
dependencyCoordinates, PathScope pathScope) {
+ public Node collectDependencies(DependencyCoordinates
dependencyCoordinate, PathScope scope) {
return null;
}
@@ -403,7 +405,7 @@ public class StubSession implements Session {
@Override
public Map<PathType, List<Path>> resolveDependencies(
- DependencyCoordinates dependencyCoordinates, PathScope scope,
Collection<PathType> desiredTypes) {
+ DependencyCoordinates dependencyCoordinate, PathScope scope,
Collection<PathType> desiredTypes) {
return Map.of();
}
