Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions core/ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,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>
16 changes: 16 additions & 0 deletions dependencies/phoebus-target/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
<epics.util.version>1.0.8</epics.util.version>
<vtype.version>1.0.8</vtype.version>
<openjfx.version>21.0.7</openjfx.version>
<!-- 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>
<mockito.version>2.23.4</mockito.version>
Expand Down