Bump datadog/dd-trace-java-docker-build image (DataDog#3631)

* Bump to datadog/dd-trace-java-docker-build:luhenry_upgrade-java image

* Use common mvnw command

* Ensure tests work when it's Oracle OpenJDK 8

* Fix spotless

* Fix missing mvnw

* Print gradlew info log level

* Revert "Print gradlew info log level"

This reverts commit 2b5ed42.

* Info level logs for IBM8 smoke tests

* fixup! Info level logs for IBM8 smoke tests

* Following merge of Docker build file

* Remove info log level for gradle

* fixup! Following merge of Docker build file

Author: luhenry

.circleci/config.yml

@@ -425,7 +425,7 @@ jobs:
       - run:
           name: Test Published Dependencies
           command: |
-            mvn_local_repo=$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout)
+            mvn_local_repo=$(./mvnw help:evaluate -Dexpression=settings.localRepository -q -DforceStdout)
             rm -rf "${mvn_local_repo}/com/datadoghq"
             export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1750M -Xms256M -XX:ErrorFile=/tmp/hs_err_pid%p.log'"
             ./gradlew publishToMavenLocal << pipeline.parameters.gradle_flags >> --max-workers=3

dd-smoke-tests/springboot-openliberty/application/.mvn/wrapper/MavenWrapperDownloader.java renamed to .mvn/wrapper/MavenWrapperDownloader.java

@@ -37,14 +37,15 @@ public void testCreateControllerJava8() {
             + ", runtimeName="
             + javaRuntimeName
             + "; it requires ";
-    if ("Azul Systems, Inc.".equals(javaVendor)) {
+    if (javaVendor.equals("Azul Systems, Inc.")) {
       expected += "Zulu Java 8 (1.8.0_212+).";
-    } else if ("Java(TM) SE Runtime Environment".equals(javaRuntimeName)
-        && "Oracle Corporation".equals(javaVendor)
-        && javaVersion.startsWith("1.8")) {
-      // condition for OracleJRE8 (with proprietary JFR inside)
+    } else if (javaVendor.equals("Oracle Corporation") && !javaRuntimeName.startsWith("OpenJDK")) {
+      // condition for Oracle JDK 8 (with proprietary JFR inside)
       expected += "Oracle JRE/JDK 8u40+";
-    } else if ("OpenJDK Runtime Environment".equals(javaRuntimeName)) {
+    } else if (javaVendor.equals("Oracle Corporation") && javaRuntimeName.startsWith("OpenJDK")) {
+      // condition for Oracle OpenJDK 8 (with open JFR inside)
+      expected += "1.8.0_272+ OpenJDK builds (upstream)";
+    } else if (javaRuntimeName.startsWith("OpenJDK")) {
       expected +=
           "1.8.0_272+ OpenJDK builds from the following vendors: AdoptOpenJDK, Eclipse Temurin, Amazon Corretto, Azul Zulu, BellSoft Liberica.";
     } else {

dd-smoke-tests/springboot-openliberty/application/.mvn/wrapper/maven-wrapper.jar renamed to .mvn/wrapper/maven-wrapper.jar

@@ -108,7 +108,7 @@ tasks.register('extractMuleServices', Sync) {
 // build the mule application via maven
 tasks.register('mvnPackage', Exec) {
   workingDir "$appDir"
-  commandLine 'mvn', "-Ddatadog.builddir=$buildDir", "-Ddatadog.name=mule-test-application", "-Ddatadog.version=$version", 'package'
+  commandLine "$rootDir/mvnw", "-Ddatadog.builddir=$buildDir", "-Ddatadog.name=mule-test-application", "-Ddatadog.version=$version", 'package'
   outputs.dir("$buildDir/target")
   inputs.dir("$appDir/src")
   inputs.file("$appDir/pom.xml")

dd-smoke-tests/springboot-openliberty/application/.mvn/wrapper/maven-wrapper.properties renamed to .mvn/wrapper/maven-wrapper.properties

@@ -15,7 +15,7 @@ def jarName = "demo-open-liberty-app.jar"
 // compile the Open liberty spring boot server
 tasks.register('mvnStage', Exec) {
   workingDir "$appDir"
-  commandLine './mvnw', 'package'
+  commandLine "$rootDir/mvnw", 'package'
 }
 
 tasks.named("compileTestGroovy").configure {