From 76bb0fa8b1ea89481ab8579d0abbf603325ece57 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Fri, 21 Sep 2018 18:43:29 +0200 Subject: [PATCH 1/5] prepare java11 * this is not working with java11 yet --- .classpath | 5 +++-- .settings/org.eclipse.jdt.core.prefs | 8 ++++---- pom.xml | 24 +++++++++++++++++------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.classpath b/.classpath index 7e55b77..7f5ea8f 100644 --- a/.classpath +++ b/.classpath @@ -8,9 +8,9 @@ + - @@ -18,7 +18,7 @@ - + @@ -28,5 +28,6 @@ + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2978067..f472f69 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=9 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/pom.xml b/pom.xml index 72319b0..5dc1686 100644 --- a/pom.xml +++ b/pom.xml @@ -15,14 +15,25 @@ - + - junit - junit - 4.12 - test + org.openjfx + javafx-controls + 11 + + org.openjfx + javafx-fxml + 11 + + + + org.openjfx + javafx-media + 11 + + commons-io commons-io @@ -68,8 +79,7 @@ maven-compiler-plugin 3.8.0 - 9 - 9 + 11 true true -- 2.47.1 From 32fc533c00df09e129f3536960a6adf8e19d9d7d Mon Sep 17 00:00:00 2001 From: Seil0 Date: Fri, 21 Sep 2018 18:57:39 +0200 Subject: [PATCH 2/5] fixed junit --- .classpath | 2 +- .settings/org.eclipse.jdt.core.prefs | 6 +++--- pom.xml | 9 ++++++++- .../java/kellerkinder/HomeFlix/application/Main.java | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.classpath b/.classpath index 7f5ea8f..51caf01 100644 --- a/.classpath +++ b/.classpath @@ -18,7 +18,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index f472f69..54a32cd 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=10 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=10 diff --git a/pom.xml b/pom.xml index 5dc1686..ca997ce 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,13 @@ + + + junit + junit + 4.12 + test + org.openjfx @@ -79,7 +86,7 @@ maven-compiler-plugin 3.8.0 - 11 + 10 true true diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index fbf0b2b..81581f1 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -329,4 +329,4 @@ public class Main extends Application { public File getPosterCache() { return posterCache; } -} \ No newline at end of file +} -- 2.47.1 From 96bfc461cb53990eb30136cc74128f982ae71f27 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Fri, 21 Sep 2018 19:50:43 +0200 Subject: [PATCH 3/5] formation fixes --- pom.xml | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index ca997ce..9ae5fb7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,22 +24,22 @@ - org.openjfx - javafx-controls - 11 + org.openjfx + javafx-controls + 11 - org.openjfx - javafx-fxml - 11 - - - - org.openjfx - javafx-media - 11 - + org.openjfx + javafx-fxml + 11 + + + + org.openjfx + javafx-media + 11 + commons-io @@ -91,6 +91,22 @@ true + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + + java + + + + + kellerkinder.HomeFlix.application.Main + + org.apache.maven.plugins -- 2.47.1 From abbb272bff2742dc1b9ccff80005f903b4541173 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sun, 23 Sep 2018 14:33:16 +0200 Subject: [PATCH 4/5] fixed java11 execution * use mvn compile exec:java for now to run HomeFlix * compilation is not possible yet * see #4 --- .classpath | 2 +- .settings/org.eclipse.jdt.core.prefs | 8 +- pom.xml | 258 +++++++++--------- .../HomeFlix/application/Main.java | 2 +- 4 files changed, 137 insertions(+), 133 deletions(-) diff --git a/.classpath b/.classpath index 51caf01..7f5ea8f 100644 --- a/.classpath +++ b/.classpath @@ -18,7 +18,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 54a32cd..b807efd 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=10 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=10 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/pom.xml b/pom.xml index 9ae5fb7..071aa6a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,137 +1,141 @@ - - 4.0.0 + + 4.0.0 - org.kellerkinder - Project-HomeFlix - 0.7.0 - jar + org.kellerkinder + Project-HomeFlix + 0.7.0 + jar - Project-HomeFlix - http://www.mosad.xyz + Project-HomeFlix + http://www.mosad.xyz - - UTF-8 - + + UTF-8 + - - - - junit - junit - 4.12 - test - - - - org.openjfx - javafx-controls - 11 - - - - org.openjfx - javafx-fxml - 11 - + - - org.openjfx - javafx-media - 11 - + + junit + junit + 4.12 + test + - - commons-io - commons-io - 2.6 - + + org.openjfx + javafx-controls + 11 + - - com.jfoenix - jfoenix - 9.0.6 - - - - com.eclipsesource.minimal-json - minimal-json - 0.9.5 - - - - org.xerial - sqlite-jdbc - 3.23.1 - - - - org.apache.logging.log4j - log4j-api - 2.11.1 - + + org.openjfx + javafx-fxml + 11 + - - org.apache.logging.log4j - log4j-core - 2.11.1 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 10 - true - true - - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - - java - - - - - kellerkinder.HomeFlix.application.Main - - + + org.openjfx + javafx-media + 11 + + + + commons-io + commons-io + 2.6 + + + + com.jfoenix + jfoenix + 9.0.6 + + + + com.eclipsesource.minimal-json + minimal-json + 0.9.5 + + + + org.xerial + sqlite-jdbc + 3.23.1 + + + + org.apache.logging.log4j + log4j-api + 2.11.1 + + + + org.apache.logging.log4j + log4j-core + 2.11.1 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + 11 + + true + true + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + + java + + + + + kellerkinder.HomeFlix.application.Main + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.0 + + Project-HomeFlix + true + + + kellerkinder.HomeFlix.application.Main + + + + + + package + + shade + + + + + + + - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - Project-HomeFlix - true - - - kellerkinder.HomeFlix.application.Main - - - - - - package - - shade - - - - - - - - diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index 81581f1..1263763 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -92,7 +92,7 @@ public class Main extends Application { private void mainWindow(){ try { FXMLLoader loader = new FXMLLoader(); - loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml")); + loader.setLocation(getClass().getResource("/fxml/MainWindow.fxml")); loader.setController(mainWindowController); pane = (AnchorPane) loader.load(); primaryStage.setMinHeight(600.00); -- 2.47.1 From e6ce1dc464e42aee441c1612dae4bdfdd9ba81e4 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Mon, 1 Oct 2018 18:17:24 +0200 Subject: [PATCH 5/5] fixed javafx11 executable jar * added a workaround for the javafx 11 executable jar, this should be removed as soon as the new packager is available --- pom.xml | 2 +- .../kellerkinder/HomeFlix/application/JavaFX11Main.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/main/java/kellerkinder/HomeFlix/application/JavaFX11Main.java diff --git a/pom.xml b/pom.xml index 071aa6a..57509a4 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ - kellerkinder.HomeFlix.application.Main + kellerkinder.HomeFlix.application.JavaFX11Main diff --git a/src/main/java/kellerkinder/HomeFlix/application/JavaFX11Main.java b/src/main/java/kellerkinder/HomeFlix/application/JavaFX11Main.java new file mode 100644 index 0000000..1b2bc01 --- /dev/null +++ b/src/main/java/kellerkinder/HomeFlix/application/JavaFX11Main.java @@ -0,0 +1,8 @@ +package kellerkinder.HomeFlix.application; + +public class JavaFX11Main { + + public static void main(String[] args) { + Main.main(args); + } +} -- 2.47.1