From c3363c041e246062163758bf2e6a18569b5050ca Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2020 10:50:23 +0100 Subject: [PATCH 1/5] Bump org.beryx.jlink from 2.17.0 to 2.17.1 (#5913) Bumps org.beryx.jlink from 2.17.0 to 2.17.1. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 039733b7602..6e877908629 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'com.github.ben-manes.versions' version '0.27.0' id 'org.javamodularity.moduleplugin' version '1.5.0' id 'org.openjfx.javafxplugin' version '0.0.8' - id 'org.beryx.jlink' version '2.17.0' + id 'org.beryx.jlink' version '2.17.1' // nicer test outputs during running and completion id 'com.adarshr.test-logger' version '2.0.0' From 789363159694a0cf811c6994fd278d306e7935a7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2020 10:50:42 +0100 Subject: [PATCH 2/5] Bump mariadb-java-client from 2.5.3 to 2.5.4 (#5914) Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.5.3 to 2.5.4. - [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases) - [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md) - [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.5.3...2.5.4) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6e877908629..485c66ed773 100644 --- a/build.gradle +++ b/build.gradle @@ -140,7 +140,7 @@ dependencies { antlr4 'org.antlr:antlr4:4.8-1' compile 'org.antlr:antlr4-runtime:4.8-1' - compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.5.3' + compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.5.4' compile 'org.postgresql:postgresql:42.2.9' From 0d42a87e90d8fe1b58560cca65379afc45a26cf9 Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com> Date: Mon, 3 Feb 2020 22:21:15 +0100 Subject: [PATCH 3/5] Added update method to typePropertyListeners (#5917) --- src/main/java/org/jabref/gui/entryeditor/SourceTab.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java index 8ac69be215b..47d93fad9cb 100644 --- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java +++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java @@ -240,6 +240,7 @@ protected void bindToEntry(BibEntry entry) { updateCodeArea(); + entry.typeProperty().addListener(listener -> updateCodeArea()); entry.getFieldsObservable().addListener((InvalidationListener) listener -> updateCodeArea()); } From 5c101d1e132955453a12ebff6d3747c57409f155 Mon Sep 17 00:00:00 2001 From: systemoperator <3658393+systemoperator@users.noreply.github.com> Date: Mon, 3 Feb 2020 22:22:05 +0100 Subject: [PATCH 4/5] ide-setup updated (#5915) --- .../guidelines-for-setting-up-a-local-workspace.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/guidelines-for-setting-up-a-local-workspace.md b/docs/guidelines-for-setting-up-a-local-workspace.md index bc26cccb89b..ebd7f2ebfec 100644 --- a/docs/guidelines-for-setting-up-a-local-workspace.md +++ b/docs/guidelines-for-setting-up-a-local-workspace.md @@ -69,10 +69,10 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community] --add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref ``` -5. Use IntellJ to build and run (instead of gradle): +5. Use IntelliJ to build and run (instead of gradle): * File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle: * Set "Build and run using" and "Run tests using" both to "IntelliJ IDEA" -6. Ensure that the JDK13 is enabled for Gradle: Use IntellJ to build and run (instead of gradle): +6. Ensure that the JDK13 is enabled for Gradle: Use IntelliJ to build and run (instead of gradle): * File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle -> Gradle: * Set "Gradle JVM" to "JDK13" 7. Use the provided code style: @@ -146,17 +146,17 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community] 5. Now you can also select "jabref [run]" and either run or debug the application from within IntelliJ. * Equivalently, this can also be executed from the terminal by running `./gradlew run`. - ### Setup for Eclipse -1. Run `./gradlew run` to generate all resources and to check if jabref runs. +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. 2. Run `./gradlew eclipse` * **This must always be executed, when there are new upstream changes.** -3. Copy the file `Log4jPlugins.java` from `build\generated\sources\annotationProcessor\java\main\org\jabref\gui\logging\plugins` to `src/main/java/org/jabref/gui/logging/plugins/` +3. Copy the file `Log4jPlugins.java` from `build/generated/sources/annotationProcessor/java/main/org/jabref/gui/logging/plugins` to `src/main/java/org/jabref/gui/logging/plugins/` * Usually, the folder `plugins` must be created for that. -4. Open or import the existing project in Eclipse as Java project. Import as gradle project will not work correctly. +4. Open or import the existing project in Eclipse as Java project. + * Remark: Importing it as gradle project will not work correctly. 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: * Set "VM Arguments" to: @@ -189,7 +189,7 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community] --add-opens javafx.base/com.sun.javafx.event=com.jfoenix ``` -6. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the eclipse marketplace: +6. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the Eclipse marketplace: 1. Help -> Eclipse Marketplace... -> Search tab 2. Enter "e(fx)clipse" in the search dialogue 3. Click "Go" From 7a9f2960305cc0489b82b053287bc218ec14166f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 4 Feb 2020 19:57:02 +0100 Subject: [PATCH 5/5] Update JDK14 from EA 30 to EA 34 (#5910) * Update JDK14 from EA 30 to EA 34 * Fail at the end * Revert to fail fast Co-authored-by: Christoph --- .github/workflows/deployment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 1ec924c9f1c..5439fa43383 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -23,17 +23,17 @@ jobs: include: - os: ubuntu-latest displayName: linux - jpackageDownload: https://download.java.net/java/early_access/jdk14/30/GPL/openjdk-14-ea+30_linux-x64_bin.tar.gz + jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_linux-x64_bin.tar.gz jdk14Path: /jdk-14 archivePortable: tar -c -C build/distribution JabRef | pigz --rsyncable > build/distribution/JabRef-portable_linux.tar.gz && rm -R build/distribution/JabRef - os: windows-latest displayName: windows - jpackageDownload: https://download.java.net/java/early_access/jdk14/30/GPL/openjdk-14-ea+30_windows-x64_bin.zip + jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_windows-x64_bin.zip jdk14Path: /jdk-14 archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef - os: macOS-latest displayName: macOS - jpackageDownload: https://download.java.net/java/early_access/jdk14/30/GPL/openjdk-14-ea+30_osx-x64_bin.tar.gz + jpackageDownload: https://download.java.net/java/early_access/jdk14/34/GPL/openjdk-14-ea+34_osx-x64_bin.tar.gz jdk14Path: /jdk-14.jdk/Contents/Home archivePortable: brew install pigz && tar -c -C build/distribution JabRef.app | pigz --rsyncable > build/distribution/JabRef-portable_macos.tar.gz && rm -R build/distribution/JabRef.app