From 933f90457dcb12e77d775f55f864ee8a5451ba28 Mon Sep 17 00:00:00 2001
From: Joel Rudsberg <joel.rudsberg@oracle.com>
Date: Wed, 17 Sep 2025 10:06:27 +0200
Subject: [PATCH] Bump SBOM test versions to 25

---
 .github/workflows/ci.yml                     |  2 +-
 __tests__/sbom.test.ts                       | 24 ++++++++++----------
 __tests__/sbom/main-test-app/pom.xml         |  4 ++--
 __tests__/sbom/main-test-app/verify-sbom.cmd |  2 +-
 __tests__/sbom/main-test-app/verify-sbom.sh  |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 333eaec..5b3b1f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -458,7 +458,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        java-version: ['26-ea', 'latest-ea']
+        java-version: ['25', 'latest-ea']
         distribution: ['graalvm']
         os: [macos-latest, windows-latest, ubuntu-latest, ubuntu-22.04-arm]
         components: ['']
diff --git a/__tests__/sbom.test.ts b/__tests__/sbom.test.ts
index 62a3df3..b450a8a 100644
--- a/__tests__/sbom.test.ts
+++ b/__tests__/sbom.test.ts
@@ -31,7 +31,7 @@ const request = jest.fn<any>().mockResolvedValue(undefined)
 describe('sbom feature', () => {
   let workspace: string
   let originalEnv: NodeJS.ProcessEnv
-  const javaVersion = '24.0.0'
+  const javaVersion = '25.0.0'
   const distribution = c.DISTRIBUTION_GRAALVM
 
   beforeEach(() => {
@@ -92,7 +92,7 @@ describe('sbom feature', () => {
     })
 
     it('should not throw an error when the java-version is supported', () => {
-      const supported_versions = ['24', '24-ea', '24.0.2', 'latest-ea']
+      const supported_versions = ['25', '26-ea', 'latest-ea']
       for (const version of supported_versions) {
         expect(() => setUpSBOMSupport(version, distribution)).not.toThrow()
       }
@@ -144,13 +144,13 @@ describe('sbom feature', () => {
           type: 'library',
           group: 'org.json',
           name: 'json',
-          version: '20241224',
-          purl: 'pkg:maven/org.json/json@20241224',
-          'bom-ref': 'pkg:maven/org.json/json@20241224',
+          version: '20250517',
+          purl: 'pkg:maven/org.json/json@20250517',
+          'bom-ref': 'pkg:maven/org.json/json@20250517',
           properties: [
             {
               name: 'syft:cpe23',
-              value: 'cpe:2.3:a:json:json:20241224:*:*:*:*:*:*:*'
+              value: 'cpe:2.3:a:json:json:20250517:*:*:*:*:*:*:*'
             }
           ]
         },
@@ -166,10 +166,10 @@ describe('sbom feature', () => {
       dependencies: [
         {
           ref: 'pkg:maven/com.oracle/main-test-app@1.0-SNAPSHOT',
-          dependsOn: ['pkg:maven/org.json/json@20241224']
+          dependsOn: ['pkg:maven/org.json/json@20250517']
         },
         {
-          ref: 'pkg:maven/org.json/json@20241224',
+          ref: 'pkg:maven/org.json/json@20250517',
           dependsOn: []
         }
       ]
@@ -184,9 +184,9 @@ describe('sbom feature', () => {
 
       expect(core.info).toHaveBeenCalledWith('Found SBOM: ' + join(workspace, 'test.sbom.json'))
       expect(core.info).toHaveBeenCalledWith('=== SBOM Content ===')
-      expect(core.info).toHaveBeenCalledWith('- pkg:maven/org.json/json@20241224')
+      expect(core.info).toHaveBeenCalledWith('- pkg:maven/org.json/json@20250517')
       expect(core.info).toHaveBeenCalledWith('- pkg:maven/com.oracle/main-test-app@1.0-SNAPSHOT')
-      expect(core.info).toHaveBeenCalledWith('   depends on: pkg:maven/org.json/json@20241224')
+      expect(core.info).toHaveBeenCalledWith('   depends on: pkg:maven/org.json/json@20250517')
       expect(core.warning).not.toHaveBeenCalled()
     })
 
@@ -253,12 +253,12 @@ describe('sbom feature', () => {
               name: 'test.sbom.json',
               resolved: expect.objectContaining({
                 json: expect.objectContaining({
-                  package_url: 'pkg:maven/org.json/json@20241224',
+                  package_url: 'pkg:maven/org.json/json@20250517',
                   dependencies: []
                 }),
                 'main-test-app': expect.objectContaining({
                   package_url: 'pkg:maven/com.oracle/main-test-app@1.0-SNAPSHOT',
-                  dependencies: ['pkg:maven/org.json/json@20241224']
+                  dependencies: ['pkg:maven/org.json/json@20250517']
                 })
               })
             })
diff --git a/__tests__/sbom/main-test-app/pom.xml b/__tests__/sbom/main-test-app/pom.xml
index ec9ae9f..ec58b09 100644
--- a/__tests__/sbom/main-test-app/pom.xml
+++ b/__tests__/sbom/main-test-app/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20241224</version>
+            <version>20250517</version>
         </dependency>
     </dependencies>
 
@@ -29,7 +29,7 @@
                     <plugin>
                         <groupId>org.graalvm.buildtools</groupId>
                         <artifactId>native-maven-plugin</artifactId>
-                        <version>0.10.3</version>
+                        <version>0.11.0</version>
                         <executions>
                             <execution>
                                 <goals>
diff --git a/__tests__/sbom/main-test-app/verify-sbom.cmd b/__tests__/sbom/main-test-app/verify-sbom.cmd
index de5cd0c..117ce62 100644
--- a/__tests__/sbom/main-test-app/verify-sbom.cmd
+++ b/__tests__/sbom/main-test-app/verify-sbom.cmd
@@ -2,7 +2,7 @@
 set "SCRIPT_DIR=%~dp0"
 
 for %%p in (
-    "\"pkg:maven/org.json/json@20241224\""
+    "\"pkg:maven/org.json/json@20250517\""
     "\"main-test-app\""
     "\"svm\""
     "\"nativeimage\""
diff --git a/__tests__/sbom/main-test-app/verify-sbom.sh b/__tests__/sbom/main-test-app/verify-sbom.sh
index c9c2f7d..700a5ef 100644
--- a/__tests__/sbom/main-test-app/verify-sbom.sh
+++ b/__tests__/sbom/main-test-app/verify-sbom.sh
@@ -2,7 +2,7 @@
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 required_patterns=(
-    '"pkg:maven/org.json/json@20241224"'
+    '"pkg:maven/org.json/json@20250517"'
     '"main-test-app"'
     '"svm"'
     '"nativeimage"'