Author: schulte
Date: Tue Dec 27 22:31:13 2016
New Revision: 1776210
URL: http://svn.apache.org/viewvc?rev=1776210&view=rev
Log:
[MNG-5457] Show repository id when downloading or uploading from/to a remote
repository
o Updated to account for recent log messages in 3.4+.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy?rev=1776210&r1=1776209&r2=1776210&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
Tue Dec 27 22:31:13 2016
@@ -21,8 +21,10 @@ import java.io.*;
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
-assert buildLog.text.contains( "Downloading: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar"
)
-assert buildLog.text.contains( "Downloaded: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar"
)
+String expectedDownloadingPattern = "Downloading.*: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1\\.0/fake-remote-copy-1\\.0\\.jar"
+String expectedDownloadedPattern = "Downloaded.*: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1\\.0/fake-remote-copy-1\\.0\\.jar"
+assert buildLog.text =~ expectedDownloadingPattern}
+assert buildLog.text =~ expectedDownloadedPattern}
File copied = new File( basedir, 'target/dependency/fake-remote-copy-1.0.jar' )
assert copied.exists()
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy?rev=1776210&r1=1776209&r2=1776210&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
Tue Dec 27 22:31:13 2016
@@ -21,8 +21,10 @@ import java.io.*;
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
-assert buildLog.text.contains( "Downloading: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar"
)
-assert buildLog.text.contains( "Downloaded: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar"
)
+String expectedDownloadingPattern = "Downloading.*: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1\\.0/fake-remote-unpack-1\\.0\\.jar"
+String expectedDownloadedPattern = "Downloaded.*: file:///" + basedir +
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1\\.0/fake-remote-unpack-1\\.0\\.jar"
+assert buildLog.text =~ expectedDownloadingPattern
+assert buildLog.text =~ expectedDownloadedPattern
File unpacked = new File( basedir, 'target/dependency/META-INF/MANIFEST.MF' )
assert unpacked.exists()
