Merge remote-tracking branch 'upstream/master' into test-module-issue

* upstream/master:
  Improve library loading UX (#7119)
  remove jython (#7157)
  Add missing authors
  Remove obsolete hint
  Fixed issue in PreviewView for number textfield (#7158)
  Fix for issue 6959 (#7151)
  Revert "remove jython (#7155)" (#7156)
  remove jython (#7155)
  Fix remembering password for sql db (#7154)
  Update to libre office 7.0.3 (#7150)
  Add IdBasedSearchFetcher to jstor (#7145)
  Squashed 'src/main/resources/csl-styles/' changes from 55200d0..a20406d
  Bump antlr4-runtime from 4.8-1 to 4.9 (#7136)

AUTHORS

@@ -182,6 +182,7 @@ Jeffrey Kuhn
 Jeffrey Sander
 Jens Döcke
 joeyzgraggen
+Johan Del Valle
 Johannes Hupe
 Johannes Manner
 Johannes Theiner
@@ -234,6 +235,7 @@ Lucas Beretti
 Luciana de Melo e Abud
 Lugduni Desrosiers
 Luis Romero
+Luis Valdez
 Mairieli Wessel
 Malik Atalla
 Malte Deiseroth

CHANGELOG.md

@@ -12,6 +12,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
+- We added a validation to check if the current database location is shared, preventing an exception when Pulling Changes From Shared Database. [#6959](https://github.com/JabRef/jabref/issues/6959)
 - We added a query parser and mapping layer to enable conversion of queries formulated in simplified lucene syntax by the user into api queries. [#6799](https://github.com/JabRef/jabref/pull/6799)
 - We added some basic functionality to customise the look of JabRef by importing a css theme file. [#5790](https://github.com/JabRef/jabref/issues/5790)
 - We added connection check function in network preference setting [#6560](https://github.com/JabRef/jabref/issues/6560)
@@ -76,6 +77,7 @@ inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://git
 - We fixed an issue where the color of groups of type "free search expression" not persisting after restarting the application [#6999](https://github.com/JabRef/jabref/issues/6999)
 - We fixed an issue where modifications in the source tab where not saved without switching to another field before saving the library [#6622](https://github.com/JabRef/jabref/issues/6622)
 - We fixed an issue where the "Document Viewer" did not show the first page of the opened pdf document and did not show the correct total number of pages [#7108](https://github.com/JabRef/jabref/issues/7108)
+- We fixed an issue where the password for a shared SQL database was not remembered [#6869](https://github.com/JabRef/jabref/issues/6869)
 
 ### Removed
 

build.gradle

@@ -1,7 +1,6 @@
 import groovy.json.JsonSlurper
 import org.gradle.internal.os.OperatingSystem
 import org.jabref.build.JournalAbbreviationConverter
-import org.jabref.build.localization.LocalizationPlugin
 import org.jabref.build.xjc.XjcPlugin
 import org.jabref.build.xjc.XjcTask
 
@@ -30,7 +29,6 @@ apply plugin: 'jacoco'
 apply plugin: 'me.champeau.gradle.jmh'
 apply plugin: 'checkstyle'
 apply plugin: XjcPlugin
-apply plugin: LocalizationPlugin
 
 apply from: 'eclipse.gradle'
 
@@ -85,7 +83,6 @@ repositories {
 }
 
 configurations {
-    libreoffice
     antlr3
     antlr4
     // TODO: Remove the following workaround for split error messages such as
@@ -118,14 +115,8 @@ dependencies {
 
     implementation 'commons-cli:commons-cli:1.4'
 
-    // For Java 9+ compatibility, we include a bundled version of the libreoffice libraries
-    // See https://bugs.documentfoundation.org/show_bug.cgi?id=117331#c8 for background information
-    // Use the task bundleLibreOffice to update the bundled jar
-    // DO NOT CHANGE THE libreoffice PREFIX
-    libreoffice 'org.libreoffice:juh:6.4.3'
-    libreoffice 'org.libreoffice:jurt:6.4.3'
-    libreoffice 'org.libreoffice:ridl:6.4.3'
-    libreoffice 'org.libreoffice:unoil:6.4.3'
+    implementation 'org.libreoffice:libreoffice:7.0.3'
+    implementation 'org.libreoffice:unoloader:7.0.3'
 
     implementation 'io.github.java-diff-utils:java-diff-utils:4.9'
     implementation 'info.debatty:java-string-similarity:2.0.0'
@@ -134,7 +125,7 @@ dependencies {
     implementation 'org.antlr:antlr-runtime:3.5.2'
 
     antlr4 'org.antlr:antlr4:4.9'
-    implementation 'org.antlr:antlr4-runtime:4.8-1'
+    implementation 'org.antlr:antlr4-runtime:4.9'
 
     implementation (group: 'org.apache.lucene', name: 'lucene-queryparser', version: '8.7.0') {
         exclude group: 'org.apache.lucene', module: 'lucene-sandbox'
@@ -221,7 +212,6 @@ dependencies {
 
     checkstyle 'com.puppycrawl.tools:checkstyle:8.38'
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.3'
-    jython 'org.python:jython-standalone:2.7.2'
 }
 
 dependencyUpdates {
@@ -332,7 +322,7 @@ task generateMedlineSource(type: XjcTask) {
     description = "Generates java files for the medline importer."
 
     schemaFile = "src/main/resources/xjc/medline/medline.xsd"
-    outputDirectory = "src/main/generated/"
+    outputDirectory = "src/main/generated"
     javaPackage = "org.jabref.logic.importer.fileformat.medline"
 }
 
@@ -341,7 +331,7 @@ task generateBibtexmlSource(type: XjcTask) {
     description = "Generates java files for the bibtexml importer."
 
     schemaFile = "src/main/resources/xjc/bibtexml/bibtexml.xsd"
-    outputDirectory = "src/main/generated"
+    outputDirectory = "src/main/generated/"
     javaPackage = "org.jabref.logic.importer.fileformat.bibtexml"
 }
 
@@ -440,7 +430,6 @@ javadoc {
     }
 }
 
-localization.script = 'scripts/syncLang.py'
 
 test {
     useJUnitPlatform {
@@ -770,13 +759,4 @@ task downloadDependencies {
     }
 }
 
-task bundleLibreOffice(type: Jar) {
-    from configurations.libreoffice.collect { zipTree it }
 
-    manifest {
-        attributes 'Automatic-Module-Name': 'org.jabref.thirdparty.libreoffice'
-    }
-
-    destinationDir = file('lib')
-    archiveName = 'libreoffice.jar'
-}

docs/getting-into-the-code/code-howtos.md

@@ -172,8 +172,9 @@ General hints:
 
 The tests check whether translation strings appear correctly in the resource bundles.
 
-1. Add new `Localization.lang("KEY")` to Java file. Run the `LocalizationConsistencyTest`under \(src/test/org.jabref.logic.l10n\)
-2. Tests fail. In the test output a snippet is generated which must be added to the English translation file. There is also a snippet generated for the non-English files, but this is irrelevant.
+1. Add new `Localization.lang("KEY")` to Java file. Run the `LocalizationConsistencyTest`under \(src/test/org.jabref.logic.
+\)
+2. Tests fail. In the test output a snippet is generated which must be added to the English translation file.
 3. Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`
 4. Please do not add translations for other languages directly in the properties. They will be overwritten by [Crowdin](https://crowdin.com/project/jabref)
 

scripts/generate-authors.sh

@@ -57,6 +57,6 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
     # authors %aN = author name
 
     # co-authors
-    coauthors=$(git log -i --grep=co-authored-by  | grep -i "co-authored-by" | sed "s/.*co-authored-by: \(.*\)/\1/I" | sed "s/ <.*//")
+    coauthors=$(git log -i --grep=co-authored-by  | grep -i "co-authored-by" | sed "s/.*co-authored-by: \(.*\)/\1/I" | grep -v "luis-valdez" | sed "s/ <.*//")
 	echo -e "$authors\n$(git log --format='%aN')\n$coauthors" | grep -v "\[bot\]" | grep -v "JabRef" | grep -v "Siedlerchr" | grep -v "^Christoph$" | grep -v "^Mootez$" | grep -v "oscargus" | grep -v "dependabot" | grep -v "github actions" | grep -v "igorsteinmacher" | grep -v "halirutan" | grep -v "matthiasgeiger" | grep -v "Gitter Badger" | grep -v "gdstewart" | grep -v "m-mauersberger" | grep -v "chenyuheng" | LC_ALL=C.UTF-8 sort --unique --ignore-case
 } > AUTHORS