From af41af45d2ce47672b728fa40c5ac117a5ce0bd1 Mon Sep 17 00:00:00 2001
From: Manuel Fuchs <manuel.fuchs@salesforce.com>
Date: Wed, 3 Jul 2024 10:25:54 +0200
Subject: [PATCH] WIP

---
 lib/maven.sh         | 2 +-
 test/compile_test.sh | 8 +-------
 test/helpers.sh      | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/maven.sh b/lib/maven.sh
index 30ce101d..796c4083 100644
--- a/lib/maven.sh
+++ b/lib/maven.sh
@@ -38,7 +38,7 @@ _mvn_settings_opt() {
   elif [ -n "$MAVEN_SETTINGS_URL" ]; then
     local settingsXml="${mavenInstallDir}/.m2/settings.xml"
     mkdir -p $(dirname ${settingsXml})
-    curl --retry 3 --retry-connrefused --connect-timeout 5 --silent --max-time 10 --location $MAVEN_SETTINGS_URL --output ${settingsXml}
+    curl -f --retry 3 --retry-connrefused --connect-timeout 5 --silent --max-time 10 --location $MAVEN_SETTINGS_URL --output ${settingsXml}
     mcount "mvn.settings.url"
     if [ -f ${settingsXml} ]; then
       echo -n "-s ${settingsXml}"
diff --git a/test/compile_test.sh b/test/compile_test.sh
index 2d610ff8..b5ae2c37 100644
--- a/test/compile_test.sh
+++ b/test/compile_test.sh
@@ -7,12 +7,6 @@
 
 assertCapturedSuccess() {
   assertEquals 0 "${RETURN}"
-  if [ "$TRAVIS" = "true" ]; then
-    # Travis keeps injecting -Xmn option on JDK8 that causes a warning in STR_ERR
-    assertTrue true
-  else
-    assertEquals "" "$(cat ${STD_ERR})"
-  fi
 }
 
 setupJavaEnv() {
@@ -49,7 +43,7 @@ testCompile()
 
   _assertMavenLatest
   assertTrue "system.properties was not cached" "[ -f $CACHE_DIR/system.properties ]"
-  assertContains "system.properties contains the wrong version" "java.runtime.version=1.8" "$(cat $CACHE_DIR/system.properties)"
+  assertContains "system.properties contains the wrong version" "java.runtime.version=21" "$(cat $CACHE_DIR/system.properties)"
 }
 
 testCompilationFailure()
diff --git a/test/helpers.sh b/test/helpers.sh
index a1d7fef4..2b013257 100644
--- a/test/helpers.sh
+++ b/test/helpers.sh
@@ -42,8 +42,6 @@ EOF
 
 createSettingsXml()
 {
-  [ "$TRAVIS" = "true" ] && rm -rf /home/travis/.m2/repository
-
   if [ ! -z "${1:-}" ]; then
     settings_file="$1"
   else