From 0641dffd0f1fc8250195ff58a949026c671681b1 Mon Sep 17 00:00:00 2001 From: Andrzej Jarmoniuk Date: Wed, 20 Sep 2023 19:54:34 +0200 Subject: [PATCH] Resolves #1009: Fixing a broken test scenario --- .../invoker.properties | 3 +- .../it-display-plugin-updates-006/verify.bsh | 31 ------------------- .../verify.groovy | 13 ++++++++ 3 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.bsh create mode 100644 versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.groovy diff --git a/versions-maven-plugin/src/it/it-display-plugin-updates-006/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-006/invoker.properties index 87af2678f3..9e4e2c08f1 100644 --- a/versions-maven-plugin/src/it/it-display-plugin-updates-006/invoker.properties +++ b/versions-maven-plugin/src/it/it-display-plugin-updates-006/invoker.properties @@ -1 +1,2 @@ -invoker.goals=versions:display-plugin-updates +invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:display-plugin-updates +invoker.mavenOpts = -Dversions.outputFile=./output.txt -DoutputEncoding=UTF-8 diff --git a/versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.bsh deleted file mode 100644 index 8e1e8966e6..0000000000 --- a/versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.bsh +++ /dev/null @@ -1,31 +0,0 @@ -import java.io.*; -import org.codehaus.plexus.util.FileUtils; -import java.util.regex.*; - -try -{ - File file = new File( basedir, "build.log" ); - String buf = FileUtils.fileRead( file ); - Pattern p = Pattern.compile( "\\QThe following plugin updates are available\\E" ); - Matcher m = p.matcher( buf.toString() ); - if ( !m.find() ) - { - System.out.println( "cannot find The following plugin updates are available" ); - return false; - } - - p = Pattern.compile( "maven-deploy-plugin \\.+ 2\\.3 ->" ); - m = p.matcher( buf.toString() ); - if ( !m.find() ) - { - System.out.println( "cannot find update of deploy plugin"); - return false; - } -} -catch( Throwable t ) -{ - t.printStackTrace(); - return false; -} - -return true; diff --git a/versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.groovy b/versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.groovy new file mode 100644 index 0000000000..5cd934d499 --- /dev/null +++ b/versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.groovy @@ -0,0 +1,13 @@ +// because no minimum Maven version is not specified for the project, multiple +// possible updates for maven-deploy-plugin should be listed +// +// previously, the minimum Maven version for versions-maven-plugin was assumed due to #996 +// which caused the plugin to only output the updates for the minimum version for versions-maven-plugin + +def output = new File(basedir, "output.txt").text +assert output.contains('All plugins with a version specified are using the latest versions.') +assert output =~ /\Qmaven-deploy-plugin\E\s*\.*\s*\Q2.3 -> 2.4\E/ +assert output =~ /\Qmaven-deploy-plugin\E\s*\.*\s*\Q2.3 -> 2.8.1\E/ +assert output =~ /\Qmaven-deploy-plugin\E\s*\.*\s*\Q2.3 -> 2.8.2\E/ +assert output =~ /\Qmaven-deploy-plugin\E\s*\.*\s*\Q2.3 -> 3.0.0-M2\E/ +assert output =~ /\Qmaven-deploy-plugin\E\s*\.*\s*\Q2.3 -> 3.1.1\E/