Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dependency on plexus #63

Merged
merged 2 commits into from
Oct 4, 2023
Merged

Remove dependency on plexus #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1d5a3c
move plexus-utils to test scope and remove unused imports
elharo Oct 1, 2023
5c9fe34
switch to Apache commons IO
elharo Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-162/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-183/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-199-change-classifier/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-199/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-228/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-260-valid-automatic-module-name/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-30-excludes/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-30-fullcontent/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-30-include/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
4 changes: 2 additions & 2 deletions src/it/MJAR-60/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 )
{
Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-80-exclude/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-80-fullcontent/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-80-include/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/MJAR-82/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/it/manifest-content/verify.grovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/it/mjar-139/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
4 changes: 2 additions & 2 deletions src/it/mjar-71-01/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 )
{
Expand Down
4 changes: 2 additions & 2 deletions src/it/mjar-71-02/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 )
{
Expand Down
1 change: 0 additions & 1 deletion src/it/mjar-90/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down
1 change: 0 additions & 1 deletion src/it/project-004/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
import org.codehaus.plexus.util.*;

boolean result = true;

Expand Down