From 4225a9df5cbc3c9b072dd605ffff8cfaa8ef9a5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:58:01 +0000 Subject: [PATCH 1/9] Bump com.h2database:h2-mvstore from 2.2.220 to 2.2.222 Bumps [com.h2database:h2-mvstore](https://github.com/h2database/h2database) from 2.2.220 to 2.2.222. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.2.220...version-2.2.222) --- updated-dependencies: - dependency-name: com.h2database:h2-mvstore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4409392726..fa3c3fc336d 100644 --- a/build.gradle +++ b/build.gradle @@ -129,7 +129,7 @@ dependencies { implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.10.0' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0' - implementation 'com.h2database:h2-mvstore:2.2.220' + implementation 'com.h2database:h2-mvstore:2.2.222' // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 implementation 'org.bouncycastle:bcprov-jdk18on:1.76' From 5ffd57da69317149dadbcca5a60200b0eeb788d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:58:05 +0000 Subject: [PATCH 2/9] Bump org.libreoffice:libreoffice from 7.5.3 to 7.6.0 Bumps org.libreoffice:libreoffice from 7.5.3 to 7.6.0. --- updated-dependencies: - dependency-name: org.libreoffice:libreoffice dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4409392726..d9eac1a4af5 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ dependencies { implementation 'commons-cli:commons-cli:1.5.0' implementation 'org.libreoffice:unoloader:7.6.0' - implementation 'org.libreoffice:libreoffice:7.5.3' + implementation 'org.libreoffice:libreoffice:7.6.0' implementation 'io.github.java-diff-utils:java-diff-utils:4.12' implementation 'info.debatty:java-string-similarity:2.0.0' From 2a5a23b09725c5e1ec06bb7c41c6a69f6e3e8322 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:58:13 +0000 Subject: [PATCH 3/9] Bump org.openrewrite.rewrite from 6.1.25 to 6.3.2 Bumps org.openrewrite.rewrite from 6.1.25 to 6.3.2. --- updated-dependencies: - dependency-name: org.openrewrite.rewrite dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4409392726..0094184c5a9 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'idea' - id 'org.openrewrite.rewrite' version '6.1.25' + id 'org.openrewrite.rewrite' version '6.3.2' } // Enable following for debugging From bd88993e9a4b0c0564e61542c5b7ef044a83088e Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 4 Sep 2023 19:55:14 +0200 Subject: [PATCH 4/9] Update LICENSE.md (#10320) --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 538e59baf7e..410b297cab4 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright © 2003-2021 [JabRef Authors](https://github.com/JabRef/jabref/blob/master/AUTHORS) +Copyright © 2003-2023 [JabRef Authors](https://github.com/JabRef/jabref/blob/master/AUTHORS) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 42b649c2ef4dd78718c34d806d69c64a468645c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 07:43:25 +0200 Subject: [PATCH 5/9] Bump net.harawata:appdirs from 1.2.1 to 1.2.2 (#10311) Bumps [net.harawata:appdirs](https://github.com/harawata/appdirs) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/harawata/appdirs/releases) - [Commits](https://github.com/harawata/appdirs/compare/appdirs-1.2.1...appdirs-1.2.2) --- updated-dependencies: - dependency-name: net.harawata:appdirs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4409392726..5e6b2de37fd 100644 --- a/build.gradle +++ b/build.gradle @@ -212,7 +212,7 @@ dependencies { implementation 'com.vladsch.flexmark:flexmark:0.64.8' - implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1' + implementation group: 'net.harawata', name: 'appdirs', version: '1.2.2' implementation group: 'org.jooq', name: 'jool', version: '0.9.15' // JAX-RS implemented by Jersey From 20ee99ea262b323b1c0fcb20ecd0532e6ccaacdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 18:13:24 +0200 Subject: [PATCH 6/9] Bump org.glassfish.hk2:hk2-api from 2.6.1 to 3.0.4 (#10314) Bumps [org.glassfish.hk2:hk2-api](https://github.com/eclipse-ee4j/glassfish-hk2) from 2.6.1 to 3.0.4. - [Changelog](https://github.com/eclipse-ee4j/glassfish-hk2/blob/master/CHANGELOG) - [Commits](https://github.com/eclipse-ee4j/glassfish-hk2/commits) --- updated-dependencies: - dependency-name: org.glassfish.hk2:hk2-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index da73fc2caaa..c0f27554b12 100644 --- a/build.gradle +++ b/build.gradle @@ -222,7 +222,7 @@ dependencies { implementation 'org.glassfish.jersey.core:jersey-server:3.1.1' // injection framework implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.3' - implementation 'org.glassfish.hk2:hk2-api:2.6.1' + implementation 'org.glassfish.hk2:hk2-api:3.0.4' // testImplementation 'org.glassfish.hk2:hk2-testing:3.0.4' // implementation 'org.glassfish.hk2:hk2-testing-jersey:3.0.4' // testImplementation 'org.glassfish.hk2:hk2-junitrunner:3.0.4' From 1cc1d668712807b5b1422811779c02245a07d003 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 6 Sep 2023 00:27:40 +0200 Subject: [PATCH 7/9] Fix hint to menu --- src/main/java/org/jabref/gui/JabRefFrame.java | 2 +- src/main/resources/l10n/JabRef_en.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index e789ffa10c8..13c14ccfea4 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -325,7 +325,7 @@ private void showTrackingNotification() { if (!telemetryPreferences.shouldCollectTelemetry()) { shouldCollect = dialogService.showConfirmationDialogAndWait( Localization.lang("Telemetry: Help make JabRef better"), - Localization.lang("To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via Options -> Preferences -> General."), + Localization.lang("To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via File -> Preferences -> General."), Localization.lang("Share anonymous statistics"), Localization.lang("Don't share")); } diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index 755783a49c5..cb7dc2846aa 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -1855,7 +1855,7 @@ Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef=Collect and shar Don't\ share=Don't share Share\ anonymous\ statistics=Share anonymous statistics Telemetry\:\ Help\ make\ JabRef\ better=Telemetry: Help make JabRef better -To\ improve\ the\ user\ experience,\ we\ would\ like\ to\ collect\ anonymous\ statistics\ on\ the\ features\ you\ use.\ We\ will\ only\ record\ what\ features\ you\ access\ and\ how\ often\ you\ do\ it.\ We\ will\ neither\ collect\ any\ personal\ data\ nor\ the\ content\ of\ bibliographic\ items.\ If\ you\ choose\ to\ allow\ data\ collection,\ you\ can\ later\ disable\ it\ via\ Options\ ->\ Preferences\ ->\ General.=To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via Options -> Preferences -> General. +To\ improve\ the\ user\ experience,\ we\ would\ like\ to\ collect\ anonymous\ statistics\ on\ the\ features\ you\ use.\ We\ will\ only\ record\ what\ features\ you\ access\ and\ how\ often\ you\ do\ it.\ We\ will\ neither\ collect\ any\ personal\ data\ nor\ the\ content\ of\ bibliographic\ items.\ If\ you\ choose\ to\ allow\ data\ collection,\ you\ can\ later\ disable\ it\ via\ File\ ->\ Preferences\ ->\ General.=To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via File -> Preferences -> General. This\ file\ was\ found\ automatically.\ Do\ you\ want\ to\ link\ it\ to\ this\ entry?=This file was found automatically. Do you want to link it to this entry? Names\ are\ not\ in\ the\ standard\ %0\ format.=Names are not in the standard %0 format. From 9c4ca38f50e3aa042bc63e922f449cde739861b2 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 6 Sep 2023 10:03:06 +0200 Subject: [PATCH 8/9] Add requires on org.freedesktop.dbus (#10332) --- CHANGELOG.md | 1 + src/main/java/module-info.java | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6088e85301e..9c9f52321f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve ### Fixed - It is possible again to use "current table sort order" for the order of entries when saving. [#9869](https://github.com/JabRef/jabref/issues/9869) +- Passwords can be stored in GNOME key ring. [#10274](https://github.com/JabRef/jabref/issues/10274) ### Removed diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 1c2be7cf4a5..11e6cf9374e 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -115,6 +115,7 @@ requires com.h2database.mvstore; requires java.keyring; + requires org.freedesktop.dbus; requires org.jooq.jool; From 1dc08fceb6c3ae47764a17efcf3cfbb97e072967 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 6 Sep 2023 14:13:06 +0200 Subject: [PATCH 9/9] Fix devcontainer prebuilds (#10333) --- .devcontainer/devcontainer.json | 6 +++--- build.gradle | 1 + settings.gradle | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ddcb00c5a40..11163bde525 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Java", - "image": "mcr.microsoft.com/vscode/devcontainers/base:bullseye", + "image": "mcr.microsoft.com/devcontainers/base:debian", "customizations": { "vscode": { "extensions": [ @@ -14,7 +14,7 @@ // Source code generation needs to be done before hand-over to VS Code. // Otherwise, the Java extension will go mad. - "onCreateCommand": "./gradlew testClasses --no-daemon", + "onCreateCommand": "./gradlew testClasses --console=plain --no-daemon", // Forward the vncPort and noVNC port. // They are provided by desktop-lite: @@ -31,7 +31,7 @@ // Install java. // See https://github.com/devcontainers/features/tree/main/src/java#options for details. "ghcr.io/devcontainers/features/java:1": { - "version": "19.0.2-tem", + "version": "20.0.2-tem", "installGradle": false, "jdkDistro": "tem" } diff --git a/build.gradle b/build.gradle index c0f27554b12..479b29d3f93 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,7 @@ java { modularity.inferModulePath.set(false) toolchain { + // If this is updated, also update .devcontainer/devcontainer.json#L34 languageVersion = JavaLanguageVersion.of(20) } } diff --git a/settings.gradle b/settings.gradle index f6a8d740984..0d665b1d64f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,4 +7,8 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" +} + rootProject.name = "JabRef"