From 6e54e828655d17afb0a71534af1395a9e8ac6998 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 5 Sep 2023 15:27:41 +0000
Subject: [PATCH] 8314495: Update to use jtreg 7.3.1

Reviewed-by: phh
Backport-of: c50315de8f13d316a7de08be53716cd88fa801c4
---
 make/autoconf/lib-tests.m4    | 2 +-
 make/conf/github-actions.conf | 2 +-
 make/conf/jib-profiles.js     | 4 ++--
 test/hotspot/jtreg/TEST.ROOT  | 2 +-
 test/jaxp/TEST.ROOT           | 2 +-
 test/jdk/TEST.ROOT            | 2 +-
 test/langtools/TEST.ROOT      | 2 +-
 test/lib-test/TEST.ROOT       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4
index 3db1737eb13..e2da5152741 100644
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -28,7 +28,7 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=7.3
+JTREG_MINIMUM_VERSION=7.3.1
 GTEST_MINIMUM_VERSION=1.13.0
 
 ###############################################################################
diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
index 2dfc9b53489..4370494c9b6 100644
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -26,7 +26,7 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.13.0
-JTREG_VERSION=7.3+1
+JTREG_VERSION=7.3.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index a300bfa4308..d2a97c555b0 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1188,9 +1188,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "7.3",
+            version: "7.3.1",
             build_number: "1",
-            file: "bundles/jtreg-7.3+1.zip",
+            file: "bundles/jtreg-7.3.1+1.zip",
             environment_name: "JT_HOME",
             environment_path: input.get("jtreg", "home_path") + "/bin",
             configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index 4b52e7e2499..a8ccd8f7298 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -85,7 +85,7 @@ requires.properties= \
     jdk.containerized
 
 # Minimum jtreg version
-requiredVersion=7.3+1
+requiredVersion=7.3.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../../ notation to reach them
diff --git a/test/jaxp/TEST.ROOT b/test/jaxp/TEST.ROOT
index f4f737b3da4..a44ad3a7c01 100644
--- a/test/jaxp/TEST.ROOT
+++ b/test/jaxp/TEST.ROOT
@@ -23,7 +23,7 @@ modules=java.xml
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=7.3+1
+requiredVersion=7.3.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index 2375f1e03f7..00d305c6d4a 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -79,7 +79,7 @@ requires.properties= \
     jdk.foreign.linker
 
 # Minimum jtreg version
-requiredVersion=7.3+1
+requiredVersion=7.3.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT
index 9bc4288fa0e..da884dee170 100644
--- a/test/langtools/TEST.ROOT
+++ b/test/langtools/TEST.ROOT
@@ -15,7 +15,7 @@ keys=intermittent randomness needs-src needs-src-jdk_javadoc
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=7.3+1
+requiredVersion=7.3.1+1
 
 # Use new module options
 useNewOptions=true
diff --git a/test/lib-test/TEST.ROOT b/test/lib-test/TEST.ROOT
index 84d11755f6c..9b91a0dfcc1 100644
--- a/test/lib-test/TEST.ROOT
+++ b/test/lib-test/TEST.ROOT
@@ -29,7 +29,7 @@
 keys=randomness
 
 # Minimum jtreg version
-requiredVersion=7.3+1
+requiredVersion=7.3.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them