Skip to content

Commit

Permalink
Merge pull request #2380 from ControlSystemStudio/jfx19
Browse files Browse the repository at this point in the history 
JavaFX19
  • Loading branch information
@kasemir
kasemir authored Sep 15, 2022
2 parents 4a624e6 + 23f5871 commit 969e8ba
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 48 deletions.
93 changes: 46 additions & 47 deletions dependencies/phoebus-target/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<classpathentry exported="true" kind="lib" path="target/lib/commonmark-0.15.2.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/commonmark-ext-gfm-tables-0.15.2.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/commonmark-ext-image-attributes-0.15.2.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/commons-codec-1.11.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/commons-codec-1.14.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/commons-compress-1.21.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/commons-io-1.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/commons-logging-1.1.3.jar"/>
Expand All @@ -39,9 +39,9 @@
<classpathentry exported="true" kind="lib" path="target/lib/derbytools-10.16.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/derbyshared-10.16.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/eclipselink-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-java-7.17.3.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-rest-client-7.17.3.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-rest-client-sniffer-7.17.3.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-java-8.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-rest-client-8.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-rest-client-sniffer-8.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/epics-ntypes-0.3.7.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/epics-pvaccess-5.1.7.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/epics-pvdata-6.1.7.jar"/>
Expand All @@ -59,7 +59,6 @@
<classpathentry exported="true" kind="lib" path="target/lib/httpclient-4.5.10.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/httpcore-4.4.12.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/httpcore-nio-4.4.12.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/install-jars-4.6.10-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/istack-commons-runtime-3.0.5.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/j2objc-annotations-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/jackson-annotations-2.12.3.jar"/>
Expand Down Expand Up @@ -160,52 +159,52 @@


<!-- On Windows, need to add this:
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-18-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-18-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-18-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-18-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-18-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-18-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-18-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-19-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-19-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-19-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-19-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-19-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-19-win.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-19-win.jar"/>
-->
<!-- On Linux, need to add this:
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-18-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-18-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-18-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-18-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-18-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-18-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-18-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-19-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-19-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-19-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-19-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-19-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-19-linux.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-19-linux.jar"/>
-->
<!-- On Mac, need to add this:
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-18-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-18-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-18-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-18-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-18-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-18-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-18-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-18.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-19-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-base-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-19-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-controls-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-19-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-fxml-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-19-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-graphics-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-19-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-media-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-19-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-swing-19.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-19-mac.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/javafx-web-19.jar"/>
-->

<classpathentry kind="output" path="target/classes"/>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<properties>
<epics.version>7.0.8</epics.version>
<vtype.version>1.0.5</vtype.version>
<openjfx.version>18</openjfx.version>
<openjfx.version>19</openjfx.version>
<jackson.version>2.12.3</jackson.version>
<batik.version>1.14</batik.version>
<mockito.version>2.23.4</mockito.version>
Expand Down

0 comments on commit 969e8ba

Please sign in to comment.