Skip to content

PlexusFileUtils Refaster recipes #1331

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

PlexusFileUtils Refaster recipes #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.io.File;
import java.io.IOException;

import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
Expand All @@ -34,7 +35,6 @@
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.codehaus.plexus.util.FileUtils;

/**
* Get a fresh copy of the latest source from the configured scm url.
Expand Down
2 changes: 1 addition & 1 deletion maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.io.File;
import java.io.IOException;

import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
Expand All @@ -32,7 +33,6 @@
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.codehaus.plexus.util.FileUtils;

/**
* Get a fresh exported copy of the latest source from the configured scm url.
Expand Down
2 changes: 1 addition & 1 deletion maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void testBranch() throws Exception {

File branchCheckoutDir = PlexusJUnit4TestCase.getTestFile("target/branches/mybranch");
if (branchCheckoutDir.exists()) {
FileUtils.deleteDirectory(branchCheckoutDir);
org.apache.commons.io.FileUtils.deleteDirectory(branchCheckoutDir);
}
checkoutMojo.setCheckoutDirectory(branchCheckoutDir);

Expand Down
2 changes: 1 addition & 1 deletion maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void testTag() throws Exception {

File tagCheckoutDir = getTestFile("target/tags/mytag");
if (tagCheckoutDir.exists()) {
FileUtils.deleteDirectory(tagCheckoutDir);
org.apache.commons.io.FileUtils.deleteDirectory(tagCheckoutDir);
}
checkoutMojo.setCheckoutDirectory(tagCheckoutDir);

Expand Down
2 changes: 1 addition & 1 deletion maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

import java.io.File;

import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.scm.provider.git.GitScmTestUtils;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
import org.junit.Before;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
Expand All @@ -36,7 +37,6 @@
import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;

/**
* @author <a href="mailto:[email protected]">thurner rupert</a>
Expand Down
2 changes: 1 addition & 1 deletion ...ers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static String getScmUrl() throws Exception {
public static void initRepo() throws Exception {
// Prepare tmp directory
if (WORKING_DIR.exists()) {
FileUtils.deleteDirectory(WORKING_DIR);
org.apache.commons.io.FileUtils.deleteDirectory(WORKING_DIR);

if (WORKING_DIR.exists()) {
throw new IOException(WORKING_DIR.getAbsolutePath() + " wasn't deleted.");
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ protected CheckOutScmResult executeCheckOutCommand(

try {
if (baseDestination.exists()) {
FileUtils.deleteDirectory(baseDestination);
org.apache.commons.io.FileUtils.deleteDirectory(baseDestination);
}

if (!baseDestination.mkdirs()) {
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void initRepo() throws Exception {
*/
@Test
public void testMetadata() throws Exception {
FileUtils.deleteDirectory(getWorkingCopy());
org.apache.commons.io.FileUtils.deleteDirectory(getWorkingCopy());

CheckOutScmResult result = checkOut(getWorkingCopy(), getScmRepository());

Expand Down
2 changes: 1 addition & 1 deletion ...st/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void initRepo() throws Exception {
*/
@Test
public void testDeletion() throws Exception {
FileUtils.deleteDirectory(getUpdatingCopy());
org.apache.commons.io.FileUtils.deleteDirectory(getUpdatingCopy());

ScmRepository repository = makeScmRepository(getScmUrl());

Expand Down
4 changes: 2 additions & 2 deletions ...g/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void testCheckinNoBranch() throws Exception {

File repoOriginal = new File("src/test/resources/repository_no_branch");
File repo = getTestFile("target/git_copy");
FileUtils.deleteDirectory(repo);
org.apache.commons.io.FileUtils.deleteDirectory(repo);
FileUtils.copyDirectoryStructure(repoOriginal, repo);

ScmRepository scmRepository = getScmManager()
Expand Down Expand Up @@ -89,7 +89,7 @@ public void testCheckinNoBranch() throws Exception {
}

protected CheckOutScmResult checkoutRepo(ScmRepository scmRepository) throws Exception {
FileUtils.deleteDirectory(workingDirectory);
org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory);

CheckOutScmResult result =
getScmManager().checkOut(scmRepository, new ScmFileSet(workingDirectory), (ScmVersion) null);
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public void testSignedCheckin() throws Exception {
// ----------------------------------------------------------------------

private CheckOutScmResult checkoutRepoInto(File workingCopy, ScmRepository scmRepository) throws Exception {
FileUtils.deleteDirectory(workingCopy);
org.apache.commons.io.FileUtils.deleteDirectory(workingCopy);
workingCopy.mkdir();

CheckOutScmResult result =
Expand Down
2 changes: 1 addition & 1 deletion ...che/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

import java.io.File;

import org.apache.commons.io.FileUtils;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.FileUtils;
import org.junit.Before;
import org.junit.Test;

Expand Down
6 changes: 3 additions & 3 deletions ...st/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void testCommandRemoveWithFile() throws Exception {

assertCommandLine("git rm -- toto.xml", workingDirectory, cl);

FileUtils.deleteDirectory(workingDirectory);
org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory);
}

@Test
Expand All @@ -58,7 +58,7 @@ public void testCommandRemoveWithDirectory() throws Exception {

assertCommandLine("git rm -r -- toto", workingDirectory, cl);

FileUtils.deleteDirectory(workingDirectory);
org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory);
}

@Test
Expand All @@ -76,7 +76,7 @@ public void testCommandRemoveWithTwoDirectory() throws Exception {

assertCommandLine("git rm -r -- toto tata", workingDirectory, cl);

FileUtils.deleteDirectory(workingDirectory);
org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory);
}

private File createTempDirectory() throws IOException {
Expand Down
8 changes: 4 additions & 4 deletions ...scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private GitScmTestUtils() {}
public static void initRepo(File repository, File workingDirectory, File assertionDirectory) throws IOException {
initRepo("src/test/repository/", repository, workingDirectory);

FileUtils.deleteDirectory(assertionDirectory);
org.apache.commons.io.FileUtils.deleteDirectory(assertionDirectory);

Assert.assertTrue(assertionDirectory.mkdirs());
}
Expand All @@ -49,7 +49,7 @@ public static void initRepo(String source, File repository, File workingDirector
// Copy the repository to target
File src = PlexusJUnit4TestCase.getTestFile(source);

FileUtils.deleteDirectory(repository);
org.apache.commons.io.FileUtils.deleteDirectory(repository);

Assert.assertTrue(repository.mkdirs());

Expand All @@ -61,7 +61,7 @@ public static void initRepo(String source, File repository, File workingDirector
FileUtils.copyDirectoryStructure(dotGitDirectory, new File(repository, ".git"));
}

FileUtils.deleteDirectory(workingDirectory);
org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory);

Assert.assertTrue(workingDirectory.mkdirs());
}
Expand All @@ -78,7 +78,7 @@ public static void deleteAllDirectories(File startDirectory, String pattern) thr
File child = childs[i];
if (child.isDirectory()) {
if (child.getName().equals(pattern)) {
FileUtils.deleteDirectory(child);
org.apache.commons.io.FileUtils.deleteDirectory(child);
} else {
deleteAllDirectories(child, pattern);
}
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void testCommitNoVerify() throws Exception {
}

private CheckOutScmResult checkoutRepoInto(File workingCopy, ScmRepository scmRepository) throws Exception {
FileUtils.deleteDirectory(workingCopy);
org.apache.commons.io.FileUtils.deleteDirectory(workingCopy);
workingCopy.mkdir();

CheckOutScmResult result = getScmManager().checkOut(scmRepository, new ScmFileSet(workingCopy), null);
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

import java.io.File;

import org.apache.commons.io.FileUtils;
import org.apache.maven.scm.ScmRevision;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.Commandline;
import org.junit.Before;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import java.io.FileInputStream;
import java.io.InputStream;

import org.apache.commons.io.FileUtils;
import org.apache.maven.scm.ScmTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
Expand Down
2 changes: 1 addition & 1 deletion maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ public static void makeFile(File basedir, String fileName, String contents) thro
}

protected void deleteDirectory(File directory) throws IOException {
FileUtils.deleteDirectory(directory);
org.apache.commons.io.FileUtils.deleteDirectory(directory);
}

public static Date getDate(int year, int month, int day) {
Expand Down
Loading