From ae0f5208ddf3f7d30aa738148234d19fe8c79880 Mon Sep 17 00:00:00 2001
From: Gianluca Martino <gmartino@lbl.gov>
Date: Thu, 25 Jun 2026 14:11:28 -0700
Subject: [PATCH 1/2] core-ui: add jdk-jsobject for netscape.javascript so
 javafx.web builds on JDK 26

---
 core/ui/pom.xml                     | 7 +++++++
 dependencies/phoebus-target/pom.xml | 7 +++++++
 pom.xml                             | 5 +++++
 3 files changed, 19 insertions(+)

diff --git a/core/ui/pom.xml b/core/ui/pom.xml
index 6a3b49b5cd..0b50e1c3bf 100644
--- a/core/ui/pom.xml
+++ b/core/ui/pom.xml
@@ -46,6 +46,13 @@
       <artifactId>javafx-web</artifactId>
       <version>${openjfx.version}</version>
     </dependency>
+    <!-- netscape.javascript for javafx.web; previously provided by the JDK's
+         jdk.jsobject module, which was removed in JDK 26. -->
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>jdk-jsobject</artifactId>
+      <version>${jsobject.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-swing</artifactId>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index 1877a734ab..97fffb73d4 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -81,6 +81,13 @@
       <artifactId>javafx-web</artifactId>
       <version>${openjfx.version}</version>
     </dependency>
+    <!-- netscape.javascript for javafx.web; previously provided by the JDK's
+         jdk.jsobject module, which was removed in JDK 26. -->
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>jdk-jsobject</artifactId>
+      <version>${jsobject.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-swing</artifactId>
diff --git a/pom.xml b/pom.xml
index 556891b64c..196df2a1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,11 @@
     <epics.util.version>1.0.8</epics.util.version>
     <vtype.version>1.0.8</vtype.version>
     <openjfx.version>21.0.7</openjfx.version>
+    <!-- Supplies netscape.javascript (used by javafx.web's WebView), which lived
+         in the JDK's jdk.jsobject module until that module was removed in JDK 26.
+         Versioned independently of openjfx because the standalone artifact only
+         exists from 25 onwards. -->
+    <jsobject.version>26.0.1</jsobject.version>
     <jackson.version>2.12.3</jackson.version>
     <batik.version>1.17</batik.version>
     <mockito.version>2.23.4</mockito.version>

From c8847afc1a12eafd572ef57389bcc28c838b3566 Mon Sep 17 00:00:00 2001
From: Gianluca Martino <gmartino@lbl.gov>
Date: Mon, 29 Jun 2026 13:38:16 -0700
Subject: [PATCH 2/2] core-ui: gate jdk-jsobject behind a JDK 26+ activated
 Maven profile

---
 core/ui/pom.xml                     | 25 ++++++++++++++++++-------
 dependencies/phoebus-target/pom.xml | 23 ++++++++++++++++-------
 pom.xml                             |  6 ++----
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/core/ui/pom.xml b/core/ui/pom.xml
index 0b50e1c3bf..7af594c745 100644
--- a/core/ui/pom.xml
+++ b/core/ui/pom.xml
@@ -46,13 +46,6 @@
       <artifactId>javafx-web</artifactId>
       <version>${openjfx.version}</version>
     </dependency>
-    <!-- netscape.javascript for javafx.web; previously provided by the JDK's
-         jdk.jsobject module, which was removed in JDK 26. -->
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>jdk-jsobject</artifactId>
-      <version>${jsobject.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-swing</artifactId>
@@ -112,4 +105,22 @@
       </resource>
     </resources>
   </build>
+
+  <profiles>
+    <!-- netscape.javascript (javafx.web/WebView) moved out of the JDK in 26;
+         supply it as a jar only on 26+ (<= 25 have the jdk.jsobject module). -->
+    <profile>
+      <id>jdk-jsobject</id>
+      <activation>
+        <jdk>[26,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.openjfx</groupId>
+          <artifactId>jdk-jsobject</artifactId>
+          <version>${jsobject.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index 97fffb73d4..1883538ca6 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -41,6 +41,22 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- netscape.javascript (javafx.web/WebView) moved out of the JDK in 26;
+         supply it as a jar only on 26+ (<= 25 have the jdk.jsobject module). -->
+    <profile>
+      <id>jdk-jsobject</id>
+      <activation>
+        <jdk>[26,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.openjfx</groupId>
+          <artifactId>jdk-jsobject</artifactId>
+          <version>${jsobject.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
   <dependencies>
@@ -81,13 +97,6 @@
       <artifactId>javafx-web</artifactId>
       <version>${openjfx.version}</version>
     </dependency>
-    <!-- netscape.javascript for javafx.web; previously provided by the JDK's
-         jdk.jsobject module, which was removed in JDK 26. -->
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>jdk-jsobject</artifactId>
-      <version>${jsobject.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-swing</artifactId>
diff --git a/pom.xml b/pom.xml
index 196df2a1cf..2825aabd57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,10 +69,8 @@
     <epics.util.version>1.0.8</epics.util.version>
     <vtype.version>1.0.8</vtype.version>
     <openjfx.version>21.0.7</openjfx.version>
-    <!-- Supplies netscape.javascript (used by javafx.web's WebView), which lived
-         in the JDK's jdk.jsobject module until that module was removed in JDK 26.
-         Versioned independently of openjfx because the standalone artifact only
-         exists from 25 onwards. -->
+    <!-- netscape.javascript jar for the JDK 26+ profiles; versioned separately
+         from openjfx as it's only published for 25+. -->
     <jsobject.version>26.0.1</jsobject.version>
     <jackson.version>2.12.3</jackson.version>
     <batik.version>1.17</batik.version>