From 2fc70ac98528bdb9bb9b65a0906931c255225674 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Mon, 13 Nov 2023 23:54:44 +0100
Subject: [PATCH] More upgrades to invoker (#282)

Seems the ITs were not aligned (invoke:run vs invoker:....) and ruby IT did not run since ages... Fixed all.
This does not render latest releases wrong, there is no released code change, just the build is fixed.
---
 polyglot-ruby/src/it/ruby_execute/verify.bsh                  | 4 ++--
 polyglot-ruby/src/it/use_jruby_installation/verify.bsh        | 2 +-
 polyglot-scala/pom.xml                                        | 4 +---
 .../{validate.groovy => verify.groovy}                        | 0
 pom.xml                                                       | 2 ++
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename polyglot-scala/src/it/java-and-scala-project-MavenModel/{validate.groovy => verify.groovy} (100%)

diff --git a/polyglot-ruby/src/it/ruby_execute/verify.bsh b/polyglot-ruby/src/it/ruby_execute/verify.bsh
index 72c14383..ce483358 100644
--- a/polyglot-ruby/src/it/ruby_execute/verify.bsh
+++ b/polyglot-ruby/src/it/ruby_execute/verify.bsh
@@ -12,12 +12,12 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "io.takari.polyglot:execute-ruby:1:jar";
+expected = "io.takari.polyglot.it:execute-ruby:1:jar";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "#<Tesla::Parser";
+expected = "#<Maven::Polyglot::Parser";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
diff --git a/polyglot-ruby/src/it/use_jruby_installation/verify.bsh b/polyglot-ruby/src/it/use_jruby_installation/verify.bsh
index e51be5ea..01c70593 100644
--- a/polyglot-ruby/src/it/use_jruby_installation/verify.bsh
+++ b/polyglot-ruby/src/it/use_jruby_installation/verify.bsh
@@ -3,7 +3,7 @@ import org.codehaus.plexus.util.FileUtils;
 
 
 String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "jruby version 1.7.4";
+String expected = "jruby version 9.4.5.0";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
diff --git a/polyglot-scala/pom.xml b/polyglot-scala/pom.xml
index ee5882ae..c5baa127 100644
--- a/polyglot-scala/pom.xml
+++ b/polyglot-scala/pom.xml
@@ -140,8 +140,7 @@
             <id>integration-test</id>
             <goals>
               <goal>install</goal>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
+              <goal>run</goal>
             </goals>
             <configuration>
               <settingsFile>${basedir}/src/it/settings.xml</settingsFile>
@@ -150,7 +149,6 @@
               <debug>false</debug>
               <streamLogs>true</streamLogs>
               <goals><goal>verify</goal></goals>
-              <postBuildHookScript>validate.groovy</postBuildHookScript>
             </configuration>
           </execution>
         </executions>
diff --git a/polyglot-scala/src/it/java-and-scala-project-MavenModel/validate.groovy b/polyglot-scala/src/it/java-and-scala-project-MavenModel/verify.groovy
similarity index 100%
rename from polyglot-scala/src/it/java-and-scala-project-MavenModel/validate.groovy
rename to polyglot-scala/src/it/java-and-scala-project-MavenModel/verify.groovy
diff --git a/pom.xml b/pom.xml
index e180070d..3f9a41b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,6 +226,8 @@
           <version>3.6.0</version>
           <configuration>
             <scope>test</scope>
+            <postBuildHookScript>verify</postBuildHookScript>
+            <streamLogsOnFailures>true</streamLogsOnFailures>
           </configuration>
         </plugin>
         <plugin>