From 3080dbdbb0c80bfb0dc6fed7be84d1c73fef1b2b Mon Sep 17 00:00:00 2001
From: Adam Pocock <adam.pocock@oracle.com>
Date: Fri, 26 Sep 2025 15:19:57 -0400
Subject: [PATCH 1/3] Bump Windows image

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c48921c272d..d77500fc58f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -138,7 +138,7 @@ jobs:
         if: env.DEPLOY_RELEASE == 'true' || env.DEPLOY_SNAPSHOT == 'true'
         run: mvn -f tensorflow-core/tensorflow-core-native/pom.xml deploy:deploy-file@native-only -B -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }} -Durl=${{ needs.prepare.outputs.repositoryUrl }}
   windows-x86_64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: prepare
     strategy:
        matrix:

From a4c4aa88a93a551d1a02e87490235921fad7e27b Mon Sep 17 00:00:00 2001
From: Adam Pocock <adam.pocock@oracle.com>
Date: Fri, 26 Sep 2025 15:29:42 -0400
Subject: [PATCH 2/3] bumping spotless and JavaCPP.

---
 pom.xml                 | 2 +-
 tensorflow-core/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a1853b15de..7dd9489f42c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <maven.source.skip>true</maven.source.skip>
     <gpg.skip>true</gpg.skip>
-    <spotless.version>2.43.0</spotless.version>
+    <spotless.version>2.46.1</spotless.version>
   </properties>
 
   <repositories>
diff --git a/tensorflow-core/pom.xml b/tensorflow-core/pom.xml
index e40b06f7f33..14d155dd901 100644
--- a/tensorflow-core/pom.xml
+++ b/tensorflow-core/pom.xml
@@ -59,7 +59,7 @@
     <javacpp.platform.macosx-arm64.extension>macosx-arm64${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
     <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
     <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-    <javacpp.version>1.5.11</javacpp.version>
+    <javacpp.version>1.5.12</javacpp.version>
   </properties>
 
   <profiles>

From 1af74d3dbe19a1d5f1da2f4162fe800ae31c322a Mon Sep 17 00:00:00 2001
From: Adam Pocock <adam.pocock@oracle.com>
Date: Fri, 26 Sep 2025 15:36:30 -0400
Subject: [PATCH 3/3] Fix VS path

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d77500fc58f..786b86984a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -161,7 +161,7 @@ jobs:
       - name: Build project
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
           set "PATH=C:\msys64\usr\bin;%PATH%"
           echo Shorten work paths to prevent Bazel from reaching MAX_PATH limit
           mkdir C:\tmp