Merge branch 'main' into refine-intellij-howto

.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"
         }

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
 

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

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
@@ -48,6 +48,7 @@ java {
     modularity.inferModulePath.set(false)
 
     toolchain {
+        // If this is updated, also update .devcontainer/devcontainer.json#L34
         languageVersion = JavaLanguageVersion.of(20)
     }
 }
@@ -129,15 +130,15 @@ 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'
 
     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'
@@ -212,7 +213,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
@@ -222,7 +223,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'

settings.gradle

@@ -7,4 +7,8 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+}
+
 rootProject.name = "jabref"

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;
 

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"));
         }

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.