You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/12/28 21:06:09 UTC
svn commit: r1776328 - in
/maven/plugins/trunk/maven-dependency-plugin/src/it/projects:
copy-from-remote-repository/verify.groovy
unpack-from-remote-repository/verify.groovy
Author: schulte
Date: Wed Dec 28 21:06:08 2016
New Revision: 1776328
URL: http://svn.apache.org/viewvc?rev=1776328&view=rev
Log:
[MNG-5457] Show repository id when downloading or uploading from/to a remote repository
o Updated to make groovy scripts work with Windows paths.
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=1776328&r1=1776327&r2=1776328&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 Wed Dec 28 21:06:08 2016
@@ -21,12 +21,14 @@ import java.io.*;
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
-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"
+String expectedDownloadingPattern = "Downloading.*: file:///" + basedir.replaceAll( "\\", "/")
+ + "/repo/org/apache/maven/its/dependency/fake-remote-copy/1\\.0/fake-remote-copy-1\\.0\\.jar"
+String expectedDownloadedPattern = "Downloaded.*: file:///" + basedir.replaceAll( "\\", "/")
+ + "/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()
-return true;
\ No newline at end of file
+return true;
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=1776328&r1=1776327&r2=1776328&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 Wed Dec 28 21:06:08 2016
@@ -21,12 +21,14 @@ import java.io.*;
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
-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"
+String expectedDownloadingPattern = "Downloading.*: file:///" + basedir.replaceAll( "\\", "/")
+ + "/repo/org/apache/maven/its/dependency/fake-remote-unpack/1\\.0/fake-remote-unpack-1\\.0\\.jar"
+String expectedDownloadedPattern = "Downloaded.*: file:///" + basedir.replaceAll( "\\", "/")
+ + "/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()
-return true;
\ No newline at end of file
+return true;