Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/spring boot major upgrade #11

Merged
merged 5 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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, develop ]
pull_request:
branches: [ master, develop ]
workflow_dispatch:
inputs: {}

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- 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
17 changes: 16 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,22 @@ All dependencies are present in the executables for runtime.

### Development

* Java 11+
* Java 17+
* OpenJFX 21+

#### 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

Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.8.RELEASE</version>
<version>3.2.0</version>
</parent>

<groupId>com.xsd</groupId>
Expand All @@ -20,12 +20,12 @@
</scm>

<properties>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<spring-boot-starter-javafx.version>1.0.9</spring-boot-starter-javafx.version>
<javafx.version>13.0.2</javafx.version>
<spring-boot-starter-javafx.version>2.0.0</spring-boot-starter-javafx.version>
<javafx.version>21.0.1</javafx.version>

<start-class>com.compare.xsd.XsdCompareStarter</start-class>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/compare/xsd/comparison/XsdLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/compare/xsd/settings/SettingsService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

@Slf4j
@Service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading