Feature/move from java 8 to 11 (#103)

* add Dependency for javafx in java 11 and fix imports

* add custom Main to start app with Fxml context

* update readme

* add review changes

* change ci for java 11

* try without qualitygate

* add jacco dependncys

* add code coverage

* fix pom format

Co-authored-by: ddamke <[email protected]>

Author: DavidDamke

.github/workflows/mavenCi.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
 
-  analyze:
+  Analyze_Build_Upload:
 
     runs-on: ubuntu-latest
 
@@ -26,6 +26,14 @@ jobs:
           java-version: '11'
           distribution: 'corretto'
           cache: maven
+      - name: Build
+        run:  mvn clean verify org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage
+
+      - name: Upload Build Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: KeepTime
+          path: /home/runner/work/KeepTime/KeepTime/target/keeptime-*-bin.zip
       - name: Analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -36,26 +44,3 @@ jobs:
           -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -X
           -Dsonar.java.binaries=.
           -Dsonar.qualitygate.wait=true
-
-
-  build_and_upload:
-    needs: analyze
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'corretto'
-          cache: maven
-      - name: Build
-        run: |
-          mvn package -B clean verify
-
-      - name: Upload Build Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: KeepTime
-          path: /home/runner/work/KeepTime/KeepTime/target/keeptime-*-bin.zip

README.md

@@ -67,4 +67,7 @@ You should put the .jar in an extra folder as a *logs* and a *db* folder will be
 
 * Windows 7, 10
 * Linux (tested on Ubuntu 18.04)
-* Java 8 + JavaFX
+* Java 11
+
+
+

pom.xml

@@ -34,9 +34,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
 
     <maven-dependency-check.version>6.0.5</maven-dependency-check.version>
     <!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
@@ -47,6 +46,33 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-controls</artifactId>
+      <version>11.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-fxml</artifactId>
+      <version>11.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-swing</artifactId>
+      <version>11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-graphics</artifactId>
+      <version>11.0.2</version>
+      <classifier>win</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-graphics</artifactId>
+      <version>11.0.2</version>
+      <classifier>linux</classifier>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -93,6 +119,39 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <profiles>
+    <profile>
+      <id>coverage</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.7</version>
+            <executions>
+              <execution>
+                <id>prepare-agent</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>report</id>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+                <configuration>
+                  <formats>
+                    <format>XML</format>
+                  </formats>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <build>
     <plugins>
       <plugin>

src/main/java/de/doubleslash/keeptime/KeepTime.java

@@ -0,0 +1,7 @@
+package de.doubleslash.keeptime;
+
+public class KeepTime {
+    public static void main(final String[] args) {
+        Main.main(args);
+    }
+}

src/main/java/de/doubleslash/keeptime/view/ManageWorkController.java

@@ -21,10 +21,11 @@
 import java.time.format.DateTimeParseException;
 import java.time.format.FormatStyle;
 
+import javafx.scene.control.skin.ComboBoxListViewSkin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.javafx.scene.control.skin.ComboBoxListViewSkin;
+
 
 import de.doubleslash.keeptime.common.ColorHelper;
 import de.doubleslash.keeptime.common.StyleUtils;

src/main/java/de/doubleslash/keeptime/view/ReportController.java

@@ -25,12 +25,12 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
+import javafx.scene.control.skin.DatePickerSkin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.sun.javafx.scene.control.skin.DatePickerSkin;
 
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.common.Resources;
@@ -135,6 +135,7 @@ private void initialize() {
 
       colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
       initTableView();
+
    }
 
    private void initTableView() {
@@ -165,26 +166,26 @@ protected void updateItem(final TableRow item, final boolean empty) {
             (final TreeTableColumn.CellDataFeatures<TableRow, TableRow> entry) -> new ReadOnlyObjectWrapper<>(
                   entry.getValue().getValue()));
       noteColumn.setMinWidth(200);
-      noteColumn.impl_setReorderable(false);
+      noteColumn.setReorderable(false);
       this.workTableTreeView.getColumns().add(noteColumn);
 
       final TreeTableColumn<TableRow, String> timeRangeColumn = new TreeTableColumn<>("Timeslot");
       timeRangeColumn.setCellValueFactory(new TreeItemPropertyValueFactory<TableRow, String>("timeRange"));
       timeRangeColumn.setMinWidth(120);
-      timeRangeColumn.impl_setReorderable(false);
+      timeRangeColumn.setReorderable(false);
       this.workTableTreeView.getColumns().add(timeRangeColumn);
 
       final TreeTableColumn<TableRow, String> timeSumColumn = new TreeTableColumn<>("Duration");
       timeSumColumn.setCellValueFactory(new TreeItemPropertyValueFactory<TableRow, String>("timeSum"));
       timeSumColumn.setMinWidth(60);
-      timeSumColumn.impl_setReorderable(false);
+      timeSumColumn.setReorderable(false);
       this.workTableTreeView.getColumns().add(timeSumColumn);
 
       final TreeTableColumn<TableRow, Button> buttonColumn = new TreeTableColumn<>("Controls");
       buttonColumn.setCellValueFactory(new TreeItemPropertyValueFactory<TableRow, Button>("buttonBox"));
       buttonColumn.setMinWidth(100);
       buttonColumn.setSortable(false);
-      buttonColumn.impl_setReorderable(false);
+      buttonColumn.setReorderable(false);
       this.workTableTreeView.getColumns().add(buttonColumn);
 
       workTableTreeView.setShowRoot(false);