#ver 0.3.0

Author: Kindratte

build.gradle

@@ -7,6 +7,13 @@ plugins {
 	id 'idea'
 }
 
+configurations.compile {
+	resolutionStrategy {
+		cacheChangingModulesFor 0, 'seconds'
+		cacheDynamicVersionsFor 0, 'seconds'
+	}
+}
+
 repositories {
 	maven { url "https://jitpack.io" }
 	mavenCentral()
@@ -23,7 +30,9 @@ dependencies {
 	def s = '[ \t]*', w = '[^:#@\\s]+?'
 	(file('mdeps').text =~ /(?m)^$s($w):($w):($w)?(:$w)?(@$w)?$s(?:#$s($w)?$s)?$/).each {
 		match, group, name, version, classifier, ext, configuration ->
-			add(configuration ?: 'compile', "$group:$name:${version?:'latest.integration'}${classifier?:''}${ext?:''}")
+			add(configuration ?: 'compile', "$group:$name:${version?:'latest.integration'}${classifier?:''}${ext?:''}", {
+				changing = true
+			})
 	}
 
 	compileOnly 'org.projectlombok:lombok:1.16.18'

src/main/java/org/scm4j/deployer/installers/Copy.java

@@ -26,9 +26,9 @@ public DeploymentResult deploy() {
         try {
             for (File file : filesForDeploy) {
                 if (file.isDirectory())
-                    FileUtils.copyDirectory(file, outputFile);
+                    FileUtils.copyDirectoryToDirectory(file, outputFile);
                 else
-                    FileUtils.copyFile(file, outputFile);
+                    FileUtils.copyFileToDirectory(file, outputFile);
             }
             return OK;
         } catch (IOException e) {

src/test/java/org/scm4j/deployer/installers/CopyTest.java

@@ -18,7 +18,7 @@
 public class CopyTest {
 
     private static final File TEST_FOLDER = new File(System.getProperty("java.io.tmpdir"), "test-copy");
-    private static final File FOLDER_FOR_COPY = new File(TEST_FOLDER, "file");
+    private static final File FOLDER_FOR_COPY = new File(TEST_FOLDER, "files");
     private static final File FILE_FOR_COPY = new File(TEST_FOLDER, "file.txt");
     private static final File OUTPUT_FOLDER = new File(TEST_FOLDER, "output");
     private DeploymentContext depCtx;
@@ -56,9 +56,16 @@ public void testDeployFolder() throws Exception {
         Copy copy = new Copy();
         copy.init(depCtx);
         copy.deploy();
-        for (int i = 0; i < 5; i++)
-            assertTrue(FileUtils.contentEquals(new File(FOLDER_FOR_COPY, String.valueOf(i) + ".txt"),
-                    new File(OUTPUT_FOLDER, String.valueOf(i) + ".txt")));
+        File newFile;
+        for (int i = 0; i < 5; i++) {
+            newFile = new File(OUTPUT_FOLDER, FOLDER_FOR_COPY.getName());
+            newFile = new File(newFile, String.valueOf(i));
+            newFile = new File(newFile, String.valueOf(i) + ".txt");
+            File ethalon = new File(FOLDER_FOR_COPY, String.valueOf(i));
+            assertTrue(newFile.exists());
+            assertTrue(FileUtils.contentEquals(new File(ethalon, String.valueOf(i) + ".txt"),
+                    newFile));
+        }
     }
 
     @Test
@@ -81,6 +88,8 @@ public void testFail() throws Exception {
         }
         DeploymentResult res = copy.deploy();
         assertEquals(DeploymentResult.NEED_REBOOT, res);
+
+        setUp();
     }
 
     @Test