From e3ba9b95e39ba311ace6ec9967d6172224060099 Mon Sep 17 00:00:00 2001
From: Abraham Wolk <abraham.wolk@ess.eu>
Date: Thu, 4 Sep 2025 11:52:14 +0200
Subject: [PATCH 1/2] CSSTUDIO-3427 Bugfix: Fix building of Phoebus for the
 platform 'mac-aarch64' by using the Phoebus versions of javafx-base and
 javafx-controls for the dependency 'chartfx'.

---
 app/display/waterfallplot/pom.xml   | 11 +++++++++++
 dependencies/phoebus-target/pom.xml | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/app/display/waterfallplot/pom.xml b/app/display/waterfallplot/pom.xml
index 7e9bd6030d..66bff53d04 100644
--- a/app/display/waterfallplot/pom.xml
+++ b/app/display/waterfallplot/pom.xml
@@ -30,6 +30,17 @@
             <groupId>io.fair-acc</groupId>
             <artifactId>chartfx</artifactId>
             <version>11.3.1</version>
+            <exclusions>
+                <!-- Use the Phoebus versions of javafx-base and javafx-controls: -->
+                <exclusion>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>javafx-base</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>javafx-controls</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index 56c3e67b1a..31353a7c46 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -564,6 +564,17 @@
       <groupId>io.fair-acc</groupId>
       <artifactId>chartfx</artifactId>
       <version>11.3.1</version>
+      <exclusions>
+        <!-- Use the Phoebus versions of javafx-base and javafx-controls: -->
+        <exclusion>
+          <groupId>org.openjfx</groupId>
+          <artifactId>javafx-base</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.openjfx</groupId>
+          <artifactId>javafx-controls</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

From 014e8b5badb92e69ed6f5c80a925ff90743c697d Mon Sep 17 00:00:00 2001
From: Abraham Wolk <abraham.wolk@ess.eu>
Date: Thu, 4 Sep 2025 15:23:48 +0200
Subject: [PATCH 2/2] Fix naming of the waterfallplot, remove duplicate
 dependencies, and set correct parent.

---
 app/display/waterfallplot/build.xml |  6 ++--
 app/display/waterfallplot/pom.xml   | 46 ++++-------------------------
 phoebus-product/pom.xml             |  2 +-
 3 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/app/display/waterfallplot/build.xml b/app/display/waterfallplot/build.xml
index 282ea95c1e..b570977d42 100644
--- a/app/display/waterfallplot/build.xml
+++ b/app/display/waterfallplot/build.xml
@@ -1,8 +1,8 @@
-<project default="app-waterfall-plot">
+<project default="app-display-waterfallplot">
   <import file="../../dependencies/ant_settings.xml"/>
 
-  <target name="app-waterfall-plot" depends="compile-app">
-    <jar destfile="${build}/app-waterfall-plot-${version}.jar">
+  <target name="app-display-waterfallplot" depends="compile-app">
+    <jar destfile="${build}/app-display-waterfallplot-${version}.jar">
       <fileset dir="${classes}"/>
       <fileset dir="${resources}"/>
     </jar>
diff --git a/app/display/waterfallplot/pom.xml b/app/display/waterfallplot/pom.xml
index 66bff53d04..bb9c727ea7 100644
--- a/app/display/waterfallplot/pom.xml
+++ b/app/display/waterfallplot/pom.xml
@@ -1,26 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>app-waterfall-plot</artifactId>
 
     <parent>
+        <artifactId>app-display</artifactId>
         <groupId>org.phoebus</groupId>
-        <artifactId>app</artifactId>
         <version>5.0.3-SNAPSHOT</version>
     </parent>
 
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>app-display-waterfallplot</artifactId>
+    <name>${project.groupId}:${project.artifactId}</name>
+
     <dependencies>
         <dependency>
             <groupId>org.phoebus</groupId>
             <artifactId>core-framework</artifactId>
             <version>5.0.3-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.phoebus</groupId>
-            <artifactId>core-ui</artifactId>
-            <version>5.0.3-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.phoebus</groupId>
             <artifactId>core-types</artifactId>
@@ -59,12 +55,6 @@
             <version>5.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.phoebus</groupId>
-            <artifactId>core-framework</artifactId>
-            <version>5.0.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.phoebus</groupId>
             <artifactId>app-display-model</artifactId>
@@ -77,24 +67,6 @@
             <version>5.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.phoebus</groupId>
-            <artifactId>app-display-representation</artifactId>
-            <version>5.0.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.phoebus</groupId>
-            <artifactId>app-display-representation</artifactId>
-            <version>5.0.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.phoebus</groupId>
-            <artifactId>app-display-representation</artifactId>
-            <version>5.0.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.phoebus</groupId>
             <artifactId>app-display-representation-javafx</artifactId>
@@ -107,11 +79,5 @@
             <version>5.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.phoebus</groupId>
-            <artifactId>app-display-runtime</artifactId>
-            <version>5.0.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/phoebus-product/pom.xml b/phoebus-product/pom.xml
index 76e9867c56..e4747da801 100644
--- a/phoebus-product/pom.xml
+++ b/phoebus-product/pom.xml
@@ -158,7 +158,7 @@
         </dependency>
         <dependency>
             <groupId>org.phoebus</groupId>
-            <artifactId>app-waterfall-plot</artifactId>
+            <artifactId>app-display-waterfallplot</artifactId>
             <version>5.0.3-SNAPSHOT</version>
         </dependency>	
         <dependency>