Merge remote-tracking branch 'upstream/main' into jdk17

* upstream/main: (24 commits)
  Support CrossRef in CSL styles (#8454)
  Update FUNDING.yml (#8473)
  Update to Javafx 17.02 (#8470)
  Made search button in Web search wider. Also skewed side panel titles to the left (#8463)
  Bump h2-mvstore from 2.0.206 to 2.1.210 in /buildSrc (#8458)
  Bump mariadb-java-client from 2.7.4 to 2.7.5 (#8457)
  Bump com.github.andygoossens.modernizer from 1.6.1 to 1.6.2 (#8459)
  Bump mockito-core from 4.2.0 to 4.3.0 (#8460)
  Bump xmlunit-matchers from 2.8.3 to 2.8.4 (#8461)
  Improve error handling for browser extension (#8432)
  New Crowdin updates (#8451)
  Fix library tab exception when saving prefs (#8450)
  Rename Groups interface into Groups (#8449)
  New Crowdin updates (#8445)
  update snap url
  Update bug_report.yml for 5.5
  Show development information\n\n+semver: minor
  Release v5.5
  Update journal abbrev list
  New Crowdin updates (#8439)
  ...

Author: Siedlerchr

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: JabRef
 patreon: # Patreon user account
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,7 @@ body:
     attributes:
       label: JabRef version
       options:
-        - "5.4 (latest release)"
+        - "5.5 (latest release)"
         - "3.8.2"
         - Latest development branch build (please note build date below)
         - Other (please describe below)

CHANGELOG.md

@@ -13,7 +13,35 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Changed
 
+- The CSL preview styles now also support displaying data from cross references entries that are linked via the `crossref` field [#7378](https://github.com/JabRef/jabref/issues/7378)
+- We made the Search button in Web Search wider. We also skewed the panel titles to the left [#8397](https://github.com/JabRef/jabref/issues/8397)
+
+### Fixed
+
+- We fixed an issue where an exception could occur when saving the preferences [#7614](https://github.com/JabRef/jabref/issues/7614)
+
+### Removed
+
+- We removed the option to copy CSL Citation styles data as `XSL_FO`, `ASCIIDOC`, and `RTF` as these haven not been working since a long time and are no longe rsupported in the external library used for processing the styles [#7378](https://github.com/JabRef/jabref/issues/7378)
+
+
+
+
+
+
+
+
+
+
+
+
+
+## [5.5] - 2022-01-17
+
+### Changed
+
 - We integrated the external file types dialog directly inside the preferences. [#8341](https://github.com/JabRef/jabref/pull/8341)
+- We disabled the add group button color change after adding 10 new groups. [#8051](https://github.com/JabRef/jabref/issues/8051)
 - We inverted the logic for resolving [BibTeX strings](https://docs.jabref.org/advanced/strings). This helps to keep `#` chars. By default String resolving is only activated for a couple of standard fields. The list of fields can be modified in the preferences. [#7010](https://github.com/JabRef/jabref/issues/7010), [#7102](https://github.com/JabRef/jabref/issues/7012), [#8303](https://github.com/JabRef/jabref/issues/8303)
 - We moved the search box in preview preferences closer to the available citation styles list. [#8370](https://github.com/JabRef/jabref/pull/8370)
 - Changing the preference to show the preview panel as a separate tab now has effect without restarting JabRef. [#8370](https://github.com/JabRef/jabref/pull/8370)
@@ -32,20 +60,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed a typo in the library properties tab: "String constants". There, one can configure [BibTeX string constants](https://docs.jabref.org/advanced/strings).
 - We fixed an issue when writing a non-UTF-8 encoded file: The header is written again. [#8417](https://github.com/JabRef/jabref/issues/8417)
 
-### Removed
-
-
-
-
-
-
-
-
-
-
-
-
-
 ## [5.4] - 2021-12-20
 
 ### Added
@@ -731,7 +745,8 @@ The changelog of JabRef 4.x is available at the [v4.3.1 tag](https://github.com/
 The changelog of JabRef 3.x is available at the [v3.8.2 tag](https://github.com/JabRef/jabref/blob/v3.8.2/CHANGELOG.md).
 The changelog of JabRef 2.11 and all previous versions is available as [text file in the v2.11.1 tag](https://github.com/JabRef/jabref/blob/v2.11.1/CHANGELOG).
 
-[Unreleased]: https://github.com/JabRef/jabref/compare/v5.4...HEAD
+[Unreleased]: https://github.com/JabRef/jabref/compare/v5.5...HEAD
+[5.5]: https://github.com/JabRef/jabref/compare/v5.4...v5.5
 [5.4]: https://github.com/JabRef/jabref/compare/v5.3...v5.4
 [5.3]: https://github.com/JabRef/jabref/compare/v5.2...v5.3
 [5.2]: https://github.com/JabRef/jabref/compare/v5.1...v5.2

build.gradle

@@ -10,7 +10,7 @@ import org.jabref.build.xjc.XjcTask
 plugins {
     id 'application'
 
-    id 'com.github.andygoossens.modernizer' version '1.6.1'
+    id 'com.github.andygoossens.modernizer' version '1.6.2'
 
     id 'me.champeau.gradle.jmh' version '0.5.3'
 
@@ -106,7 +106,7 @@ configurations {
 }
 
 javafx {
-    version = "17.0.1"
+    version = "17.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 
@@ -119,7 +119,7 @@ dependencies {
     implementation 'org.apache.pdfbox:xmpbox:2.0.25'
 
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0'
-    implementation 'com.h2database:h2-mvstore:2.0.206'
+    implementation 'com.h2database:h2-mvstore:2.1.210'
 
     implementation group: 'org.apache.tika', name: 'tika-core', version: '2.2.1'
 
@@ -145,7 +145,7 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.1'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.1'
 
-    implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.4'
+    implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.5'
 
     implementation 'org.postgresql:postgresql:42.3.1'
 
@@ -176,7 +176,7 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'com.konghq:unirest-java:3.13.6'
 
-    implementation 'org.slf4j:slf4j-api:2.0.0-alpha5'
+    implementation 'org.slf4j:slf4j-api:2.0.0-alpha6'
     implementation "org.tinylog:tinylog-api:2.4.1"
     implementation "org.tinylog:slf4j-tinylog:2.4.1"
     implementation "org.tinylog:tinylog-impl:2.4.1"
@@ -208,9 +208,9 @@ dependencies {
 
     testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
     testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
-    testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.mockito:mockito-core:4.3.0'
     testImplementation 'org.xmlunit:xmlunit-core:2.8.4'
-    testImplementation 'org.xmlunit:xmlunit-matchers:2.8.3'
+    testImplementation 'org.xmlunit:xmlunit-matchers:2.8.4'
     testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.22.0'
     testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.22.0'
     testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT"

buildSrc/build.gradle

@@ -6,9 +6,9 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.h2database:h2-mvstore:2.0.206'
+    implementation 'com.h2database:h2-mvstore:2.1.210'
     implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'org.slf4j:slf4j-api:2.0.0-alpha5'
+    implementation 'org.slf4j:slf4j-api:2.0.0-alpha6'
 }
 
 sourceSets{

buildres/csl/csl-styles/chicago-annotated-bibliography.csl

@@ -185,7 +185,7 @@
           <text macro="editor"/>
           <text macro="translator"/>
           <choose>
-            <if type="webpage post-weblog" match="any">
+            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
               <text variable="container-title"/>
             </if>
           </choose>

buildres/csl/csl-styles/chicago-fullnote-bibliography-16th-edition.csl

@@ -181,6 +181,11 @@
         <substitute>
           <text macro="editor"/>
           <text macro="translator"/>
+          <choose>
+            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
+              <text variable="container-title"/>
+            </if>
+          </choose>
         </substitute>
       </names>
       <text macro="recipient"/>

buildres/csl/csl-styles/chicago-fullnote-bibliography-short-title-subsequent.csl

@@ -35,7 +35,7 @@
     <category citation-format="note"/>
     <category field="generic-base"/>
     <summary>Chicago format with full notes and bibliography</summary>
-    <updated>2020-01-12T12:00:00+00:00</updated>
+    <updated>2017-10-12T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -186,7 +186,7 @@
           <text macro="editor"/>
           <text macro="translator"/>
           <choose>
-            <if type="webpage post-weblog" match="any">
+            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
               <text variable="container-title"/>
             </if>
           </choose>

buildres/csl/csl-styles/chicago-fullnote-bibliography-with-ibid.csl

@@ -185,7 +185,7 @@
           <text macro="editor"/>
           <text macro="translator"/>
           <choose>
-            <if type="webpage post-weblog" match="any">
+            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
               <text variable="container-title"/>
             </if>
           </choose>

buildres/csl/csl-styles/chicago-fullnote-bibliography.csl

@@ -185,7 +185,7 @@
           <text macro="editor"/>
           <text macro="translator"/>
           <choose>
-            <if type="webpage post-weblog" match="any">
+            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
               <text variable="container-title"/>
             </if>
           </choose>