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-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 8eb19dc Drop unneeded dependencies (#788)
8eb19dc is described below
commit 8eb19dce1f587a6f67f3ab00254925e1a437afbb
Author: Tamas Cservenak <[email protected]>
AuthorDate: Thu Feb 26 22:11:06 2026 +0100
Drop unneeded dependencies (#788)
Drops commons-io (one method used from it), and some other deps as well.
---
pom.xml | 59 ++++++++++++----------
.../resource/ServiceResourceTransformerTest.java | 22 ++++++--
2 files changed, 49 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7ad0742..586422a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,26 @@
<project.build.outputTimestamp>2025-09-10T00:53:43Z</project.build.outputTimestamp>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>3.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- Needed dependencies -->
<dependency>
@@ -140,6 +160,12 @@
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@@ -160,28 +186,14 @@
</dependency>
<!-- Test -->
- <!-- Used by: TransformerTesterRule only -->
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>5.1.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>3.0</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -197,15 +209,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -214,12 +225,6 @@
<version>3.5.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.21.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git
a/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
b/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
index dd0e80e..e468c5b 100644
---
a/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
+++
b/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
@@ -19,9 +19,12 @@
package org.apache.maven.plugins.shade.resource;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,7 +34,6 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
-import org.apache.commons.io.IOUtils;
import org.apache.maven.plugins.shade.relocation.Relocator;
import org.apache.maven.plugins.shade.relocation.SimpleRelocator;
import org.junit.Test;
@@ -75,7 +77,7 @@ public class ServiceResourceTransformerTest {
JarEntry jarEntry = jarFile.getJarEntry(contentResourceShaded);
assertNotNull(jarEntry);
try (InputStream entryStream = jarFile.getInputStream(jarEntry)) {
- String xformedContent = IOUtils.toString(entryStream, "utf-8");
+ String xformedContent = toString(entryStream,
StandardCharsets.UTF_8);
assertEquals("borg.foo.Service" + newline +
"org.foo.exclude.OtherService" + newline, xformedContent);
} finally {
jarFile.close();
@@ -118,7 +120,7 @@ public class ServiceResourceTransformerTest {
JarEntry jarEntry = jarFile.getJarEntry(contentResourceShaded);
assertNotNull(jarEntry);
try (InputStream entryStream = jarFile.getInputStream(jarEntry)) {
- String xformedContent = IOUtils.toString(entryStream,
StandardCharsets.UTF_8);
+ String xformedContent = toString(entryStream,
StandardCharsets.UTF_8);
assertEquals(contentShaded, xformedContent);
} finally {
jarFile.close();
@@ -153,7 +155,7 @@ public class ServiceResourceTransformerTest {
JarEntry jarEntry = jarFile.getJarEntry(contentResource);
assertNotNull(jarEntry);
try (InputStream entryStream = jarFile.getInputStream(jarEntry)) {
- String xformedContent = IOUtils.toString(entryStream,
StandardCharsets.UTF_8);
+ String xformedContent = toString(entryStream,
StandardCharsets.UTF_8);
assertEquals("org.eclipse1234.osgi.launch.EquinoxFactory" +
newline, xformedContent);
} finally {
jarFile.close();
@@ -196,7 +198,7 @@ public class ServiceResourceTransformerTest {
JarEntry jarEntry = jarFile.getJarEntry(contentResource);
assertNotNull(jarEntry);
try (InputStream entryStream = jarFile.getInputStream(jarEntry)) {
- String xformedContent = IOUtils.toString(entryStream, "utf-8");
+ String xformedContent = toString(entryStream,
StandardCharsets.UTF_8);
// must be two lines, with our two classes.
String[] classes = xformedContent.split("\r?\n");
boolean h1 = false;
@@ -216,4 +218,14 @@ public class ServiceResourceTransformerTest {
tempJar.delete();
}
}
+
+ private static String toString(InputStream stream, Charset charset) throws
IOException {
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ byte[] data = new byte[8192];
+ int read;
+ while ((read = stream.read(data, 0, data.length)) != -1) {
+ buffer.write(data, 0, read);
+ }
+ return new String(buffer.toByteArray(), charset);
+ }
}
