From a090aa3ff8b79b553061e8d61bc42eb3d915c955 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Mon, 28 Apr 2025 17:13:44 +0000
Subject: [PATCH] 8354902: Change to Visual Studio 17.13.2 for building on
 Windows at Oracle

Reviewed-by: erikj, ihse
---
 doc/building.html         |  2 +-
 doc/building.md           | 10 +++++-----
 make/conf/jib-profiles.js |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index 1e6f99e97c9..a085f10c48e 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -594,7 +594,7 @@ to compile successfully without issues.</p>
 </tr>
 <tr class="odd">
 <td>Windows</td>
-<td>Microsoft Visual Studio 2022 version 17.6.5</td>
+<td>Microsoft Visual Studio 2022 version 17.13.2</td>
 </tr>
 </tbody>
 </table>
diff --git a/doc/building.md b/doc/building.md
index 18e030baa9e..a31cd5fe775 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -390,11 +390,11 @@ possible to compile the JDK with both older and newer versions, but the closer
 you stay to this list, the more likely you are to compile successfully without
 issues.
 
-| Operating system   | Toolchain version                           |
-| ------------------ | ------------------------------------------- |
-| Linux              | gcc 14.2.0                                  |
-| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)     |
-| Windows            | Microsoft Visual Studio 2022 version 17.6.5 |
+| Operating system   | Toolchain version                            |
+| ------------------ | -------------------------------------------- |
+| Linux              | gcc 14.2.0                                   |
+| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)      |
+| Windows            | Microsoft Visual Studio 2022 version 17.13.2 |
 
 All compilers are expected to be able to handle the C11 language standard for
 C, and C++14 for C++.
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index aa4d846280e..40fa453f954 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1090,7 +1090,7 @@ var getJibProfilesDependencies = function (input, common) {
     var devkit_platform_revisions = {
         linux_x64: "gcc14.2.0-OL6.4+1.0",
         macosx: "Xcode14.3.1+1.0",
-        windows_x64: "VS2022-17.6.5+1.0",
+        windows_x64: "VS2022-17.13.2+1.0",
         linux_aarch64: "gcc14.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc14.2.0-Fedora_41+1.0",