Update scripts and versions in httpclient tests

Author: dividedmind

agent/test/http_client/httpclient/build.gradle

@@ -32,14 +32,16 @@ dependencies {
 }
 
 application {
-  // mainClass = 'http_client.HttpClientTest'
-  mainClassName = project.hasProperty("mainClass") ? project.getProperty("mainClass") : "NULL"
+  if (properties.containsKey("mainClass")) {
+    mainClass = project.hasProperty("mainClass") ? project.getProperty("mainClass") : "NULL"
+  } else {
+    mainClassName = project.hasProperty("mainClass") ? project.getProperty("mainClass") : "NULL"
+  }
   applicationDefaultJvmArgs = [
     System.env.JAVA_OUTPUT_OPTIONS,
     "-javaagent:${appmapJar}",
     "-Djava.util.logging.config.file=${System.env.JUL_CONFIG}",
     //"-Dappmap.debug=true",
     //"-Dappmap.debug.file=../../build/log/httpclient-appmap.log"
   ]
-
 }

agent/test/http_client/setup_suite.bash

@@ -8,13 +8,6 @@ setup_suite() {
   export FIXTURE_DIR="build/fixtures/spring-petclinic"
   _shared_setup
   start_petclinic >&3
-
-  if is_java 17; then
-    SPRING_BOOT_VERSION="3.2.2"
-  else
-    SPRING_BOOT_VERSION="2.7.18"
-  fi
-  export SPRING_BOOT_VERSION
 }
 
 teardown_suite() {

agent/test/http_client/springboot/build.gradle

@@ -1,15 +1,29 @@
+buildscript {
+  ext {
+    SPRING_BOOT_VERSION = JavaVersion.current() >= JavaVersion.VERSION_17 ? '3.4.1' : '2.7.18'
+  }
+}
 
 plugins {
   id 'java'
   id 'org.springframework.boot' version "${SPRING_BOOT_VERSION}"
-  id 'io.spring.dependency-management' version '1.1.4'
-
+  id 'io.spring.dependency-management' version '1.1.7'
 }
 
 repositories {
   mavenCentral()
 }
 
+java {
+  if (SPRING_BOOT_VERSION.startsWith("2.")) {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  } else {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+  }
+}
+
 sourceSets {
   main {
     java {