You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/02/24 11:16:16 UTC
[maven-javadoc-plugin] branch MJAVADOC-338 updated: [MJAVADOC-338]
Adjust verify script based on output maven version
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-338
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/MJAVADOC-338 by this push:
new 37ee2c9 [MJAVADOC-338] Adjust verify script based on output maven version
37ee2c9 is described below
commit 37ee2c9d12b24ff0046e805f6055d132cc2bfac6
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Feb 24 12:16:08 2019 +0100
[MJAVADOC-338] Adjust verify script based on output maven version
---
src/it/projects/MJAVADOC-338_downloadSources/verify.groovy | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/it/projects/MJAVADOC-338_downloadSources/verify.groovy b/src/it/projects/MJAVADOC-338_downloadSources/verify.groovy
index 2e540ae..fb60377 100644
--- a/src/it/projects/MJAVADOC-338_downloadSources/verify.groovy
+++ b/src/it/projects/MJAVADOC-338_downloadSources/verify.groovy
@@ -19,8 +19,18 @@
// NOOO never from central
def buildLog = new File(basedir,'build.log')
-assert 1 == buildLog.readLines().count{it ==~ /\[INFO\] Downloading from mrm-maven-plugin\: .+\/mjavadoc338-direct-1\.0-sources\.jar/}
-assert 1 == buildLog.readLines().count{it ==~ /\[INFO\] Downloading from mrm-maven-plugin\: .+\/mjavadoc338-direct-1\.0-javadoc-resources\.jar/}
+
+if ( mavenVersion ==~ /3\.[0-3]\..*/ )
+{
+ assert 1 == buildLog.readLines().count{it ==~ /\[INFO\] Downloading\: .+\/mjavadoc338-direct-1\.0-sources\.jar/}
+ assert 1 == buildLog.readLines().count{it ==~ /\[INFO\] Downloading\: .+\/mjavadoc338-direct-1\.0-javadoc-resources\.jar/}
+}
+else
+{
+ assert 1 == buildLog.readLines().count{it ==~ /\[INFO\] Downloading from mrm-maven-plugin\: .+\/mjavadoc338-direct-1\.0-sources\.jar/}
+ assert 1 == buildLog.readLines().count{it ==~ /\[INFO\] Downloading from mrm-maven-plugin\: .+\/mjavadoc338-direct-1\.0-javadoc-resources\.jar/}
+}
+
assert !buildLog.readLines().any{it ==~ /\[INFO\] Downloading from .+\/mjavadoc338-transitive-1\.0-sources\.jar/}
assert !buildLog.readLines().any{it ==~ /\[INFO\] Downloading from .+\/mjavadoc338-transitive-1\.0-javadoc-resources\.jar/}