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-jar-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 7934b48 Remove dependency on plexus (#63)
7934b48 is described below
commit 7934b483d654e17b5e6983cc4caf6afe24f1a23d
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Wed Oct 4 11:49:52 2023 +0000
Remove dependency on plexus (#63)
* remove unused imports
* switch to Apache commons IO
---
pom.xml | 11 ++++++-----
src/it/MJAR-162/verify.bsh | 1 -
src/it/MJAR-183/verify.bsh | 1 -
src/it/MJAR-199-change-classifier/verify.bsh | 1 -
src/it/MJAR-199/verify.bsh | 1 -
src/it/MJAR-228/verify.bsh | 1 -
src/it/MJAR-260-invalid-automatic-module-name/verify.bsh | 1 -
src/it/MJAR-260-valid-automatic-module-name/verify.bsh | 1 -
src/it/MJAR-30-excludes/verify.groovy | 1 -
src/it/MJAR-30-fullcontent/verify.groovy | 1 -
src/it/MJAR-30-include/verify.groovy | 1 -
src/it/MJAR-60/verify.groovy | 4 ++--
src/it/MJAR-80-exclude/verify.groovy | 1 -
src/it/MJAR-80-fullcontent/verify.groovy | 1 -
src/it/MJAR-80-include/verify.groovy | 1 -
src/it/MJAR-82/verify.bsh | 1 -
src/it/manifest-content/verify.grovy | 1 -
src/it/mjar-139/verify.bsh | 1 -
src/it/mjar-71-01/verify.groovy | 4 ++--
src/it/mjar-71-02/verify.groovy | 4 ++--
src/it/mjar-90/verify.bsh | 1 -
src/it/project-004/verify.groovy | 1 -
22 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6ae8756..3681e08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,11 +114,6 @@
<artifactId>maven-archiver</artifactId>
<version>${mavenArchiverVersion}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.4.2</version>
- </dependency>
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -145,6 +140,12 @@
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.14.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/it/MJAR-162/verify.bsh b/src/it/MJAR-162/verify.bsh
index d339c67..d4f0f82 100644
--- a/src/it/MJAR-162/verify.bsh
+++ b/src/it/MJAR-162/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-183/verify.bsh b/src/it/MJAR-183/verify.bsh
index a9aeea5..a024918 100644
--- a/src/it/MJAR-183/verify.bsh
+++ b/src/it/MJAR-183/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-199-change-classifier/verify.bsh
b/src/it/MJAR-199-change-classifier/verify.bsh
index 2f82c46..27dc60c 100644
--- a/src/it/MJAR-199-change-classifier/verify.bsh
+++ b/src/it/MJAR-199-change-classifier/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-199/verify.bsh b/src/it/MJAR-199/verify.bsh
index 18c8b25..e788c14 100644
--- a/src/it/MJAR-199/verify.bsh
+++ b/src/it/MJAR-199/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-228/verify.bsh b/src/it/MJAR-228/verify.bsh
index 7365c85..9fe1b9c 100644
--- a/src/it/MJAR-228/verify.bsh
+++ b/src/it/MJAR-228/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
b/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
index 2096dc1..3253895 100644
--- a/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
+++ b/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
@@ -22,7 +22,6 @@ import java.io.*;
import java.nio.file.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-260-valid-automatic-module-name/verify.bsh
b/src/it/MJAR-260-valid-automatic-module-name/verify.bsh
index 86db5ed..0618e58 100644
--- a/src/it/MJAR-260-valid-automatic-module-name/verify.bsh
+++ b/src/it/MJAR-260-valid-automatic-module-name/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-30-excludes/verify.groovy
b/src/it/MJAR-30-excludes/verify.groovy
index 8470d21..dafd74f 100644
--- a/src/it/MJAR-30-excludes/verify.groovy
+++ b/src/it/MJAR-30-excludes/verify.groovy
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-30-fullcontent/verify.groovy
b/src/it/MJAR-30-fullcontent/verify.groovy
index a64ef94..89ad38d 100644
--- a/src/it/MJAR-30-fullcontent/verify.groovy
+++ b/src/it/MJAR-30-fullcontent/verify.groovy
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-30-include/verify.groovy
b/src/it/MJAR-30-include/verify.groovy
index 258b205..28d3e5f 100644
--- a/src/it/MJAR-30-include/verify.groovy
+++ b/src/it/MJAR-30-include/verify.groovy
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-60/verify.groovy b/src/it/MJAR-60/verify.groovy
index 04d1975..76f19fe 100644
--- a/src/it/MJAR-60/verify.groovy
+++ b/src/it/MJAR-60/verify.groovy
@@ -21,7 +21,7 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
+import org.apache.commons.io.*;
boolean result = true;
@@ -51,7 +51,7 @@ try
// Only compare files
if ( entry.getName().equals( "META-INF/MANIFEST.MF" ) )
{
- String manifest = IOUtil.toString( jar.getInputStream ( entry )
);
+ String manifest = IOUtils.toString( jar.getInputStream ( entry
) );
int index = manifest.indexOf( "Class-Path: config/" );
if ( index <= 0 )
{
diff --git a/src/it/MJAR-80-exclude/verify.groovy
b/src/it/MJAR-80-exclude/verify.groovy
index 063dd30..8d72e1b 100644
--- a/src/it/MJAR-80-exclude/verify.groovy
+++ b/src/it/MJAR-80-exclude/verify.groovy
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-80-fullcontent/verify.groovy
b/src/it/MJAR-80-fullcontent/verify.groovy
index 6cafc8d..47523b5 100644
--- a/src/it/MJAR-80-fullcontent/verify.groovy
+++ b/src/it/MJAR-80-fullcontent/verify.groovy
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-80-include/verify.groovy
b/src/it/MJAR-80-include/verify.groovy
index ff62d49..09294a5 100644
--- a/src/it/MJAR-80-include/verify.groovy
+++ b/src/it/MJAR-80-include/verify.groovy
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/MJAR-82/verify.bsh b/src/it/MJAR-82/verify.bsh
index 2afd430..acdbfd9 100644
--- a/src/it/MJAR-82/verify.bsh
+++ b/src/it/MJAR-82/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
import org.codehaus.plexus.util.cli.*;
import org.codehaus.plexus.util.FileUtils;
diff --git a/src/it/manifest-content/verify.grovy
b/src/it/manifest-content/verify.grovy
index ccf3f5a..2da7753 100644
--- a/src/it/manifest-content/verify.grovy
+++ b/src/it/manifest-content/verify.grovy
@@ -22,7 +22,6 @@ import java.io.*;
import java.util.*;
import java.util.jar.*;
import java.util.zip.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/mjar-139/verify.bsh b/src/it/mjar-139/verify.bsh
index 0af748a..8d5555b 100644
--- a/src/it/mjar-139/verify.bsh
+++ b/src/it/mjar-139/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/mjar-71-01/verify.groovy b/src/it/mjar-71-01/verify.groovy
index b62fe5d..97f78e8 100644
--- a/src/it/mjar-71-01/verify.groovy
+++ b/src/it/mjar-71-01/verify.groovy
@@ -21,7 +21,7 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
+import org.apache.commons.io.*;
boolean result = true;
@@ -51,7 +51,7 @@ try
// Only compare files
if ( entry.getName().equals( "META-INF/MANIFEST.MF" ) )
{
- String manifest = IOUtil.toString( jar.getInputStream ( entry )
);
+ String manifest = IOUtils.toString( jar.getInputStream ( entry
) );
int index = manifest.indexOf( "Archiver-Version:
foobar-1.23456" );
if ( index <= 0 )
{
diff --git a/src/it/mjar-71-02/verify.groovy b/src/it/mjar-71-02/verify.groovy
index ada2d78..33e4053 100644
--- a/src/it/mjar-71-02/verify.groovy
+++ b/src/it/mjar-71-02/verify.groovy
@@ -21,7 +21,7 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
+import org.apache.commons.io.*;
boolean result = true;
@@ -51,7 +51,7 @@ try
// Only compare files
if ( entry.getName().equals ( "META-INF/MANIFEST.MF" ) )
{
- String manifest = IOUtil.toString( jar.getInputStream ( entry )
);
+ String manifest = IOUtils.toString( jar.getInputStream ( entry
) );
int index = manifest.indexOf( "Archiver-Version:
foobar-1.23456" );
if ( index > 0 )
{
diff --git a/src/it/mjar-90/verify.bsh b/src/it/mjar-90/verify.bsh
index c1e9302..7560e22 100644
--- a/src/it/mjar-90/verify.bsh
+++ b/src/it/mjar-90/verify.bsh
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
diff --git a/src/it/project-004/verify.groovy b/src/it/project-004/verify.groovy
index e5f5506..6989c03 100644
--- a/src/it/project-004/verify.groovy
+++ b/src/it/project-004/verify.groovy
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
