Merge pull request #2076 from vibe13/update-builder-images

Update to the latest jvm-build-service-builder-images
redhat-appstudio · Sep 10, 2024 · 4028afa · 4028afa
2 parents 72e9c39 + 5425e18
commit 4028afa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/deploy/operator/config/kustomization.yaml b/deploy/operator/config/kustomization.yaml
@@ -11,4 +11,4 @@ labels:
 
 #note that when updating the ref here you must also update system-config.yaml
 patches:
-- path: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service-builder-images/026b26ba92b1d56ffcd172e7785e679437fcff70/image-config.yaml
+- path: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service-builder-images/67236e7041a57cd8e31a6f890b0155bc0a1c1700/image-config.yaml
diff --git a/deploy/operator/config/system-config.yaml b/deploy/operator/config/system-config.yaml
@@ -7,9 +7,9 @@ spec:
   builders:
     #note that when updating the ref here you must also update kustomization.yaml
     ubi8:
-      image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:026b26ba92b1d56ffcd172e7785e679437fcff70
+      image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:67236e7041a57cd8e31a6f890b0155bc0a1c1700
       priority: 2000
     ubi7:
-      image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi7:026b26ba92b1d56ffcd172e7785e679437fcff70
+      image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi7:67236e7041a57cd8e31a6f890b0155bc0a1c1700
       priority: 1000
 
diff --git a/...quest-processor/src/main/java/com/redhat/hacbs/container/analyser/build/ant/AntUtils.java b/...quest-processor/src/main/java/com/redhat/hacbs/container/analyser/build/ant/AntUtils.java
@@ -22,7 +22,7 @@
 public final class AntUtils {
     public static final String ANT_VERSION_JAVA5 = "1.9.16";
 
-    public static final String ANT_VERSION_JAVA8 = "1.10.13";
+    public static final String ANT_VERSION_JAVA8 = "1.10.15";
 
     public static final String BUILD_XML = DEFAULT_BUILD_FILENAME;
 

diff --git a/...r/src/test/java/com/redhat/hacbs/container/analyser/build/LookupBuildInfoCommandTest.java b/...r/src/test/java/com/redhat/hacbs/container/analyser/build/LookupBuildInfoCommandTest.java
@@ -34,7 +34,7 @@
 @QuarkusTest
 @QuarkusTestResource(value = LogCollectingTestResource.class, restrictToAnnotatedClass = true, initArgs = @ResourceArg(name = LogCollectingTestResource.LEVEL, value = "FINE"))
 class LookupBuildInfoCommandTest {
-    private static final String TOOL_VERSIONS = "sbt:1.8.0,jdk:7;8;11;17;21,maven:3.8.8;3.9.5,ant:1.9.16;1.10.13,gradle:8.4;8.3;8.0.2;7.4.2;7.6.3;7.5.1;6.9.2;5.6.4;4.10.3";
+    private static final String TOOL_VERSIONS = "sbt:1.8.0,jdk:7;8;11;17;21,maven:3.8.8;3.9.5,ant:1.9.16;1.10.15,gradle:8.4;8.3;8.0.2;7.4.2;7.6.3;7.5.1;6.9.2;5.6.4;4.10.3";
 
     private static final String CACHE_URL = "https://repo1.maven.org/maven2";