You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/04/12 11:24:50 UTC
[maven-shade-plugin] branch master updated: [MSHADE-359] update
guava (#42)
This is an automated email from the ASF dual-hosted git repository.
elharo 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 c849d73 [MSHADE-359] update guava (#42)
c849d73 is described below
commit c849d73144ab668fefa663ae396723f9cad065d3
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Sun Apr 12 07:24:41 2020 -0400
[MSHADE-359] update guava (#42)
* update guava
* remove a couple of usages of Guava
* remove a couple of usages of Joiner
---
pom.xml | 8 +++++++-
.../org/apache/maven/plugins/shade/DefaultShader.java | 7 +++----
.../shade/resource/ServicesResourceTransformer.java | 4 +---
.../shade/resource/ServiceResourceTransformerTest.java | 15 ++++++++-------
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e8fe9a..4dfbad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+ <version>28.2-android</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.7</version>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index 39eae63..f5897c3 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -44,6 +44,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipException;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.shade.filter.Filter;
import org.apache.maven.plugins.shade.relocation.Relocator;
@@ -58,8 +59,6 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.commons.ClassRemapper;
import org.objectweb.asm.commons.Remapper;
-
-import com.google.common.base.Joiner;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
@@ -351,8 +350,8 @@ public class DefaultShader
all.addAll( resources );
getLogger().warn(
- Joiner.on( ", " ).join( jarzS ) + " define " + all.size()
- + " overlapping " + Joiner.on( " and " ).join( overlaps ) + ": " );
+ StringUtils.join( jarzS, ", " ) + " define " + all.size()
+ + " overlapping " + StringUtils.join( overlaps, " and " ) + ": " );
//CHECKSTYLE_ON: LineLength
Collections.sort( all );
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
index da43d99..bbb55fd 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
@@ -37,8 +37,6 @@ import java.util.jar.JarOutputStream;
import org.apache.commons.io.IOUtils;
import org.apache.maven.plugins.shade.relocation.Relocator;
-import com.google.common.io.LineReader;
-
/**
* Resources transformer that relocates classes in META-INF/services and appends entries in META-INF/services resources
* into a single resource. For example, if there are several META-INF/services/org.apache.maven.project.ProjectBuilder
@@ -77,7 +75,7 @@ public class ServicesResourceTransformer
final String content = IOUtils.toString( is );
StringReader reader = new StringReader( content );
- LineReader lineReader = new LineReader( reader );
+ BufferedReader lineReader = new BufferedReader( reader );
String line;
while ( ( line = lineReader.readLine() ) != null )
{
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 113c325..3bef2f9 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
@@ -28,6 +28,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.jar.JarEntry;
@@ -39,18 +40,18 @@ import org.apache.maven.plugins.shade.relocation.Relocator;
import org.apache.maven.plugins.shade.relocation.SimpleRelocator;
import org.junit.Test;
-import com.google.common.collect.Lists;
-
/**
* Test for handling META-INF/service/...
*/
public class ServiceResourceTransformerTest {
+
+ private List<Relocator> relocators = new ArrayList<Relocator>();
@Test
public void relocatedClasses() throws Exception {
SimpleRelocator relocator =
new SimpleRelocator( "org.foo", "borg.foo", null, Arrays.asList( "org.foo.exclude.*" ) );
- List<Relocator> relocators = Lists.<Relocator>newArrayList( relocator );
+ relocators.add( relocator );
String content = "org.foo.Service\norg.foo.exclude.OtherService\n";
byte[] contentBytes = content.getBytes( StandardCharsets.UTF_8 );
@@ -95,8 +96,8 @@ public class ServiceResourceTransformerTest {
public void concatanationAppliedMultipleTimes() throws Exception {
SimpleRelocator relocator =
new SimpleRelocator( "org.eclipse", "org.eclipse1234", null, null );
- List<Relocator> relocators = Lists.<Relocator>newArrayList( relocator );
-
+ relocators.add( relocator );
+
String content = "org.eclipse.osgi.launch.EquinoxFactory\n";
byte[] contentBytes = content.getBytes( "UTF-8" );
InputStream contentStream = new ByteArrayInputStream( contentBytes );
@@ -138,8 +139,8 @@ public class ServiceResourceTransformerTest {
@Test
public void concatenation() throws Exception {
SimpleRelocator relocator = new SimpleRelocator("org.foo", "borg.foo", null, null);
- List<Relocator> relocators = Lists.<Relocator>newArrayList( relocator );
-
+ relocators.add( relocator );
+
String content = "org.foo.Service\n";
byte[] contentBytes = content.getBytes( StandardCharsets.UTF_8 );
InputStream contentStream = new ByteArrayInputStream( contentBytes );