Previous fix did not work, instead move the other galah-vendor JDK in…

…stalling test second-to-last so it won't interfere with anything else.
causalnet · May 11, 2024 · 998cf55 · 998cf55
1 parent 19f66bc
commit 998cf55
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -236,9 +236,6 @@
  <settingsFile>src/it/settings.xml</settingsFile>
  <localRepositoryPath>${it.local.repo}</localRepositoryPath>
  <postBuildHookScript>verify</postBuildHookScript>
- <setupIncludes>
- <setupInclude>setup-*</setupInclude>
- </setupIncludes>
  <pomIncludes>
  <pomInclude>*</pomInclude>
  </pomIncludes>

diff --git a/src/it/maven-repo-jdk/invoker.properties b/src/it/maven-repo-jdk/invoker.properties
@@ -35,4 +35,7 @@ invoker.goals.19=install:install-file -Dclassifier=macos-aarch64 -Dfile=src/jdka
 #Install JDK from archive in local repo
 invoker.goals.20=clean verify
 
+#Run second last - the galah vendor JDK, if left there, can interfere with other tests looking for plain JDK 17
+invoker.ordinal=-50
+
 #The verify script will check that the fake JDK was actually grabbed from the local repo
diff --git a/src/it/setup-clean-galah-jdks/invoker.properties b/src/it/setup-clean-galah-jdks/invoker.properties