Fix MDFX JavaFX25 (#77)

FlorianKirmaier · web-flow · commit 90528fb7dd35 · 2025-12-12T16:04:17.000+01:00
* `jpro-mdfx`, works now properly with JavaFX25. Previously the layouting of Listings was broken.

* Updatede CI, and limited default examples javafx version - to make CI happy.

* Gradle9

* fixing junit with gradle9

* fixing junit

* making test slightly loser, allowing CI to work again. Message were dependent on OS/JavaVersion which changed in CI.

* making test slightly loser, allowing CI to work again. Message were dependent on OS/JavaVersion which changed in CI.

* Fixed unit-test due to change in microsoft auth
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        jdk: [21, 23]
+        jdk: [21, 25]
         os: [ubuntu-22.04, windows-2022]
       fail-fast: false
       max-parallel: 4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,9 @@ authentication methods configurable in an application.
 #### Miscellaneous
 * Removed AuthJwtFilter, because it was not used anywhere and seemed to be a leftover from the past.
 
+#### Bugfixes
+* `jpro-mdfx`, works now properly with JavaFX25. Previously the layouting of Listings was broken.
+
 ### 0.5.7 (June 5, 2025)
 
 #### Features
diff --git a/build.gradle b/build.gradle
@@ -100,8 +100,11 @@ configure(subprojects.findAll { it.name != 'example' }) {
     }
 
     dependencies {
-        testImplementation "org.junit.jupiter:junit-jupiter:$JUNIT_VERSION"
-        testImplementation "org.junit.jupiter:junit-jupiter-engine:$JUNIT_VERSION"
+        testImplementation(platform("org.junit:junit-bom:$JUNIT_VERSION"))
+        testImplementation("org.junit.jupiter:junit-jupiter")
+        testImplementation("org.junit.jupiter:junit-jupiter-api")
+        testImplementation("org.junit.jupiter:junit-jupiter-engine")
+        testImplementation("org.junit.platform:junit-platform-launcher")
 
         testImplementation "one.jpro:jmemorybuddy:$JMEMORYBUDDY_VERSION"
         testImplementation "one.jpro.platform.jpms:testfx-junit5:$TESTFX_VERSION"
diff --git a/example/build.gradle b/example/build.gradle
@@ -21,15 +21,13 @@ dependencies {
     runtimeOnly "ch.qos.logback:logback-classic:$LOGBACK_VERSION"
 }
 
-mainClassName = 'one.jpro.platform.example.Main'
-
 javafx {
     version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
 }
 
 application {
-    mainClass = "$mainClassName"
+    mainClass = 'one.jpro.platform.example.Main'
     mainModule = 'one.jpro.platform.example'
     applicationDefaultJvmArgs = [
             "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.platform.media"
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 JPRO_PLATFORM_VERSION = 0.5.8-SNAPSHOT
 
-JPRO_VERSION = 2025.2.1
+JPRO_VERSION = 2025.3.1
 JAVAFX_BUILD_VERSION = 17.0.15
 JAVAFX_EXAMPLES_VERSION = 23.0.2
 SIMPLEFX_VERSION = 3.2.40
@@ -9,7 +9,7 @@ JNODES_VERSION = 0.8.3
 SCENIC_VIEW_VERSION = 11.0.3-SNAPSHOT-FORK
 
 JAVAFX_PLUGIN_VERSION = 0.1.0
-MODULE_PLUGIN_VERSION = 1.8.15
+MODULE_PLUGIN_VERSION = 2.0.0
 OSDETECTOR_PLUGIN_VERSION = 1.7.3
 ENSEMBLE_GRADLE_PLUGIN_VERSION = 0.1.0-SNAPSHOT
 DEPENDENCY_CHECK_PLUGIN_VERSION = 9.1.0
@@ -29,7 +29,7 @@ CSSFX_VERSION = 11.5.1-jpms
 IKONLI_VERSION = 12.4.0
 ATLANTAFX_VERSION = 2.0.1
 COMMONS_IO_VERSION = 2.19.0
-JUNIT_VERSION = 5.11.4
+JUNIT_VERSION = 5.13.4
 ASSERTJ_VERSION = 3.27.3
 HAMCREST_VERSION = 3.0
 MOCKITO_VERSION = 5.18.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/jpro-auth/core/src/test/java/one/jpro/platform/auth/core/oauth2/provider/MicrosoftAuthenticationProviderTests.java b/jpro-auth/core/src/test/java/one/jpro/platform/auth/core/oauth2/provider/MicrosoftAuthenticationProviderTests.java
@@ -7,6 +7,7 @@
 import java.util.concurrent.ExecutionException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Microsoft Authentication Provider tests.
@@ -51,8 +52,8 @@ public void autoConfigViaOpenIDConnectDiscoveryService() throws ExecutionExcepti
                     assertEquals(List.of("pairwise"), options.getSupportedSubjectTypes());
                     assertEquals(List.of("RS256"), options.getSupportedIdTokenSigningAlgValues());
                     assertEquals(List.of("openid", "profile", "email", "offline_access"), options.getSupportedScopes());
-                    assertEquals(List.of("client_secret_post", "private_key_jwt", "client_secret_basic"),
-                            options.getSupportedTokenEndpointAuthMethods());
+                    assertTrue(options.getSupportedTokenEndpointAuthMethods()
+                            .containsAll(List.of("client_secret_post", "private_key_jwt", "client_secret_basic")));
                     assertEquals(List.of("sub", "iss", "cloud_instance_name", "cloud_instance_host_name",
                                     "cloud_graph_host_name", "msgraph_host", "aud", "exp", "iat",
                                     "auth_time", "acr", "nonce", "preferred_username", "name", "tid",
diff --git a/jpro-auth/example/build.gradle b/jpro-auth/example/build.gradle
@@ -29,9 +29,7 @@ def examples = [
         'oauth'       : 'one.jpro.platform.auth.example.oauth.OAuthApp'
 ]
 
-mainClassName = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["google-login"]
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["google-login"]
     mainModule = "one.jpro.platform.auth.example"
 }
diff --git a/jpro-file/example/build.gradle b/jpro-file/example/build.gradle
@@ -24,10 +24,9 @@ def examples = [
         'file-uploader' : 'one.jpro.platform.file.example.upload.FileUploaderSample'
 ]
 
-mainClassName = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["text-editor"]
 
 application {
-    mainClass = "$mainClassName"
+    mainClass = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["text-editor"]
     mainModule = "one.jpro.platform.file.example"
     applicationDefaultJvmArgs = [
             "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.platform.file"
diff --git a/jpro-html-scrollpane/example/build.gradle b/jpro-html-scrollpane/example/build.gradle
@@ -15,9 +15,7 @@ javafx {
     modules = ['javafx.controls']
 }
 
-mainClassName = 'one.jpro.platform.htmlscrollpane.example.HTMLScrollPaneSample'
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = 'one.jpro.platform.htmlscrollpane.example.HTMLScrollPaneSample'
     mainModule = "one.jpro.platform.htmlscrollpane.example"
 }
diff --git a/jpro-mail/example/build.gradle b/jpro-mail/example/build.gradle
@@ -21,9 +21,7 @@ def examples = [
         'compose-mail' : 'one.jpro.platform.mail.example.compose.ComposeMailSample'
 ]
 
-mainClassName = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["compose-mail"]
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["compose-mail"]
     mainModule = "one.jpro.platform.mail.example"
 }
diff --git a/jpro-mdfx/example/build.gradle b/jpro-mdfx/example/build.gradle
@@ -9,16 +9,15 @@ dependencies {
     implementation "commons-io:commons-io:$COMMONS_IO_VERSION"
     implementation "org.slf4j:slf4j-api:$SLF4J_API_VERSION"
     runtimeOnly "ch.qos.logback:logback-classic:$LOGBACK_VERSION"
+    implementation "org.scenic-view:scenic-view:$SCENIC_VIEW_VERSION"
 }
 
 javafx {
     version = "$JAVAFX_EXAMPLES_VERSION"
-    modules = ['javafx.controls', 'javafx.fxml', 'javafx.web']
+    modules = ['javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing']
 }
 
-mainClassName = 'one.jpro.platform.mdfx.example.MarkdownViewSample'
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = 'one.jpro.platform.mdfx.example.MarkdownViewSample'
     mainModule = "one.jpro.platform.mdfx.example"
 }
diff --git a/jpro-mdfx/example/src/main/java/module-info.java b/jpro-mdfx/example/src/main/java/module-info.java
@@ -10,6 +10,7 @@
 
     requires jpro.webapi;
     requires one.jpro.platform.mdfx;
+    requires org.scenicview.scenicview;
 
     exports one.jpro.platform.mdfx.example;
 }
diff --git a/jpro-mdfx/example/src/main/java/one/jpro/platform/mdfx/example/MarkdownViewSample.java b/jpro-mdfx/example/src/main/java/one/jpro/platform/mdfx/example/MarkdownViewSample.java
@@ -14,6 +14,7 @@
 import one.jpro.platform.mdfx.MarkdownView;
 import one.jpro.platform.mdfx.extensions.YoutubeExtension;
 import org.apache.commons.io.IOUtils;
+import org.scenicview.ScenicView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,6 +41,9 @@ public void start(Stage stage) {
         Scene scene = new Scene(createRoot(stage), 1000,600);
         stage.setScene(scene);
         stage.show();
+
+        // Start ScenicView
+        // ScenicView.show(scene);
     }
 
     public Parent createRoot(Stage stage) {
diff --git a/jpro-mdfx/src/main/java/one/jpro/platform/mdfx/impl/MDFXNodeHelper.java b/jpro-mdfx/src/main/java/one/jpro/platform/mdfx/impl/MDFXNodeHelper.java
@@ -244,13 +244,13 @@ public void visitListItem(String text, com.vladsch.flexmark.util.ast.Node node)
             Label dot = new Label(text);
             dot.getStyleClass().add("markdown-listitem-dot");
             dot.getStyleClass().add("markdown-text");
+            dot.setMinWidth(Region.USE_PREF_SIZE);
 
             HBox hbox = new HBox();
             hbox.getStyleClass().add("markdown-hbox1");
             hbox.getChildren().add(dot);
             hbox.setAlignment(Pos.TOP_LEFT);
             HBox.setHgrow(newRoot, Priority.ALWAYS);
-            newRoot.setPrefWidth(1.0); // This way, it doesn't take space from the "dot" label
             hbox.getChildren().add(newRoot);
 
             oldRoot.getChildren().add(hbox);
diff --git a/jpro-mdfx/src/main/resources/one/jpro/platform/mdfx/mdfx.css b/jpro-mdfx/src/main/resources/one/jpro/platform/mdfx/mdfx.css
@@ -68,7 +68,6 @@
 
 .markdown-listitem-dot {
     -fx-font-size: 16;
-    -fx-min-width: 20;
     -fx-text-fill: -mdfx-font-color;
 }
 
diff --git a/jpro-media/example/build.gradle b/jpro-media/example/build.gradle
@@ -32,10 +32,8 @@ def examples = [
         'media-recorder-and-player': 'one.jpro.platform.media.example.MediaRecorderAndPlayerSample'
 ]
 
-mainClassName = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["media-recorder-and-player"]
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["media-recorder-and-player"]
     mainModule = 'one.jpro.platform.media.example'
     applicationDefaultJvmArgs = [
             "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.platform.media"
diff --git a/jpro-routing/build.gradle b/jpro-routing/build.gradle
@@ -123,9 +123,8 @@ configure(project(':jpro-routing:example')) {
             'test'  : 'example.scala.TestWebApplication',
             'extensions': 'example.scala.TestExtensions'
     ]
-    mainClassName = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["colors"]
 
     application {
-        mainClass = "$mainClassName"
+        mainClass = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["colors"]
     }
 }
diff --git a/jpro-session/example/build.gradle b/jpro-session/example/build.gradle
@@ -16,9 +16,7 @@ javafx {
     modules = ['javafx.graphics', 'javafx.controls']
 }
 
-mainClassName = 'one.jpro.platform.session.example.SessionManagerSample'
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = 'one.jpro.platform.session.example.SessionManagerSample'
     mainModule = "one.jpro.platform.sessions.example"
 }
diff --git a/jpro-sipjs/example/build.gradle b/jpro-sipjs/example/build.gradle
@@ -14,9 +14,7 @@ javafx {
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.swing', 'javafx.fxml', 'javafx.media', 'javafx.web']
 }
 
-mainClassName = "one.jpro.platform.sipjs.example.SIPJSApp"
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = "one.jpro.platform.sipjs.example.SIPJSApp"
     mainModule = 'one.jpro.platform.sipjs.example'
 }
diff --git a/jpro-utils/build.gradle b/jpro-utils/build.gradle
@@ -1,8 +1,3 @@
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
-
 dependencies {
     implementation "org.jetbrains:annotations:$JETBRAINS_ANNOTATIONS_VERSION"
     implementation "org.slf4j:slf4j-api:$SLF4J_API_VERSION"
diff --git a/jpro-utils/example/build.gradle b/jpro-utils/example/build.gradle
@@ -14,14 +14,12 @@ def examples = [
         'user-platform' : 'one.jpro.platform.utils.example.UserPlatformExample'
 ]
 
-mainClassName = examples.getOrDefault(project.getProperties().get("sample"), "UnknownApp")
-
 javafx {
     version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
 }
 
 application {
-    mainClass = "$mainClassName"
+    mainClass = examples.getOrDefault(project.getProperties().get("sample"), "UnknownApp")
     mainModule = 'one.jpro.platform.utils.example'
 }
diff --git a/jpro-utils/src/test/java/one/jpro/platform/utils/test/CommandRunnerTests.java b/jpro-utils/src/test/java/one/jpro/platform/utils/test/CommandRunnerTests.java
@@ -80,8 +80,9 @@ public void runAsyncWithMockDirectoryThrowsException() {
             commandRunner.addArgs("ls", "build.gradle");
             assertThatThrownBy(() -> commandRunner.runAsync("async-ls", mockFile))
                     .hasMessageContaining("Cannot run program \"ls\"")
-                    .hasMessageContaining("error=2, No such file or directory")
-                    .hasRootCauseMessage("error=2, No such file or directory")
+                    .hasMessageContaining("error")
+                    .hasMessageContaining("No such file or directory")
+                    //.hasRootCauseMessage("error=2, No such file or directory") // Dependent on OS and or JavaVersion
                     .hasCauseInstanceOf(IOException.class);
         }
     }
diff --git a/jpro-webrtc/example/build.gradle b/jpro-webrtc/example/build.gradle
@@ -13,10 +13,9 @@ javafx {
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.swing', 'javafx.fxml', 'javafx.media', 'javafx.web']
 }
 
-//mainClassName = "one.jpro.platform.webrtc.example.simple.WebRTCSimple"
-mainClassName = "one.jpro.platform.webrtc.example.videoroom.VideoRoomApp"
 
 application {
-    mainClass = "$mainClassName"
+    //mainClass = "one.jpro.platform.webrtc.example.simple.WebRTCSimple"
+    mainClass = "one.jpro.platform.webrtc.example.videoroom.VideoRoomApp"
     mainModule = 'one.jpro.platform.webrtc.example'
 }
diff --git a/jpro-youtube/example/build.gradle b/jpro-youtube/example/build.gradle
@@ -12,9 +12,7 @@ javafx {
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.swing', 'javafx.fxml', 'javafx.media', 'javafx.web']
 }
 
-mainClassName = "one.jpro.platform.youtube.example.YoutubeExample"
-
 application {
-    mainClass = "$mainClassName"
+    mainClass = "one.jpro.platform.youtube.example.YoutubeExample"
     mainModule = "one.jpro.platform.youtube.example"
 }

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ def examples = [`
`29`	`29`	`'oauth' : 'one.jpro.platform.auth.example.oauth.OAuthApp'`
`30`	`30`	`]`
`31`	`31`
`32`		`-mainClassName = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["google-login"]`
`33`		`-`
`34`	`32`	`application {`
`35`		`- mainClass = "$mainClassName"`
	`33`	`+ mainClass = project.hasProperty("sample") ? examples[project.getProperties().get("sample")] : examples["google-login"]`
`36`	`34`	`mainModule = "one.jpro.platform.auth.example"`
`37`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,7 @@ javafx {`
`15`	`15`	`modules = ['javafx.controls']`
`16`	`16`	`}`
`17`	`17`
`18`		`-mainClassName = 'one.jpro.platform.htmlscrollpane.example.HTMLScrollPaneSample'`
`19`		`-`
`20`	`18`	`application {`
`21`		`- mainClass = "$mainClassName"`
	`19`	`+ mainClass = 'one.jpro.platform.htmlscrollpane.example.HTMLScrollPaneSample'`
`22`	`20`	`mainModule = "one.jpro.platform.htmlscrollpane.example"`
`23`	`21`	`}`