This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch drop-wagon in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
commit d57f95865f0a012f5f8848340be52c4489160dd4 Author: Tamas Cservenak <[email protected]> AuthorDate: Fri Jul 10 22:56:48 2026 +0200 Drop Wagon; is history Drop Wagon, is historical relic. If needed, users can re-add it as dependency. --- pom.xml | 21 +++------------------ .../maven/buildcache/RemoteCacheRepositoryImpl.java | 4 ---- .../maven/buildcache/its/RemoteCacheDavTest.java | 2 +- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index fb5c4d7..e5dc9bf 100644 --- a/pom.xml +++ b/pom.xml @@ -74,14 +74,9 @@ under the License. <commonsLangVersion>3.20.0</commonsLangVersion> <junit.version>5.14.4</junit.version> <mockitoVersion>4.11.0</mockitoVersion> - <wagonVersion>3.4.3</wagonVersion> - <securityDispatcherVersion>2.0</securityDispatcherVersion> - <cipherVersion>2.0</cipherVersion> - <modelloVersion>1.11</modelloVersion> - <jxpathVersion>1.3</jxpathVersion> <resolverVersion>1.9.27</resolverVersion> <slf4jVersion>1.7.36</slf4jVersion> - <wiremockVersion>3.0.1</wiremockVersion> + <wiremockVersion>3.13.2</wiremockVersion> <xmlunitVersion>2.6.4</xmlunitVersion> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <maven.site.path>extensions-archives/${project.artifactId}-LATEST</maven.site.path> @@ -211,16 +206,6 @@ under the License. <artifactId>slf4j-api</artifactId> <version>${slf4jVersion}</version> </dependency> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>3.5.3</version> - </dependency> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-provider-api</artifactId> - <version>3.5.3</version> - </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> @@ -302,8 +287,8 @@ under the License. <scope>test</scope> </dependency> <dependency> - <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8</artifactId> + <groupId>org.wiremock</groupId> + <artifactId>wiremock</artifactId> <version>${wiremockVersion}</version> <scope>test</scope> <exclusions> diff --git a/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java index 9d18350..ce2c6d5 100644 --- a/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java +++ b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java @@ -45,7 +45,6 @@ import org.apache.maven.buildcache.xml.report.ProjectReport; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; -import org.apache.maven.wagon.ResourceDoesNotExistException; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.Authentication; import org.eclipse.aether.repository.Proxy; @@ -154,9 +153,6 @@ public Optional<byte[]> getResourceContent(String url) { GetTask task = new GetTask(new URI(url)); transporter.get(task); return Optional.of(task.getDataBytes()); - } catch (ResourceDoesNotExistException e) { - logNotFound(fullUrl, e); - return Optional.empty(); } catch (Exception e) { // this can be wagon used so the exception may be different // we want wagon users not flooded with logs when not found diff --git a/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java b/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java index 209d126..d25a250 100644 --- a/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java @@ -113,7 +113,7 @@ void cleanup() throws Exception { } public static Stream<Arguments> transports() { - return Stream.of(Arguments.of("wagon"), Arguments.of("http")); + return Stream.of(Arguments.of("http")); } @ParameterizedTest
