This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 35c2d757 [MRESOLVER-698] Update Maven4 to rc-3 (#684)
35c2d757 is described below
commit 35c2d7579d0c1c1e577c4d847171102ca91be2c7
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Apr 8 17:36:52 2025 +0200
[MRESOLVER-698] Update Maven4 to rc-3 (#684)
This implied several changes as well:
* mvn4 supplier became Java 17 as well
* two modules (wagon, mvn3 supplier) use Java 8 p-u/p-x, nothing in
resolver uses it (tools uses it, but is not a resolver API)
* mvn4 rc-3 classes with "restored" maven3 compat lost ability to work on
JIMF, removed it from demos.
* ported "prune plexus deps" from
https://github.com/apache/maven-resolver/pull/655
---
https://issues.apache.org/jira/browse/MRESOLVER-698
---
.github/workflows/maven-verify.yml | 2 +-
.../org/apache/maven/resolver/examples/util/Booter.java | 16 ++--------------
maven-resolver-supplier-mvn3/pom.xml | 6 ++----
maven-resolver-transport-wagon/pom.xml | 10 ++++++----
pom.xml | 6 +++---
src/site/markdown/configuration.md | 2 +-
6 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/maven-verify.yml
b/.github/workflows/maven-verify.yml
index 4e6e2104..871a06cf 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -29,6 +29,6 @@ jobs:
ff-run: false
ff-site-run: false
jdk-matrix: '[ "21" ]'
- maven-matrix: '[ "3.9.9", "4.0.0-rc-2" ]'
+ maven-matrix: '[ "3.9.9", "4.0.0-rc-3" ]'
verify-fail-fast: false
diff --git
a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java
b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java
index bd2bcb88..8e9fcd9a 100644
---
a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java
+++
b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java
@@ -18,16 +18,12 @@
*/
package org.apache.maven.resolver.examples.util;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.FileSystem;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import com.google.common.jimfs.Configuration;
-import com.google.common.jimfs.Jimfs;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession.SessionBuilder;
@@ -66,11 +62,10 @@ public class Booter {
}
public static SessionBuilder newRepositorySystemSession(RepositorySystem
system) {
- FileSystem fs = Jimfs.newFileSystem(Configuration.unix());
SessionBuilder result = new SessionBuilderSupplier(system)
.get()
.setSystemProperties(System.getProperties())
- .withLocalRepositoryBaseDirectories(fs.getPath("local-repo"))
+
.withLocalRepositoryBaseDirectories(Path.of("target/local-repo"))
.setRepositoryListener(new ConsoleRepositoryListener())
.setTransferListener(new ConsoleTransferListener())
.setConfigProperty("aether.generator.gpg.enabled",
Boolean.TRUE.toString())
@@ -80,13 +75,6 @@ public class Booter {
.toAbsolutePath()
.toString())
.setConfigProperty("aether.syncContext.named.factory", "noop");
- result.addOnSessionEndedHandler(() -> {
- try {
- fs.close();
- } catch (IOException e) {
- throw new UncheckedIOException(e);
- }
- });
// uncomment to generate dirty trees
// session.setDependencyGraphTransformer( null );
diff --git a/maven-resolver-supplier-mvn3/pom.xml
b/maven-resolver-supplier-mvn3/pom.xml
index 2c0944c8..7983e810 100644
--- a/maven-resolver-supplier-mvn3/pom.xml
+++ b/maven-resolver-supplier-mvn3/pom.xml
@@ -122,13 +122,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
+ <version>3.0.1</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
diff --git a/maven-resolver-transport-wagon/pom.xml
b/maven-resolver-transport-wagon/pom.xml
index 572c63c0..179edcad 100644
--- a/maven-resolver-transport-wagon/pom.xml
+++ b/maven-resolver-transport-wagon/pom.xml
@@ -49,6 +49,10 @@
<artifactId>wagon-provider-api</artifactId>
<version>3.5.3</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
@@ -64,11 +68,13 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>4.0.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
+ <version>3.0.1</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -93,10 +99,6 @@
<version>1.5.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/pom.xml b/pom.xml
index 45cc771b..03058f7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,10 +113,10 @@
<versions.junit5>5.12.1</versions.junit5>
<!-- Used by Jetty Transport (client) and Test HTTP (server) -->
- <jettyVersion>10.0.24</jettyVersion>
+ <jettyVersion>10.0.25</jettyVersion>
<!-- used by supplier and demo only -->
<maven3Version>3.9.9</maven3Version>
- <maven4Version>4.0.0-rc-1</maven4Version>
+ <maven4Version>4.0.0-rc-3</maven4Version>
<minimalMavenBuildVersion>[3.8.8,)</minimalMavenBuildVersion>
<!-- MRESOLVER-422: keep this in sync with Javadoc plugin configuration
(but cannot directly, as this below is range) -->
<minimalJavaBuildVersion>[21,)</minimalJavaBuildVersion>
@@ -253,7 +253,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
- <version>3.0.1</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
diff --git a/src/site/markdown/configuration.md
b/src/site/markdown/configuration.md
index e015543b..13a2f7c7 100644
--- a/src/site/markdown/configuration.md
+++ b/src/site/markdown/configuration.md
@@ -83,7 +83,7 @@ under the License.
| `"aether.named.ipc.nofork"` | `Boolean` | Should the IPC server not fork?
(i.e. for testing purposes) | `false` | 2.0.1 | No | Java System Properties
|
| `"aether.named.ipc.nonative"` | `Boolean` | Should the IPC server not use
native executable? | `true` | 2.0.1 | No | Java System Properties |
| `"aether.offline.hosts"` | `String` | Comma-separated list of hosts which
are supposed to be resolved when session is offline. | - | | No | Session
Configuration |
-| `"aether.offline.protocols"` | `String` | Comma-separated list of protocols
which are supposed to be accessed when session is offline. | - | | No |
Session Configuration |
+| `"aether.offline.protocols"` | `String` | Comma-separated list of protocols
which are supposed to be resolved when session is offline. | - | | No |
Session Configuration |
| `"aether.offline.repositories"` | `String` | Comma-separated list of
repository IDs which are supposed to be resolved when session is offline. | -
| TBD | No | Session Configuration |
| `"aether.priority.<class>"` | `Float` | The priority to use for a certain
extension class. <code><class></code> can either be the fully qualified
name or the simple name of a class. If the class name ends with Factory that
suffix could optionally be left out. This configuration is used by
<code>org.eclipse.aether.internal.impl.PrioritizedComponents</code> internal
utility to sort classes by priority. This is reusable utility (so an extension
can make use of it), but by default in [...]
| `"aether.priority.cached"` | `Boolean` | A flag indicating whether the
created ordered components should be cached in session. | `true` | 2.0.0 |
No | Session Configuration |
