Skip to content

Commit 3bf5a6c

Browse files
committed
backport 99fefec092f49cd759f93aa75e008cfa06d2a183
1 parent ab298c2 commit 3bf5a6c

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

make/autoconf/lib-tests.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
2828
################################################################################
2929

3030
# Minimum supported versions
31-
JTREG_MINIMUM_VERSION=7.3.1
31+
JTREG_MINIMUM_VERSION=7.4
3232
GTEST_MINIMUM_VERSION=1.14.0
3333

3434
###############################################################################

make/conf/github-actions.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# Versions and download locations for dependencies used by GitHub Actions (GHA)
2727

2828
GTEST_VERSION=1.14.0
29-
JTREG_VERSION=7.3.1+1
29+
JTREG_VERSION=7.4+1
3030

3131
LINUX_X64_BOOT_JDK_EXT=tar.gz
3232
LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz

make/conf/jib-profiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,9 +1185,9 @@ var getJibProfilesDependencies = function (input, common) {
11851185
jtreg: {
11861186
server: "jpg",
11871187
product: "jtreg",
1188-
version: "7.3.1",
1188+
version: "7.4",
11891189
build_number: "1",
1190-
file: "bundles/jtreg-7.3.1+1.zip",
1190+
file: "bundles/jtreg-7.4+1.zip",
11911191
environment_name: "JT_HOME",
11921192
environment_path: input.get("jtreg", "home_path") + "/bin",
11931193
configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

test/hotspot/jtreg/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ requires.properties= \
9494
jdk.containerized
9595

9696
# Minimum jtreg version
97-
requiredVersion=7.3.1+1
97+
requiredVersion=7.4+1
9898

9999
# Path to libraries in the topmost test directory. This is needed so @library
100100
# does not need ../../../ notation to reach them

test/jaxp/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ modules=java.xml
2323
groups=TEST.groups
2424

2525
# Minimum jtreg version
26-
requiredVersion=7.3.1+1
26+
requiredVersion=7.4+1
2727

2828
# Path to libraries in the topmost test directory. This is needed so @library
2929
# does not need ../../ notation to reach them

test/jdk/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ requires.properties= \
115115
jdk.foreign.linker
116116

117117
# Minimum jtreg version
118-
requiredVersion=7.3.1+1
118+
requiredVersion=7.4+1
119119

120120
# Path to libraries in the topmost test directory. This is needed so @library
121121
# does not need ../../ notation to reach them

test/langtools/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ keys=intermittent randomness needs-src needs-src-jdk_javadoc
1515
groups=TEST.groups
1616

1717
# Minimum jtreg version
18-
requiredVersion=7.3.1+1
18+
requiredVersion=7.4+1
1919

2020
# Use new module options
2121
useNewOptions=true

test/lib-test/TEST.ROOT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
2929
keys=randomness
3030

3131
# Minimum jtreg version
32-
requiredVersion=7.3.1+1
32+
requiredVersion=7.4+1
3333

3434
# Path to libraries in the topmost test directory. This is needed so @library
3535
# does not need ../../ notation to reach them

0 commit comments

Comments
 (0)