Skip to content

Commit e3ba9b9

Browse files
committed
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'.
1 parent 5e31f8d commit e3ba9b9

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

app/display/waterfallplot/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@
3030
<groupId>io.fair-acc</groupId>
3131
<artifactId>chartfx</artifactId>
3232
<version>11.3.1</version>
33+
<exclusions>
34+
<!-- Use the Phoebus versions of javafx-base and javafx-controls: -->
35+
<exclusion>
36+
<groupId>org.openjfx</groupId>
37+
<artifactId>javafx-base</artifactId>
38+
</exclusion>
39+
<exclusion>
40+
<groupId>org.openjfx</groupId>
41+
<artifactId>javafx-controls</artifactId>
42+
</exclusion>
43+
</exclusions>
3344
</dependency>
3445
<dependency>
3546
<groupId>org.slf4j</groupId>

dependencies/phoebus-target/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,17 @@
564564
<groupId>io.fair-acc</groupId>
565565
<artifactId>chartfx</artifactId>
566566
<version>11.3.1</version>
567+
<exclusions>
568+
<!-- Use the Phoebus versions of javafx-base and javafx-controls: -->
569+
<exclusion>
570+
<groupId>org.openjfx</groupId>
571+
<artifactId>javafx-base</artifactId>
572+
</exclusion>
573+
<exclusion>
574+
<groupId>org.openjfx</groupId>
575+
<artifactId>javafx-controls</artifactId>
576+
</exclusion>
577+
</exclusions>
567578
</dependency>
568579
</dependencies>
569580

0 commit comments

Comments
 (0)