From 13c1ff6f0fccf89deb2b3fc2e99239c795bea0af Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 29 Feb 2020 09:35:30 +0100 Subject: [PATCH 01/10] Update gradle from 6.2 to 6.2.1 (#6048) --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b7c8c5dbf58..4a6ebceacd2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index 9618d8d9607..62bd9b9ccef 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" From be9c788de804c2bd9e3abaf76b082b6b2e82e66f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 29 Feb 2020 09:39:25 +0100 Subject: [PATCH 02/10] Rephrase IntelliJ paragraph --- docs/guidelines-for-setting-up-a-local-workspace.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guidelines-for-setting-up-a-local-workspace.md b/docs/guidelines-for-setting-up-a-local-workspace.md index cd4ed16b91b..bf68939f02d 100644 --- a/docs/guidelines-for-setting-up-a-local-workspace.md +++ b/docs/guidelines-for-setting-up-a-local-workspace.md @@ -108,8 +108,8 @@ Equivalently, this can also be executed from the terminal by running `./gradlew #### Using IntelliJ's internal build system -You can use IntelliJ IDEA's internal build system for compiling and running JabRef during development which is -usually more responsive. However, **it's important** that you understand that JabRef relies on generated sources +You should use IntelliJ IDEA's internal build system for compiling and running JabRef during development, because it is +usually more responsive. Thereby, **it's important** that you understand that JabRef relies on generated sources which are only build through Gradle. Therefore, to build or update these dependencies you need to run the `assemble` Gradle task at least once. From 6d8efb6e8915b1fe16a9fa9c36b7953370395b44 Mon Sep 17 00:00:00 2001 From: github actions Date: Sun, 1 Mar 2020 02:09:42 +0000 Subject: [PATCH 03/10] Squashed 'src/main/resources/csl-styles/' changes from f03decef0e..566df871e2 566df871e2 Create archeologicke-rozhledy.csl (#4586) 420558620b Update mcgill-en.csl - include render-legislation macro (#4579) 7d857f1df5 Create journal-of-plankton-research.csl (#4581) 05c8aca5bd Update mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl (#4582) 564dc5f633 Update vodohospodarske-technicko-ekonomicke-informace.csl (#4584) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 566df871e2daa3c8903f8a31c92ccff338c21d14 --- archeologicke-rozhledy.csl | 303 ++++++++++++++++++ journal-of-plankton-research.csl | 144 +++++++++ mcgill-en.csl | 28 +- ...forderung-und-deutsch-als-zweitsprache.csl | 4 +- ...odarske-technicko-ekonomicke-informace.csl | 2 +- 5 files changed, 475 insertions(+), 6 deletions(-) create mode 100644 archeologicke-rozhledy.csl create mode 100644 journal-of-plankton-research.csl diff --git a/archeologicke-rozhledy.csl b/archeologicke-rozhledy.csl new file mode 100644 index 00000000000..9a018c99af0 --- /dev/null +++ b/archeologicke-rozhledy.csl @@ -0,0 +1,303 @@ + + diff --git a/journal-of-plankton-research.csl b/journal-of-plankton-research.csl new file mode 100644 index 00000000000..66ccbba36e9 --- /dev/null +++ b/journal-of-plankton-research.csl @@ -0,0 +1,144 @@ + + diff --git a/mcgill-en.csl b/mcgill-en.csl index 5b051d22006..ba9caaf08b9 100644 --- a/mcgill-en.csl +++ b/mcgill-en.csl @@ -274,6 +274,20 @@ all the other tests should have been done... --> + + + + + + + + + + + + + + @@ -386,6 +400,11 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar + + + + + @@ -445,9 +464,12 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar - - + + + + + @@ -507,9 +529,9 @@ Not implemented: "cited to" for cases construct short casenames adding ref to ar + - diff --git a/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl b/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl index 36732a6fb42..d5a271b2291 100644 --- a/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl +++ b/mercator-institut-fur-sprachforderung-und-deutsch-als-zweitsprache.csl @@ -14,7 +14,7 @@ Style for the Mercator-Institute for Literacy and Language Education in Cologne. Based on Waxmann Style which is based on the style for the German society for psychology, 4th style manual (Feb-2016). - 2018-10-30T15:11:15+00:00 + 2020-02-26T09:32:15+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -269,7 +269,7 @@ - + diff --git a/vodohospodarske-technicko-ekonomicke-informace.csl b/vodohospodarske-technicko-ekonomicke-informace.csl index 1f63dfb38d6..b28a6ab4547 100644 --- a/vodohospodarske-technicko-ekonomicke-informace.csl +++ b/vodohospodarske-technicko-ekonomicke-informace.csl @@ -438,7 +438,7 @@ - + From ed5309bc4dcdd904b82876f4bcc5e912b94770e5 Mon Sep 17 00:00:00 2001 From: github actions Date: Sun, 1 Mar 2020 02:09:45 +0000 Subject: [PATCH 04/10] Squashed 'src/main/resources/csl-locales/' changes from d73af4a3fe..2b94bf9fac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2b94bf9fac Fix markdown lint error "[no-literal-urls] Don’t use literal URLs without angle brackets" (#203) git-subtree-dir: src/main/resources/csl-locales git-subtree-split: 2b94bf9fac34a2f6b73f4d320144e5c0cb8a05bc --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 51c0e4e88d7..e9c46d11687 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,7 +1,7 @@ ## CSL Locales Pull Request Template You're about to create a pull request to the CSL locales repository. -If you haven't done so already, see http://docs.citationstyles.org/en/stable/translating-locale-files.html for instructions on how to translate CSL locale files, and https://github.com/citation-style-language/styles/blob/master/CONTRIBUTING.md on how to submit your changes. +If you haven't done so already, see for instructions on how to translate CSL locale files, and on how to submit your changes. In addition, please fill out the pull request template below. ### Description From 7804dbba04815a0890613beb32cb88a6e6912e39 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sun, 1 Mar 2020 21:17:00 +0100 Subject: [PATCH 05/10] New Crowdin translations (#6047) --- src/main/resources/l10n/JabRef_tr.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties index d69a1e59830..e52fe2704a7 100644 --- a/src/main/resources/l10n/JabRef_tr.properties +++ b/src/main/resources/l10n/JabRef_tr.properties @@ -2115,3 +2115,5 @@ Optional=Tercihe bağlı Required=Zorunlu Entry\ type\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Girdi türü boş olamaz. Lütfen bir isim giriniz. Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Alan boş olamaz. Lütfen bir isim giriniz. +Shared\ database=Paylaşılmış veritabanı +Lookup=Ara From 0d14227f5d4e0b8b5ffed173a82cdc9af5aaed57 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sun, 1 Mar 2020 21:34:43 +0100 Subject: [PATCH 06/10] Fix fetcher tests using correct month (#6050) --- .../importer/fetcher/AstrophysicsDataSystemTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java index 78e99bf780a..4925966752c 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java @@ -42,7 +42,7 @@ public void setUp() throws Exception { diezSliceTheoremEntry.setField(StandardField.EPRINT, "1812.04698"); diezSliceTheoremEntry.setField(StandardField.JOURNAL, "arXiv e-prints"); diezSliceTheoremEntry.setField(StandardField.KEYWORDS, "Mathematics - Differential Geometry, Mathematical Physics, 58B25, (58D19, 58B20, 22E99, 58A35)"); - diezSliceTheoremEntry.setField(StandardField.MONTH, "Dec"); + diezSliceTheoremEntry.setField(StandardField.MONTH, "#dec#"); diezSliceTheoremEntry.setField(StandardField.PAGES, "arXiv:1812.04698"); diezSliceTheoremEntry.setField(StandardField.EID, "arXiv:1812.04698"); diezSliceTheoremEntry.setField(StandardField.PRIMARYCLASS, "math.DG"); @@ -58,7 +58,7 @@ public void setUp() throws Exception { famaeyMcGaughEntry.setField(StandardField.JOURNAL, "Living Reviews in Relativity"); famaeyMcGaughEntry.setField(StandardField.YEAR, "2012"); famaeyMcGaughEntry.setField(StandardField.VOLUME, "15"); - famaeyMcGaughEntry.setField(StandardField.MONTH, "Sep"); + famaeyMcGaughEntry.setField(StandardField.MONTH, "#sep#"); famaeyMcGaughEntry.setField(StandardField.NUMBER, "1"); famaeyMcGaughEntry.setField(StandardField.ARCHIVEPREFIX, "arXiv"); famaeyMcGaughEntry.setField(StandardField.DOI, "10.12942/lrr-2012-10"); @@ -75,7 +75,7 @@ public void setUp() throws Exception { sunWelchEntry.setField(StandardField.AUTHOR, "Sun, Yanming and Welch, Gregory C. and Leong, Wei Lin and Takacs, Christopher J. and Bazan, Guillermo C. and Heeger, Alan J."); sunWelchEntry.setField(StandardField.DOI, "10.1038/nmat3160"); sunWelchEntry.setField(StandardField.JOURNAL, "Nature Materials"); - sunWelchEntry.setField(StandardField.MONTH, "Jan"); + sunWelchEntry.setField(StandardField.MONTH, "#jan#"); sunWelchEntry.setField(StandardField.NUMBER, "1"); sunWelchEntry.setField(StandardField.PAGES, "44-48"); sunWelchEntry.setField(StandardField.TITLE, "Solution-processed small-molecule solar cells with 6.7\\% efficiency"); @@ -89,7 +89,7 @@ public void setUp() throws Exception { xiongSunEntry.setField(StandardField.AUTHOR, "Xiong, Xiaoxiong and Sun, Junqiang and Barnes, William and Salomonson, Vincent and Esposito, Joseph and Erives, Hector and Guenther, Bruce"); xiongSunEntry.setField(StandardField.DOI, "10.1109/TGRS.2006.890567"); xiongSunEntry.setField(StandardField.JOURNAL, "IEEE Transactions on Geoscience and Remote Sensing"); - xiongSunEntry.setField(StandardField.MONTH, "Apr"); + xiongSunEntry.setField(StandardField.MONTH, "#apr#"); xiongSunEntry.setField(StandardField.NUMBER, "4"); xiongSunEntry.setField(StandardField.PAGES, "879-889"); xiongSunEntry.setField(StandardField.TITLE, "Multiyear On-Orbit Calibration and Performance of Terra MODIS Reflective Solar Bands"); @@ -105,7 +105,7 @@ public void setUp() throws Exception { ingersollPollardEntry.setField(StandardField.DOI, "10.1016/0019-1035(82)90169-5"); ingersollPollardEntry.setField(StandardField.JOURNAL, "\\icarus"); ingersollPollardEntry.setField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS, Lunar and Planetary Exploration; Planets"); - ingersollPollardEntry.setField(StandardField.MONTH, "Oct"); + ingersollPollardEntry.setField(StandardField.MONTH, "#oct#"); ingersollPollardEntry.setField(StandardField.NUMBER, "1"); ingersollPollardEntry.setField(StandardField.PAGES, "62-80"); ingersollPollardEntry.setField(StandardField.TITLE, "Motion in the interiors and atmospheres of Jupiter and Saturn: scale analysis, anelastic equations, barotropic stability criterion"); @@ -125,7 +125,7 @@ public void setUp() throws Exception { luceyPaulEntry.setField(StandardField.VOLUME, "105"); luceyPaulEntry.setField(StandardField.YEAR, "2000"); luceyPaulEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L"); - luceyPaulEntry.setField(StandardField.MONTH, "Jan"); + luceyPaulEntry.setField(StandardField.MONTH, "#jan#"); luceyPaulEntry.setField(StandardField.NUMBER, "E8"); } From 01289321c9e62d212ace38dbc42ca97eb72872c3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sun, 1 Mar 2020 22:06:53 +0100 Subject: [PATCH 07/10] Update year --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 592eef7d390..0f055c8d0f6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright © 2003-2019 [JabRef Authors](https://github.com/JabRef/jabref/blob/master/AUTHORS) +Copyright © 2003-2020 [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 d48182dcfe4d416baf267bf1a99c0178fc1a1e0f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 13:18:15 +0100 Subject: [PATCH 08/10] Bump checkstyle from 8.29 to 8.30 (#6051) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.29 to 8.30. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.29...checkstyle-8.30) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 72d2f156e01..c5896d9d837 100644 --- a/build.gradle +++ b/build.gradle @@ -213,7 +213,7 @@ dependencies { testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT" testImplementation "org.hamcrest:hamcrest-library:2.2" - checkstyle 'com.puppycrawl.tools:checkstyle:8.29' + checkstyle 'com.puppycrawl.tools:checkstyle:8.30' xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.2' jython 'org.python:jython-standalone:2.7.1' } From e6e2da34cd3927c230f87530dea5d1dab6874026 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 13:18:55 +0100 Subject: [PATCH 09/10] Bump jsoup from 1.12.2 to 1.13.1 (#6052) Bumps [jsoup](https://github.com/jhy/jsoup) from 1.12.2 to 1.13.1. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES) - [Commits](https://github.com/jhy/jsoup/compare/1.12.2...jsoup-1.13.1) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c5896d9d837..5c4eba03e5e 100644 --- a/build.gradle +++ b/build.gradle @@ -170,7 +170,7 @@ dependencies { implementation 'com.jfoenix:jfoenix:9.0.9' implementation 'org.controlsfx:controlsfx:11.0.1' - implementation 'org.jsoup:jsoup:1.12.2' + implementation 'org.jsoup:jsoup:1.13.1' implementation 'com.konghq:unirest-java:3.6.00' implementation 'org.slf4j:slf4j-api:2.0.0-alpha1' From f9088833c084aee4081d076e9a049dab977cd4a7 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Mon, 2 Mar 2020 22:20:39 +0100 Subject: [PATCH 10/10] Add use statement for mariadb. Fixes #5886. --- build.gradle | 1 + src/main/java/module-info.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5c4eba03e5e..0a83f634048 100644 --- a/build.gradle +++ b/build.gradle @@ -604,6 +604,7 @@ jlink { uses 'com.airhacks.afterburner.injection.PresenterFactory' uses 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup' uses 'org.apache.logging.log4j.spi.Provider' + uses 'org.mariadb.jdbc.credential.CredentialPlugin' uses 'org.mariadb.jdbc.tls.TlsSocketPlugin' uses 'org.mariadb.jdbc.LocalInfileInterceptor' uses 'javax.xml.bind.JAXBContextFactory' diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 6ef392d0005..91b721e8a4a 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -22,7 +22,6 @@ provides com.airhacks.afterburner.views.ResourceLocator with org.jabref.gui.util.JabRefResourceLocator; - provides com.airhacks.afterburner.injection.PresenterFactory with org.jabref.gui.DefaultInjector;