Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update to jdk 13.0.2 (#5924)
  Update Eclipse config
  Update open OpenOfficePanel to show buttons in three rows of three. (#5789)
  update to javafx 13.02 (#5921)

.github/workflows/check-outdated-dependencies.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 13
+        java-version: 13.0.2
     - name: Look for outdated dependencies
       run: ./gradlew -q checkOutdatedDependencies
     - name: Report issues

.github/workflows/deployment.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 13
+          java-version: 13.0.2
       # configuration based on https://github.com/actions/cache/blob/master/examples.md#java---gradle
       - uses: actions/cache@v1
         name: Restore gradle cache

.github/workflows/tests-fetchers.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 13
+          java-version: 13.0.2
       - uses: actions/cache@v1
         name: Restore gradle chache
         with:

.github/workflows/tests-oracle.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 13
+          java-version: 13.0.2
       - uses: actions/cache@v1
         name: Restore gradle chache
         with:

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 13
+          java-version: 13.0.2
       - uses: actions/cache@v1
         name: Restore gradle cache
         with:

CHANGELOG.md

@@ -12,6 +12,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- we changed the open office panel to show buttons in rows of three instead of going straight down to save space as the button expanded out to take up unnecessary horizontal space [#5479] (https://github.com/JabRef/jabref/issues/5479)
 
 - We cleaned up the group add/edit dialog. [#5826](https://github.com/JabRef/jabref/pull/5826)
 - We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)

build.gradle

@@ -102,7 +102,7 @@ configurations {
 }
 
 javafx {
-    version = "13.0.1"
+    version = "13.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 

docs/guidelines-for-setting-up-a-local-workspace.md

@@ -25,7 +25,7 @@ If you do not yet have a GitHub account, please [create one](https://github.com/
 
 ### IDE
 
-We suggest [IntelliJ](https://www.jetbrains.com/idea/) or [Eclipse](https://eclipse.org/) (`2019-06` or newer).
+We suggest [IntelliJ](https://www.jetbrains.com/idea/) or [Eclipse](https://eclipse.org/) (`2019-12` or newer).
 
 Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community](https://help.ubuntu.com/community/EclipseIDE#Download_Eclipse) or the [step-by-step guideline from Krizna](www.krizna.com/ubuntu/install-eclipse-in-ubuntu-12-04/) to install Eclipse. Under Windows, download it from [www.eclipse.org](http://www.eclipse.org/downloads/) and run the installer.
 
@@ -148,6 +148,8 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
 
 ### Setup for Eclipse
 
+Make sure your Eclipse installation us up to date, Eclipse 2019-12 or newer is required.
+
 1. Run `./gradlew run` to generate all resources and to check if JabRef runs.
    * The JabRef GUI should finally appear.
    * This step is only required once.
@@ -157,12 +159,15 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
    * Usually, the folder `plugins` must be created for that.
 4. Open or import the existing project in Eclipse as Java project.
    * Remark: Importing it as gradle project will not work correctly.
+   * Refresh the project in Eclipse
 5. Create a run/debug configuration for the main class `org.jabref.JabRefLauncher` and/or for `org.jabref.JabRefMain` (both can be used equivalently)
-   * In the tab "Arguments" of the run/debug configuration, enter the same runtime VM arguments as above for intelliJ:
+   * In the tab "Arguments" of the run/debug configuration, enter the following runtime VM arguments:
      * Set "VM Arguments" to:
-
+     
     ```
-    --patch-module org.jabref=build/resources/main
+    --patch-module test=fastparse_2.12-1.0.0.jar
+    --patch-module test2=fastparse-utils_2.12-1.0.0.jar
+    --patch-module test3=sourcecode_2.12-0.1.4.jar
     --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref
     --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref
     --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls
@@ -178,15 +183,7 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
     --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls
     --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix
     --add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle
-    --add-opens javafx.controls/javafx.scene.control=org.jabref
-    --add-opens org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref
-    --add-opens javafx.controls/javafx.scene.control.skin=org.controlsfx.controls
-    --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls
-    --add-opens javafx.controls/com.sun.javafx.scene.control=org.jabref
-    --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix
-    --add-opens javafx.base/com.sun.javafx.binding=com.jfoenix
-    --add-opens javafx.graphics/com.sun.javafx.stage=com.jfoenix
-    --add-opens javafx.base/com.sun.javafx.event=com.jfoenix
+    --patch-module org.jabref=build\resources\main
     ```
 
 6. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the Eclipse marketplace:
@@ -196,7 +193,6 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
    4. Click "Install" button next to the plugin
    5. Click "Finish"
 7. Now you can build and run/debug the application by either using "JabRefLauncher" or "JabRefMain". This is the recommended way, since the application starts quite fast.
-   * Alternatively, it is still possible to start the application from the terminal by executing `./gradlew run`, but the application will start significantly slower.
 
 ## Final comments
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java

@@ -269,8 +269,18 @@ private void initPanel() {
         hbox.getChildren().addAll(connect, manualConnect, selectDocument, update, help);
         hbox.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS));
 
+        VBox row1 = new VBox();
+        VBox row2 = new VBox();
+        VBox row3 = new VBox();
+        row1.getChildren().addAll(setStyleFile,pushEntries, pushEntriesInt);
+        row2.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge);
+        row3.getChildren().addAll(manageCitations, exportCitations, settingsB);
+        HBox hbox1 =  new HBox();
+        hbox1.getChildren().addAll(row1,row2,row3);
+        hbox1.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS));
+
         vbox.setFillWidth(true);
-        vbox.getChildren().addAll(hbox, setStyleFile, pushEntries, pushEntriesInt, pushEntriesAdvanced, pushEntriesEmpty, merge, manageCitations, exportCitations, settingsB);
+        vbox.getChildren().addAll(hbox, hbox1);
     }
 
     private void exportEntries() {