From e10eaf4008837b715a56da5c27d6eeee581a5427 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Tue, 26 May 2026 15:45:18 +0000
Subject: [PATCH 1/2] feat: retarget build to JDK 21

---
 .travis.yml                  |  2 +-
 BASELINE-METRICS.txt         | 33 +++++++++++++++++++++++++++++++++
 nbproject/project.properties |  4 ++--
 release-build.properties     |  2 +-
 release-build.xml            |  2 +-
 5 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 BASELINE-METRICS.txt

diff --git a/.travis.yml b/.travis.yml
index 0eadda7688..909b77aa12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ language: java
 
 # Configure the build to use Oracle JDK 9
 jdk:
-  - openjdk11
+  - openjdk21
 
 # Install the Ant JUnit package, which is missing from the Travis CI environment. See the Travis documentation: https://docs.travis-ci.com/user/installing-dependencies/#Adding-APT-Packages
 addons:
diff --git a/BASELINE-METRICS.txt b/BASELINE-METRICS.txt
new file mode 100644
index 0000000000..565ee9692c
--- /dev/null
+++ b/BASELINE-METRICS.txt
@@ -0,0 +1,33 @@
+WorldWindJava Java 11 Pre-Migration Baseline
+Captured: 2026-05-26T15:41:55Z
+Branch: develop
+Commit: 2543c234349c76f4a290e318b49f071ac156d2a0
+
+JDK:
+openjdk version "11.0.30" 2026-01-20
+OpenJDK Runtime Environment (build 11.0.30+7-post-Ubuntu-1ubuntu122.04)
+OpenJDK 64-Bit Server VM (build 11.0.30+7-post-Ubuntu-1ubuntu122.04, mixed mode, sharing)
+
+File count
+src java files: 1727
+
+Anonymous inner class counts
+new Runnable(): 148
+new ActionListener(): 185
+new Callable(): 0
+new MouseListener(): 2
+new KeyListener(): 0
+new ChangeListener(): 60
+new PropertyChangeListener(): 44
+new WindowListener(): 0
+
+instanceof pattern-match candidates
+instanceof: 1303
+
+Deprecated usage
+@Deprecated: 131
+new Integer(: 0
+new Double(: 0
+new Float(: 0
+new Long(: 0
+new Boolean(: 0
diff --git a/nbproject/project.properties b/nbproject/project.properties
index fab181db51..de8a7bdfc9 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -56,8 +56,8 @@ javac.modulepath=
 javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
-javac.source=11
-javac.target=11
+javac.source=21
+javac.target=21
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/release-build.properties b/release-build.properties
index cde1c0e4de..689b787445 100644
--- a/release-build.properties
+++ b/release-build.properties
@@ -38,7 +38,7 @@ worldwind.classes.dir=${worldwind.build.dir}/classes
 worldwind.doc.dir=${worldwind.build.dir}/doc
 worldwind.jar.dir=${worldwind.build.dir}/jar
 worldwind.test.results.dir=${worldwind.build.dir}/test-results
-worldwind.jdk=11
+worldwind.jdk=21
 #worldwind.exclude.jackson=true
 
 # MIL-STD-2525 package build properties
diff --git a/release-build.xml b/release-build.xml
index 9810ad732d..7948d88789 100644
--- a/release-build.xml
+++ b/release-build.xml
@@ -126,7 +126,7 @@
                 <pathelement location="gluegen-rt.jar"/>
                 <pathelement location="gdal.jar"/>
             </classpath>
-            <link href="http://download.oracle.com/javase/8/docs/api/"/>
+            <link href="https://docs.oracle.com/en/java/javase/21/docs/api/"/>
             <link href="https://jogamp.org/deployment/v2.4.0-rc-20200307/javadoc/"/>
         </javadoc>
     </target>

From 84c5d2accd1cad57e666ba61e7312fc91a3434e5 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Tue, 26 May 2026 15:46:31 +0000
Subject: [PATCH 2/2] chore: keep foundation diff to build config only

---
 BASELINE-METRICS.txt | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 BASELINE-METRICS.txt

diff --git a/BASELINE-METRICS.txt b/BASELINE-METRICS.txt
deleted file mode 100644
index 565ee9692c..0000000000
--- a/BASELINE-METRICS.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-WorldWindJava Java 11 Pre-Migration Baseline
-Captured: 2026-05-26T15:41:55Z
-Branch: develop
-Commit: 2543c234349c76f4a290e318b49f071ac156d2a0
-
-JDK:
-openjdk version "11.0.30" 2026-01-20
-OpenJDK Runtime Environment (build 11.0.30+7-post-Ubuntu-1ubuntu122.04)
-OpenJDK 64-Bit Server VM (build 11.0.30+7-post-Ubuntu-1ubuntu122.04, mixed mode, sharing)
-
-File count
-src java files: 1727
-
-Anonymous inner class counts
-new Runnable(): 148
-new ActionListener(): 185
-new Callable(): 0
-new MouseListener(): 2
-new KeyListener(): 0
-new ChangeListener(): 60
-new PropertyChangeListener(): 44
-new WindowListener(): 0
-
-instanceof pattern-match candidates
-instanceof: 1303
-
-Deprecated usage
-@Deprecated: 131
-new Integer(: 0
-new Double(: 0
-new Float(: 0
-new Long(: 0
-new Boolean(: 0