test: fix and tailor tests also for new java versions

Signed-off-by: Zvi Grinberg <zgrinber@redhat.com>
RHEcosystemAppEng · Mar 5, 2024 · f346768 · f346768
1 parent 0ee53d3
commit f346768
Show file tree

Hide file tree

Showing 15 changed files with 2,037 additions and 52 deletions.
diff --git a/src/main/java/com/redhat/exhort/providers/JavaMavenProvider.java b/src/main/java/com/redhat/exhort/providers/JavaMavenProvider.java
@@ -36,6 +36,7 @@
 import com.github.packageurl.PackageURL;
 import com.redhat.exhort.Api;
 import com.redhat.exhort.Provider;
+import com.redhat.exhort.impl.ExhortApi;
 import com.redhat.exhort.logging.LoggersFactory;
 import com.redhat.exhort.sbom.Sbom;
 import com.redhat.exhort.sbom.SbomFactory;
@@ -469,7 +470,7 @@ private List<DependencyAggregator> getDependencies(final Path manifestPath) thro
   }
 
   private Map<String, String> getMvnExecEnvs() {
-    var javaHome = System.getProperty("JAVA_HOME");
+    var javaHome = ExhortApi.getStringValueEnvironment("JAVA_HOME","");
     if (javaHome != null && !javaHome.isBlank()) {
       return Collections.singletonMap("JAVA_HOME", javaHome);
     }