Skip to content

Commit 933f904

Browse files
rudsbergfniephaus
authored andcommitted
Bump SBOM test versions to 25
1 parent 0246c29 commit 933f904

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ jobs:
458458
contents: write
459459
strategy:
460460
matrix:
461-
java-version: ['26-ea', 'latest-ea']
461+
java-version: ['25', 'latest-ea']
462462
distribution: ['graalvm']
463463
os: [macos-latest, windows-latest, ubuntu-latest, ubuntu-22.04-arm]
464464
components: ['']

__tests__/sbom.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const request = jest.fn<any>().mockResolvedValue(undefined)
3131
describe('sbom feature', () => {
3232
let workspace: string
3333
let originalEnv: NodeJS.ProcessEnv
34-
const javaVersion = '24.0.0'
34+
const javaVersion = '25.0.0'
3535
const distribution = c.DISTRIBUTION_GRAALVM
3636

3737
beforeEach(() => {
@@ -92,7 +92,7 @@ describe('sbom feature', () => {
9292
})
9393

9494
it('should not throw an error when the java-version is supported', () => {
95-
const supported_versions = ['24', '24-ea', '24.0.2', 'latest-ea']
95+
const supported_versions = ['25', '26-ea', 'latest-ea']
9696
for (const version of supported_versions) {
9797
expect(() => setUpSBOMSupport(version, distribution)).not.toThrow()
9898
}
@@ -144,13 +144,13 @@ describe('sbom feature', () => {
144144
type: 'library',
145145
group: 'org.json',
146146
name: 'json',
147-
version: '20241224',
148-
purl: 'pkg:maven/org.json/json@20241224',
149-
'bom-ref': 'pkg:maven/org.json/json@20241224',
147+
version: '20250517',
148+
purl: 'pkg:maven/org.json/json@20250517',
149+
'bom-ref': 'pkg:maven/org.json/json@20250517',
150150
properties: [
151151
{
152152
name: 'syft:cpe23',
153-
value: 'cpe:2.3:a:json:json:20241224:*:*:*:*:*:*:*'
153+
value: 'cpe:2.3:a:json:json:20250517:*:*:*:*:*:*:*'
154154
}
155155
]
156156
},
@@ -166,10 +166,10 @@ describe('sbom feature', () => {
166166
dependencies: [
167167
{
168168
ref: 'pkg:maven/com.oracle/[email protected]',
169-
dependsOn: ['pkg:maven/org.json/json@20241224']
169+
dependsOn: ['pkg:maven/org.json/json@20250517']
170170
},
171171
{
172-
ref: 'pkg:maven/org.json/json@20241224',
172+
ref: 'pkg:maven/org.json/json@20250517',
173173
dependsOn: []
174174
}
175175
]
@@ -184,9 +184,9 @@ describe('sbom feature', () => {
184184

185185
expect(core.info).toHaveBeenCalledWith('Found SBOM: ' + join(workspace, 'test.sbom.json'))
186186
expect(core.info).toHaveBeenCalledWith('=== SBOM Content ===')
187-
expect(core.info).toHaveBeenCalledWith('- pkg:maven/org.json/json@20241224')
187+
expect(core.info).toHaveBeenCalledWith('- pkg:maven/org.json/json@20250517')
188188
expect(core.info).toHaveBeenCalledWith('- pkg:maven/com.oracle/[email protected]')
189-
expect(core.info).toHaveBeenCalledWith(' depends on: pkg:maven/org.json/json@20241224')
189+
expect(core.info).toHaveBeenCalledWith(' depends on: pkg:maven/org.json/json@20250517')
190190
expect(core.warning).not.toHaveBeenCalled()
191191
})
192192

@@ -253,12 +253,12 @@ describe('sbom feature', () => {
253253
name: 'test.sbom.json',
254254
resolved: expect.objectContaining({
255255
json: expect.objectContaining({
256-
package_url: 'pkg:maven/org.json/json@20241224',
256+
package_url: 'pkg:maven/org.json/json@20250517',
257257
dependencies: []
258258
}),
259259
'main-test-app': expect.objectContaining({
260260
package_url: 'pkg:maven/com.oracle/[email protected]',
261-
dependencies: ['pkg:maven/org.json/json@20241224']
261+
dependencies: ['pkg:maven/org.json/json@20250517']
262262
})
263263
})
264264
})

__tests__/sbom/main-test-app/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.json</groupId>
1919
<artifactId>json</artifactId>
20-
<version>20241224</version>
20+
<version>20250517</version>
2121
</dependency>
2222
</dependencies>
2323

@@ -29,7 +29,7 @@
2929
<plugin>
3030
<groupId>org.graalvm.buildtools</groupId>
3131
<artifactId>native-maven-plugin</artifactId>
32-
<version>0.10.3</version>
32+
<version>0.11.0</version>
3333
<executions>
3434
<execution>
3535
<goals>

__tests__/sbom/main-test-app/verify-sbom.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set "SCRIPT_DIR=%~dp0"
33

44
for %%p in (
5-
"\"pkg:maven/org.json/json@20241224\""
5+
"\"pkg:maven/org.json/json@20250517\""
66
"\"main-test-app\""
77
"\"svm\""
88
"\"nativeimage\""

__tests__/sbom/main-test-app/verify-sbom.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33

44
required_patterns=(
5-
'"pkg:maven/org.json/json@20241224"'
5+
'"pkg:maven/org.json/json@20250517"'
66
'"main-test-app"'
77
'"svm"'
88
'"nativeimage"'

0 commit comments

Comments
 (0)