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

move plexus-utils to scope test #79

Merged
merged 3 commits into from
Feb 14, 2021
Merged

move plexus-utils to scope test #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dab07d5
move plexus-utils to scope test
elharo Jan 23, 2021
1015925
update plexus-utils
elharo Jan 23, 2021
8d1ec82
fix generics
elharo Feb 14, 2021
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.10</version>
<scope>provided</scope>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.1.0</version>
<version>3.3.0</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so we updated prerequisites to Maven 3.2.5?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question!

<scope>test</scope>
</dependency>
</dependencies>
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeThat;

import org.apache.commons.io.IOUtils;
import org.apache.maven.shared.utils.Os;
import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
import org.codehaus.plexus.util.InterpolationFilterReader;
Expand Down Expand Up @@ -653,9 +654,9 @@ public void copyFileWithFilteringAndNewerDestinationAndMatchingContent()
);
}

private FileUtils.FilterWrapper[] wrappers( String key, String value )
private static FileUtils.FilterWrapper[] wrappers( String key, String value )
{
final Map<String, String> map = new HashMap<>();
final Map<String, Object> map = new HashMap<>();
map.put( key, value );
return new FileUtils.FilterWrapper[]
{
Expand Down Expand Up @@ -688,7 +689,7 @@ private static void assertFileContent( @Nonnull File file, @Nonnull String expec
assertEquals(
"Expected " + file.getPath() + " to contain: " + expected,
expected,
IOUtil.toString( in )
IOUtils.toString( in )
);
}
}
Expand Down