Merge branch 'main' into fix-for-issue-12274

.github/workflows/deployment-jdk-ea.yml

@@ -5,7 +5,7 @@ name: Deployment (JDK early access builds)
 
 on:
   schedule:
-    - cron: "0 18 * * 1"
+    - cron: "0 18 * * *"
   pull_request:
     paths:
       - .github/workflows/deployment-jdk-ea.yml

.github/workflows/product-map.yml

@@ -26,7 +26,7 @@ jobs:
       - name: ProductMap Map Generation
         uses: product-map/product-map-action@v1.0.15
         # disabled because of https://github.com/product-map/product-map-action/issues/7
-        if: false()
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           expected_files: ${{ env.expected_files }}

build.gradle

@@ -29,7 +29,7 @@ plugins {
 
     id 'idea'
 
-    id 'org.openrewrite.rewrite' version '7.1.0'
+    id 'org.openrewrite.rewrite' version '7.1.4'
 
     id "org.itsallcode.openfasttrace" version "3.0.1"
 }
@@ -244,7 +244,7 @@ dependencies {
     }
     implementation 'org.fxmisc.flowless:flowless:0.7.3'
     implementation 'org.fxmisc.richtext:richtextfx:0.11.4'
-    implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.89.0') {
+    implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.95.0') {
         exclude module: 'javax.inject' // Split package, use only jakarta.inject
         exclude module: 'commons-lang3'
         exclude group: 'org.apache.commons.validator'
@@ -386,8 +386,8 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:5.15.2'
     testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
     testImplementation 'org.xmlunit:xmlunit-matchers:2.10.0'
-    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.3.0'
-    testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.3.0'
+    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.4.0'
+    testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.4.0'
     testImplementation "org.testfx:testfx-core:4.0.16-alpha"
     testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
     testImplementation "org.hamcrest:hamcrest-library:3.0"
@@ -396,7 +396,7 @@ dependencies {
     // recommended by https://github.com/wiremock/wiremock/issues/2149#issuecomment-1835775954
     testImplementation 'org.wiremock:wiremock-standalone:3.10.0'
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:10.21.1'
+    checkstyle 'com.puppycrawl.tools:checkstyle:10.21.2'
     // xjc needs the runtime as well for the ant task, otherwise it fails
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'

src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java

@@ -40,7 +40,7 @@ public class BiodiversityLibrary implements SearchBasedParserFetcher, Customizab
 
     private static final String BASE_URL = "https://www.biodiversitylibrary.org/api3";
     private static final String RESPONSE_FORMAT = "json";
-    private static final String TEST_URL_WITHOUT_API_KEY = "https://www.biodiversitylibrary.org/api3?apikey=";
+    private static final String TEST_URL_WIH_OPTIONAL_KEY = "https://www.biodiversitylibrary.org/api3?apikey=";
 
     private final ImporterPreferences importerPreferences;
 
@@ -55,7 +55,7 @@ public String getName() {
 
     @Override
     public String getTestUrl() {
-        return TEST_URL_WITHOUT_API_KEY;
+        return TEST_URL_WIH_OPTIONAL_KEY;
     }
 
     public URL getBaseURL() throws URISyntaxException, MalformedURLException {

src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java

@@ -39,7 +39,7 @@ public static Stream<Arguments> performSearch() {
                                 .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/25535")
                                 .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/34739")
                                 .withField(StandardField.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "poetry, love, warfare")
+                                .withField(StandardField.KEYWORDS, "poetry, love, warfare, thema EDItEUR::D Biography, Literature and Literary studies::DC Poetry::DCF Poetry by individual poets")
                                 .withField(StandardField.PUBLISHER, "punctum books"),
                         "i open fire"
                 ),
@@ -55,8 +55,7 @@ public static Stream<Arguments> performSearch() {
                                 .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/25287")
                                 .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/26303")
                                 .withField(StandardField.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "Open Access, Monographs, OAPEN Library, " +
-                                        "Directory of Open Access Books")
+                                .withField(StandardField.KEYWORDS, "Open Access, Monographs, OAPEN Library, Directory of Open Access Books, thema EDItEUR::G Reference, Information and Interdisciplinary subjects::GL Library and information sciences / Museology, thema EDItEUR::G Reference, Information and Interdisciplinary subjects::GP Research and information: general")
                                 .withField(StandardField.PUBLISHER, "Amsterdam University Press"),
                         "the deliverance of open access books"
                 ),
@@ -70,7 +69,7 @@ public static Stream<Arguments> performSearch() {
                                 .withField(StandardField.URL, "https://library.oapen.org/handle/20.500.12657/48312")
                                 .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/68086")
                                 .withField(StandardField.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "Religion")
+                                .withField(StandardField.KEYWORDS, "Religion, thema EDItEUR::Q Philosophy and Religion::QR Religion and beliefs::QRM Christianity::QRMF Christianity: sacred texts and revered writings::QRMF1 Bibles::QRMF13 New Testaments")
                                 .withField(StandardField.PUBLISHER, "Brill"),
                         "Four Kingdom Motifs before and beyond the Book of Daniel"
                 ),

src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java

@@ -38,6 +38,7 @@ class DoiFetcherTest {
             .withField(StandardField.PUBLISHER, "IEEE")
             .withField(StandardField.TITLE, "BPEL4Chor: Extending BPEL for Modeling Choreographies")
             .withField(StandardField.YEAR, "2007")
+            .withField(StandardField.PAGES, "296--303")
             .withField(StandardField.DOI, "10.1109/icws.2007.59");
     private final BibEntry bibEntryIannarelli2019 = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.AUTHOR,
@@ -54,7 +55,7 @@ class DoiFetcherTest {
             .withField(StandardField.YEAR, "2019")
             .withField(StandardField.DOI, "10.3303/CET1977146")
             .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
-            .withField(StandardField.PAGES, "871-876")
+            .withField(StandardField.PAGES, "871–876")
             .withField(StandardField.VOLUME, "77");
     private final BibEntry bibEntryStenzel2020 = new BibEntry(StandardEntryType.Article)
             .withCitationKey("Stenzel_2020")

src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java

@@ -51,10 +51,9 @@ void setUp() {
                 .withField(StandardField.ABSTRACT, "dummy")
                 .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
                 .withField(StandardField.DATE, "2017-11-24")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2017/1118")
-                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1118}")
+                .withField(StandardField.HOWPUBLISHED, "Cryptology {ePrint} Archive, Paper 2017/1118")
                 .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
+                .withField(StandardField.URL, "https://eprint.iacr.org/archive/versions/2017/1118/20171124:064527")
                 .withField(StandardField.VERSION, "20171124:064527")
                 .withField(StandardField.YEAR, "2017");
 
@@ -75,10 +74,9 @@ void setUp() {
                 .withField(StandardField.AUTHOR, "Christof Beierle and Thorsten Kranz and Gregor Leander")
                 .withField(StandardField.DATE, "2017-02-17")
                 .withField(StandardField.DOI, "10.1007/978-3-662-53018-4_23")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2016/119")
-                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2016/119}")
-                .withField(StandardField.TITLE, "Lightweight Multiplication in GF(2^n) with Applications to MDS Matrices")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2016/119/20170217:150415")
+                .withField(StandardField.HOWPUBLISHED, "Cryptology {ePrint} Archive, Paper 2016/119")
+                .withField(StandardField.TITLE, "Lightweight Multiplication in {GF}(2^n) with Applications to {MDS} Matrices")
+                .withField(StandardField.URL, "https://eprint.iacr.org/archive/versions/2016/119/20170217:150415")
                 .withField(StandardField.VERSION, "20170217:150415")
                 .withField(StandardField.YEAR, "2016");
 
@@ -87,10 +85,9 @@ void setUp() {
                 .withField(StandardField.ABSTRACT, "dummy")
                 .withField(StandardField.AUTHOR, "Sergi Delgado-Segura and Cristina Pérez-Solà and Guillermo Navarro-Arribas and Jordi Herrera-Joancomartí")
                 .withField(StandardField.DATE, "2018-01-19")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2017/1095")
-                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1095}")
-                .withField(StandardField.TITLE, "Analysis of the Bitcoin UTXO set")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1095/20180119:113352")
+                .withField(StandardField.HOWPUBLISHED, "Cryptology {ePrint} Archive, Paper 2017/1095")
+                .withField(StandardField.TITLE, "Analysis of the Bitcoin {UTXO} set")
+                .withField(StandardField.URL, "https://eprint.iacr.org/archive/versions/2017/1095/20180119:113352")
                 .withField(StandardField.VERSION, "20180119:113352")
                 .withField(StandardField.YEAR, "2017");
     }

src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java

@@ -35,7 +35,7 @@ private static Stream<Arguments> getDoiBibEntryPairs() {
                                         .withField(StandardField.DOI, "10.2143/TVF.80.3.3285690")
                                         .withField(StandardField.ISSN, "2031-8952, 2031-8952")
                                         .withField(StandardField.JOURNAL, "Tijdschrift voor Filosofie")
-                                        .withField(StandardField.PAGES, "625-629")
+                                        .withField(StandardField.PAGES, "625–629")
                         )),
 
                 Arguments.of("10.3303/CET1977146",
@@ -55,7 +55,7 @@ private static Stream<Arguments> getDoiBibEntryPairs() {
                                         .withField(StandardField.YEAR, "2019")
                                         .withField(StandardField.DOI, "10.3303/CET1977146")
                                         .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
-                                        .withField(StandardField.PAGES, "871-876")
+                                        .withField(StandardField.PAGES, "871–876")
                                         .withField(StandardField.VOLUME, "77"))),
                 Arguments.of("10.1400/115378",
                         Optional.of(

src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java

@@ -32,7 +32,6 @@ void setUp() {
                 .withField(StandardField.BOOKTITLE, "2009 35th Euromicro Conference on Software Engineering and Advanced Applications")
                 .withField(StandardField.PUBLISHER, "IEEE")
                 .withField(StandardField.TITLE, "BPELscript: A Simplified Script Syntax for WS-BPEL 2.0")
-                .withField(StandardField.VOLUME, "5331")
                 .withField(StandardField.YEAR, "2009")
                 .withField(StandardField.MONTH, "#aug#")
                 .withField(StandardField.PAGES, "39--46")

src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java

@@ -75,17 +75,18 @@ public void authorsAreCorrectlyFormatted() throws Exception {
         BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
                 .withField(StandardField.TITLE, "Repository")
                 .withField(StandardField.SUBTITLE, "Eine Einführung")
-                .withField(StandardField.PUBLISHER, "De Gruyter Oldenbourg")
+                .withField(StandardField.PUBLISHER, "Walter de Gruyter GmbH")
                 .withField(StandardField.AUTHOR, "Habermann, Hans-Joachim")
                 .withField(StandardField.ISBN, "9783110702125")
                 .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.ADDRESS, "München")
-                .withField(StandardField.EDITION, "Reprint 2020")
+                .withField(StandardField.ADDRESS, "Berlin/München/Boston")
+                .withField(StandardField.EDITION, "1st ed.")
                 .withField(StandardField.EDITOR, "Frank Leymann")
-                .withField(StandardField.NUMBER, "8.1")
-                .withField(StandardField.PAGETOTAL, "1294")
-                .withField(StandardField.SERIES, "Handbuch der Informatik")
-                .withField(new UnknownField("ppn_gvk"), "1738076555");
+                .withField(StandardField.NUMBER, "v.8.1")
+                .withField(StandardField.PAGETOTAL, "1296")
+                .withField(StandardField.SERIES, "Handbuch der Informatik Series")
+                .withField(StandardField.NOTE, "Description based on publisher supplied metadata and other sources.")
+                .withField(new UnknownField("ppn_gvk"), "1910493767");
 
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
         assertEquals(Optional.of(bibEntry), fetchedEntry);