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 b55935e7f fix: pre release fixes, some are failing tests and some
Javadoc/site
b55935e7f is described below
commit b55935e7fcb0a23d4000b166d4c4a9145621f53b
Author: Tamas Cservenak <[email protected]>
AuthorDate: Wed Nov 18 18:28:56 2026 +0100
fix: pre release fixes, some are failing tests and some Javadoc/site
---
.../internal/test/util/http/HttpTransporterTest.java | 5 +++--
maven-resolver-transport-jetty/pom.xml | 13 -------------
.../aether/transport/jetty/JettyTransporterTest.java | 16 +++++++++++++++-
pom.xml | 10 ++++++++++
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
index 72f7e9453..c064546c7 100644
---
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
+++
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
@@ -1189,8 +1189,9 @@ public abstract class HttpTransporterTest {
assertEquals(9, listener.getDataLength());
assertTrue(listener.getProgressedCount() > 0, "Count: " +
listener.getProgressedCount());
assertEquals("resumable",
listener.getBaos().toString(StandardCharsets.UTF_8));
- // the 412 answer to the resume request was discarded; only the served
response reports its properties
- assertEquals(1, listener.getTransportPropertiesCount());
+ // the 412 answer to the resume request was discarded; only the served
response may report properties (url
+ // transport reports none)
+ assertTrue(listener.getTransportPropertiesCount() <= 1, "Count: " +
listener.getTransportPropertiesCount());
}
@Test
diff --git a/maven-resolver-transport-jetty/pom.xml
b/maven-resolver-transport-jetty/pom.xml
index 5f9e706e1..964498578 100644
--- a/maven-resolver-transport-jetty/pom.xml
+++ b/maven-resolver-transport-jetty/pom.xml
@@ -36,19 +36,6 @@
<javaVersion>17</javaVersion>
</properties>
- <dependencyManagement>
- <dependencies>
- <!-- TODO: remove once Jetty ships with 1.24.0 or newer (in 12.1.15+) -->
- <!-- workaround for CVE-2026-111497 -->
- <dependency>
- <groupId>com.aayushatharva.brotli4j</groupId>
- <artifactId>brotli4j-bom</artifactId>
- <version>1.24.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
diff --git
a/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
b/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
index d459d93ca..8086c6b24 100644
---
a/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
+++
b/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
@@ -22,6 +22,8 @@ import java.io.File;
import java.net.URI;
import java.util.stream.Stream;
+import com.aayushatharva.brotli4j.Brotli4jLoader;
+import com.github.luben.zstd.util.Native;
import org.eclipse.aether.ConfigurationProperties;
import org.eclipse.aether.internal.test.util.TestFileUtils;
import org.eclipse.aether.internal.test.util.http.HttpTransporterTest;
@@ -42,7 +44,19 @@ class JettyTransporterTest extends HttpTransporterTest {
@Override
protected Stream<String> supportedCompressionAlgorithms() {
- return Stream.of("gzip", "deflate", "br", "zstd");
+ // Jetty advertises "br" and "zstd" only if their native libraries
load on this platform
+ return Stream.of("gzip", "deflate", "br", "zstd")
+ .filter(e -> !e.equals("br") || Brotli4jLoader.isAvailable())
+ .filter(e -> !e.equals("zstd") || isZstdAvailable());
+ }
+
+ private static boolean isZstdAvailable() {
+ try {
+ Native.load(); // same call Jetty's ZstandardCompression makes
+ return true;
+ } catch (Throwable e) {
+ return false;
+ }
}
@Override
diff --git a/pom.xml b/pom.xml
index 9b4f29e24..a87ca1ac9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -749,6 +749,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- aggregate classpath holds maven-resolver-provider 4 only;
supplier-mvn3 needs types only in 3.10.x -->
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <version>${maven3Version}</version>
+ </additionalDependency>
+ </additionalDependencies>
+ </configuration>
<reportSets>
<reportSet>
<id>aggregate</id>