bump javafx version, fix rebase mistake

JeffersonLab · Jan 6, 2025 · 0e666d4 · 0e666d4
1 parent 18d54f5
commit 0e666d4
Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml
@@ -17,11 +17,7 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-<<<<<<< HEAD
-      <version>23</version>
-=======
-      <version>24-ea+5</version>
->>>>>>> d4e3960bd (build(deps): bump org.openjfx:javafx-controls from 22.0.2 to 24-ea+5)
+      <version>24-ea+19</version>
     </dependency>
     <dependency>
       <groupId>org.jlab.ccdbrcdb</groupId>

diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml
@@ -17,12 +17,12 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>24-ea+5</version>
+      <version>24-ea+19</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-fxml</artifactId>
-      <version>24-ea+5</version>
+      <version>24-ea+19</version>
     </dependency>
     <dependency>
       <groupId>org.jlab.clas</groupId>