http://git-wip-us.apache.org/repos/asf/archiva/blob/cd1f4a9e/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java index 7a81e13..54ff2e9 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java @@ -20,7 +20,7 @@ package org.apache.archiva.repository.content.maven2; */ import org.apache.archiva.admin.model.beans.ManagedRepository; -import org.apache.archiva.common.utils.FileUtil; +import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.ManagedRepositoryContent; @@ -368,7 +368,7 @@ public class RepositoryRequestTest private ManagedRepositoryContent createManagedRepo( String layout ) throws Exception { - File repoRoot = new File( FileUtil.getBasedir() + "/target/test-repo" ); + File repoRoot = new File( FileUtils.getBasedir() + "/target/test-repo" ); return createManagedRepositoryContent( "test-internal", "Internal Test Repo", repoRoot, layout ); }
http://git-wip-us.apache.org/repos/asf/archiva/blob/cd1f4a9e/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java index 4983004..5fcb717 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java @@ -149,7 +149,7 @@ public class DuplicateArtifactsConsumer // alternatively this could come straight from the storage resolver, which could populate the artifact metadata // in the later parse call with the desired checksum and use that String checksumSha1; - ChecksummedFile checksummedFile = new ChecksummedFile( artifactFile ); + ChecksummedFile checksummedFile = new ChecksummedFile( artifactFile.toPath() ); try { checksumSha1 = checksummedFile.calculateChecksum( ChecksumAlgorithm.SHA1 );
