From a0585b65267ecfe6d20a25f38feaa1fd060bd63b Mon Sep 17 00:00:00 2001 From: yoep Date: Thu, 21 Dec 2023 15:15:10 +0100 Subject: [PATCH 1/5] Bumped Spring Boot and JavaFX starter dependency --- README.md | 14 ++++++++++++++ pom.xml | 12 ++++++------ .../java/com/compare/xsd/comparison/XsdLoader.java | 2 +- .../com/compare/xsd/settings/SettingsService.java | 4 ++-- .../xsd/view/services/InterfaceService.java | 2 +- .../compare/xsd/writers/ExcelComparisonWriter.java | 2 +- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d8a469c..c594a8a 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,20 @@ All dependencies are present in the executables for runtime. * Java 11+ +#### Development program arguments + +When wanting to run this application locally from your IDE, it's recommended to add the following VM options: + +```shell +-Dsun.awt.disablegrab=true +-Dprism.verbose=true +-Xms100M +-XX:+UseG1GC +-XX:+HeapDumpOnOutOfMemoryError +-p "/path/to/openjfx/21/lib" +--add-modules javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.web,javafx.swing +``` + ## Features ### 0.0.6 diff --git a/pom.xml b/pom.xml index d731007..9fe8bdf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.8.RELEASE + 3.2.0 com.xsd @@ -20,12 +20,12 @@ - 11 - 11 - 11 + 17 + 17 + 17 - 1.0.9 - 13.0.2 + 2.0.0 + 21.0.1 com.compare.xsd.XsdCompareStarter diff --git a/src/main/java/com/compare/xsd/comparison/XsdLoader.java b/src/main/java/com/compare/xsd/comparison/XsdLoader.java index 8494692..562c9f6 100644 --- a/src/main/java/com/compare/xsd/comparison/XsdLoader.java +++ b/src/main/java/com/compare/xsd/comparison/XsdLoader.java @@ -2,13 +2,13 @@ import com.compare.xsd.comparison.model.xsd.impl.XsdDocument; import com.github.spring.boot.javafx.view.ViewManager; +import jakarta.annotation.PostConstruct; import javafx.stage.FileChooser; import javafx.stage.Stage; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.Assert; -import javax.annotation.PostConstruct; import java.io.File; import java.io.FileNotFoundException; import java.util.Optional; diff --git a/src/main/java/com/compare/xsd/settings/SettingsService.java b/src/main/java/com/compare/xsd/settings/SettingsService.java index 5f509a3..474e675 100644 --- a/src/main/java/com/compare/xsd/settings/SettingsService.java +++ b/src/main/java/com/compare/xsd/settings/SettingsService.java @@ -3,14 +3,14 @@ import com.compare.xsd.XsdCompareApplication; import com.compare.xsd.settings.model.ApplicationSettings; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; diff --git a/src/main/java/com/compare/xsd/view/services/InterfaceService.java b/src/main/java/com/compare/xsd/view/services/InterfaceService.java index 9e49b4b..616563a 100644 --- a/src/main/java/com/compare/xsd/view/services/InterfaceService.java +++ b/src/main/java/com/compare/xsd/view/services/InterfaceService.java @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; @Slf4j @Service diff --git a/src/main/java/com/compare/xsd/writers/ExcelComparisonWriter.java b/src/main/java/com/compare/xsd/writers/ExcelComparisonWriter.java index 087c1c2..099de24 100644 --- a/src/main/java/com/compare/xsd/writers/ExcelComparisonWriter.java +++ b/src/main/java/com/compare/xsd/writers/ExcelComparisonWriter.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.Assert; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.awt.*; import java.io.File; import java.util.ArrayList; From 5b6c259ba56200ed94ccaf539a5003e5bc28c583 Mon Sep 17 00:00:00 2001 From: yoep Date: Thu, 21 Dec 2023 16:23:51 +0100 Subject: [PATCH 2/5] Updated README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c594a8a..c0db895 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,8 @@ All dependencies are present in the executables for runtime. ### Development -* Java 11+ +* Java 17+ +* OpenJFX 21+ #### Development program arguments From 469cf2af60c8b025b7e066015f5a1a215719fa7c Mon Sep 17 00:00:00 2001 From: yoep Date: Thu, 21 Dec 2023 16:25:36 +0100 Subject: [PATCH 3/5] Added Github actions for testing --- .github/workflows/maven-build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/maven-build.yml diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml new file mode 100644 index 0000000..d6e4b70 --- /dev/null +++ b/.github/workflows/maven-build.yml @@ -0,0 +1,31 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + workflow_dispatch: + inputs: {} + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'adopt' + java-version: 17 + cache: 'maven' + - name: Maven test + run: | + mvn -B test \ No newline at end of file From 1f7c3adfc6eb6c5484cdca5eeb51aa7dae6fc554 Mon Sep 17 00:00:00 2001 From: yoep Date: Thu, 21 Dec 2023 16:26:28 +0100 Subject: [PATCH 4/5] Removed toolchain --- .github/workflows/maven-build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index d6e4b70..6dccf11 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -17,9 +17,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - name: Set up JDK 17 uses: actions/setup-java@v3 with: From 2f5754602e655a3ac162760dc3d225ef6dba3862 Mon Sep 17 00:00:00 2001 From: yoep Date: Thu, 21 Dec 2023 16:27:26 +0100 Subject: [PATCH 5/5] Added additional workflow triggers --- .github/workflows/maven-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 6dccf11..77cfd4c 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ master ] + branches: [ master, develop ] pull_request: - branches: [ master ] + branches: [ master, develop ] workflow_dispatch: inputs: {}