From fd93c1db49ad95d75118922b37f975cd1cbf666e Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 1 Dec 2019 10:26:37 +0100 Subject: [PATCH 01/17] Update outdatedDependencies.md --- .github/outdatedDependencies.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/outdatedDependencies.md b/.github/outdatedDependencies.md index e08f45ef495..c750c81fb06 100644 --- a/.github/outdatedDependencies.md +++ b/.github/outdatedDependencies.md @@ -2,5 +2,4 @@ title: Outdated dependencies labels: code-quality, dependencies --- -There are outdated dependencies! -See https://github.com/JabRef/jabref/actions?query=is%3Afailure for details. +[There are outdated dependencies!](https://github.com/JabRef/jabref/actions?query=is%3Afailure+workflow%3A%22Check+dependencies%22) From 1e9f919c8387ad258ab327e9dbf241600224ade7 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 1 Dec 2019 10:30:27 +0100 Subject: [PATCH 02/17] Run outdated dependency check after dpendabot --- .github/workflows/check-outdated-dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-outdated-dependencies.yml b/.github/workflows/check-outdated-dependencies.yml index 1d3fe5a7750..82db10ecc2a 100644 --- a/.github/workflows/check-outdated-dependencies.yml +++ b/.github/workflows/check-outdated-dependencies.yml @@ -2,7 +2,7 @@ name: Check dependencies on: schedule: - - cron: '0 0 * * 0' # Run every Sunday + - cron: '0 0 * * TUE' # Run every Tuesday (after dependabot, which runs Monday) jobs: checkDependencies: From f458db129d272e83313e43f12081cab3df99f4b2 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 1 Dec 2019 11:09:16 +0100 Subject: [PATCH 03/17] Update JavaFX (#5690) Fixes https://github.com/JabRef/jabref/issues/5689 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 194c1cd20a3..a3b188abe16 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ configurations { } javafx { - version = "13" + version = "13.0.1" modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ] } From 008c1e5ca94d8beb547c41886648b54e2735887c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 07:13:52 +0000 Subject: [PATCH 04/17] Bump mockito-core from 3.1.0 to 3.2.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.1.0...v3.2.0) 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 a3b188abe16..10abdf78a7b 100644 --- a/build.gradle +++ b/build.gradle @@ -214,7 +214,7 @@ dependencies { testCompile 'net.bytebuddy:byte-buddy-parent:1.10.3' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT' - testCompile 'org.mockito:mockito-core:3.1.0' + testCompile 'org.mockito:mockito-core:3.2.0' //testCompile 'com.github.tomakehurst:wiremock:2.24.1' testCompile 'org.xmlunit:xmlunit-core:2.6.3' testCompile 'org.xmlunit:xmlunit-matchers:2.6.3' From a8d06f38100d7dbdda29e5241cdd5a9a4c7f6683 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 07:14:19 +0000 Subject: [PATCH 05/17] Bump richtextfx from 0.10.2 to 0.10.3 Bumps [richtextfx](https://github.com/FXMisc/RichTextFX) from 0.10.2 to 0.10.3. - [Release notes](https://github.com/FXMisc/RichTextFX/releases) - [Changelog](https://github.com/FXMisc/RichTextFX/blob/master/CHANGELOG.md) - [Commits](https://github.com/FXMisc/RichTextFX/compare/v0.10.2...v0.10.3) 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 a3b188abe16..83c83a46749 100644 --- a/build.gradle +++ b/build.gradle @@ -163,7 +163,7 @@ dependencies { compile 'de.saxsys:mvvmfx:1.8.0' compile 'org.fxmisc.easybind:easybind:1.0.3' compile 'org.fxmisc.flowless:flowless:0.6.1' - compile 'org.fxmisc.richtext:richtextfx:0.10.2' + compile 'org.fxmisc.richtext:richtextfx:0.10.3' compile group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1' compile 'com.jfoenix:jfoenix:9.0.9' compile 'org.controlsfx:controlsfx:11.0.0' From 15ec114819182cd5590fce5f8565d3b7a00ddd0c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 07:15:59 +0000 Subject: [PATCH 06/17] Bump unirest-java from 3.1.04 to 3.2.00 Bumps [unirest-java](https://github.com/Kong/unirest-java) from 3.1.04 to 3.2.00. - [Release notes](https://github.com/Kong/unirest-java/releases) - [Changelog](https://github.com/Kong/unirest-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/Kong/unirest-java/compare/v3.1.04...v3.2.00) 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 a3b188abe16..292a7503ba0 100644 --- a/build.gradle +++ b/build.gradle @@ -169,7 +169,7 @@ dependencies { compile 'org.controlsfx:controlsfx:11.0.0' compile 'org.jsoup:jsoup:1.12.1' - compile 'com.konghq:unirest-java:3.1.04' + compile 'com.konghq:unirest-java:3.2.00' compile 'org.slf4j:slf4j-api:2.0.0-alpha1' compile group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT' From d6e43a4d273395e064f694cfbb2080b02a69ebe0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 07:16:13 +0000 Subject: [PATCH 07/17] Bump classgraph from 4.8.54 to 4.8.58 Bumps [classgraph](https://github.com/classgraph/classgraph) from 4.8.54 to 4.8.58. - [Release notes](https://github.com/classgraph/classgraph/releases) - [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.54...classgraph-4.8.58) 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 a3b188abe16..8a4780d56a8 100644 --- a/build.gradle +++ b/build.gradle @@ -206,7 +206,7 @@ dependencies { } - testCompile 'io.github.classgraph:classgraph:4.8.54' + testCompile 'io.github.classgraph:classgraph:4.8.58' testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.2' testCompile 'org.junit.platform:junit-platform-launcher:1.5.2' From 78271b0f245fdc4916f29522a295791ea3008b2c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 07:23:04 +0000 Subject: [PATCH 08/17] Bump byte-buddy-parent from 1.10.3 to 1.10.4 Bumps [byte-buddy-parent](https://github.com/raphw/byte-buddy) from 1.10.3 to 1.10.4. - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.10.3...byte-buddy-1.10.4) 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 af0de1738a5..3b15e287baa 100644 --- a/build.gradle +++ b/build.gradle @@ -211,7 +211,7 @@ dependencies { testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.2' testCompile 'org.junit.platform:junit-platform-launcher:1.5.2' - testCompile 'net.bytebuddy:byte-buddy-parent:1.10.3' + testCompile 'net.bytebuddy:byte-buddy-parent:1.10.4' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT' testCompile 'org.mockito:mockito-core:3.2.0' From 9d620f18dc3574c814e4f02c78184d208b28d91d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 13:01:30 +0100 Subject: [PATCH 09/17] Bump checkstyle from 8.26 to 8.27 (#5694) * Bump checkstyle from 8.26 to 8.27 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.26 to 8.27. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.26...checkstyle-8.27) Signed-off-by: dependabot-preview[bot] * Update BracketedPattern.java * Update BibtexTextPrefix.java * Update OOBibStyle.java --- build.gradle | 2 +- .../org/jabref/logic/bibtexkeypattern/BracketedPattern.java | 3 --- src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java | 5 ----- src/main/java/org/jabref/logic/openoffice/OOBibStyle.java | 5 ----- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 2492b1e8c26..6b623734704 100644 --- a/build.gradle +++ b/build.gradle @@ -225,7 +225,7 @@ dependencies { testCompile "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT" testCompile "org.hamcrest:hamcrest-library:2.2" - checkstyle 'com.puppycrawl.tools:checkstyle:8.26' + checkstyle 'com.puppycrawl.tools:checkstyle:8.27' xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.2' jython 'org.python:jython-standalone:2.7.1' } diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java index a26fc93f4a8..5b2b15eb964 100644 --- a/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java +++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java @@ -49,9 +49,6 @@ public BracketedPattern() { this.pattern = null; } - /** - * @param bibentry - */ public BracketedPattern(String pattern) { this.pattern = pattern; } diff --git a/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java b/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java index 59ff77d9b28..5039bdca399 100644 --- a/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java +++ b/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java @@ -20,14 +20,9 @@ private BibtexTextPrefix() { } /** - * - * @param numOfChars - * @param toPrefix * @param warn may-be-null - * @return */ public static String textPrefix(int inNumOfChars, String toPrefix, Warn warn) { - int numOfChars = inNumOfChars; StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java index 6b2156047ee..b63eaf94056 100644 --- a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java +++ b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java @@ -343,7 +343,6 @@ public boolean isValid() { * Parse a line providing bibliography structure information for an entry type. * * @param line The string containing the structure description. - * @throws IOException */ private void handleStructureLine(String line) { int index = line.indexOf('='); @@ -369,7 +368,6 @@ private void handleStructureLine(String line) { * Parse a line providing a property name and value. * * @param line The line containing the formatter names. - * @throws IOException */ private void handlePropertiesLine(String line, Map map) { int index = line.indexOf('='); @@ -393,9 +391,6 @@ private void handlePropertiesLine(String line, Map map) { /** * Parse a line providing a journal name for which this style is valid. - * - * @param line - * @throws IOException */ private void handleJournalsLine(String line) { if (!line.trim().isEmpty()) { From 888c2cb0bc1f9981244c6bbd9d93db447b5530ec Mon Sep 17 00:00:00 2001 From: Christoph Date: Wed, 4 Dec 2019 06:24:12 +0100 Subject: [PATCH 10/17] New Crowdin translations (#5687) --- src/main/resources/l10n/JabRef_fr.properties | 52 ++++++++++---------- src/main/resources/l10n/JabRef_ja.properties | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties index 9c5b7b9a3e0..e3b3c2bf7fc 100644 --- a/src/main/resources/l10n/JabRef_fr.properties +++ b/src/main/resources/l10n/JabRef_fr.properties @@ -990,7 +990,7 @@ BibTeX\ key\ generator=Générateur de clefs BibTeX Unable\ to\ open\ link.=Impossible d'ouvrir le lien. MIME\ type=Type MIME -This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Cette fonction permet aux nouveaux fichiers d'être ouverts ou importés dans une fenêtre JabRef déjà active
au lieu d'ouvrir une nouvelle fenêtre. Par exemple, c'est utile quand vous ouvrez un fichier dans JabRef
à partir de notre navigateur internet.
Notez que cela vous empêchera de lancer plus d'une fenêtre JabRef à la fois. +This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Cette fonction permet aux nouveaux fichiers d'être ouverts ou importés dans une fenêtre JabRef déjà active au lieu d'ouvrir une nouvelle fenêtre. Par exemple, c'est utile quand vous ouvrez un fichier dans JabRef à partir de notre navigateur internet. Notez que cela vous empêchera de lancer plus d'une fenêtre JabRef à la fois. Run\ fetcher=Lancer l'outil de recherche Use\ IEEE\ LaTeX\ abbreviations=Utiliser les abréviations LaTeX IEEE @@ -1062,7 +1062,7 @@ Autocomplete\ names\ in\ both\ formats=Complétion automatique des noms dans les Send\ as\ email=Expédier par courriel References=Références Sending\ of\ emails=Envoi des courriels -Subject\ for\ sending\ an\ email\ with\ references=Sujet pour l'envoi d'un courriel avec des références +Subject\ for\ sending\ an\ email\ with\ references=Sujet des courriels envoyant des références Automatically\ open\ folders\ of\ attached\ files=Ouvrir automatiquement les répertoires des fichiers attachés Error\ creating\ email=Erreur lors de la création du courriel Entries\ added\ to\ an\ email=Entrées ajoutées à un courriel @@ -1138,15 +1138,15 @@ Auto-generating\ PDF-Names\ does\ not\ support\ undo.\ Continue?=La génération Use\ full\ firstname\ whenever\ possible=Utiliser le prénom en entier quand c'est possible Use\ abbreviated\ firstname\ whenever\ possible=Utiliser le prénom abrégé quand c'est possible -Use\ abbreviated\ and\ full\ firstname=Utiliser le prénom abrégé et entier +Use\ abbreviated\ and\ full\ firstname=Utiliser le prénom entier et son abréviation Name\ format=Format du nom First\ names=Prénoms -Cleanup\ entries=Nettoyage des entrées +Cleanup\ entries=Nettoyer les entrées Automatically\ assign\ new\ entry\ to\ selected\ groups=Assigner automatiquement les nouvelles entrées aux groupes sélectionnés %0\ mode=Mode %0 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Déplacer les DOIs des champs note et URL vers le champ DOI, et supprimer le prefix http Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Rendre relatifs les chemins des fichiers liés (si possible) -Rename\ PDFs\ to\ given\ filename\ format\ pattern=Renommer les PDF selon le modèle donné de format de nom de fichier +Rename\ PDFs\ to\ given\ filename\ format\ pattern=Renommer les PDF selon le modèle de format de nom de fichier Rename\ only\ PDFs\ having\ a\ relative\ path=Renommer uniquement les PDF ayant un chemin relatif Doing\ a\ cleanup\ for\ %0\ entries...=Nettoyage en cours pour %0 entrées... No\ entry\ needed\ a\ clean\ up=Aucune entrée ne nécessitait un nettoyage @@ -1234,7 +1234,7 @@ Please\ open\ or\ start\ a\ new\ library\ before\ searching=Veuillez ouvrir ou c Canceled\ merging\ entries=Fusion des entrées interrompues -Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Formatter les unités en ajouter des séparateurs non interruptibles et conserver la casse correcte pour la recherche +Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Formater les unités en ajouter des séparateurs non interruptibles et conserver la casse correcte pour la recherche Merge\ entries=Fusionner les entrées Merged\ entries=Entrées fusionnées dans une nouvelle et anciennes conservées None=Effacer @@ -1274,7 +1274,7 @@ Parsing\ error=Erreur de traitement illegal\ backslash\ expression=Expression avec barre oblique inversée (\\) illégale Clear\ read\ status=Effacer le statut de lecture -Convert\ to\ biblatex\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journal'\ field\ to\ 'journaltitle')=Convertir au format biblatex (par exemple, transformer la valeur du champ 'journal' en 'journaltitle') +Convert\ to\ biblatex\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journal'\ field\ to\ 'journaltitle')=Convertir au format biblatex (par exemple, en remplaçant le nom du champ 'journal' par 'journaltitle') Deprecated\ fields=Champs obsolètes No\ read\ status\ information=Pas d'information sur le statut de lecture Printed=Imprimé @@ -1345,13 +1345,13 @@ Copy\ title=Copier le titre Copy\ \\cite{BibTeX\ key}=Copier \\cite{clé BibTeX} Copy\ BibTeX\ key\ and\ title=Copier la clef BibTeX et le titre Invalid\ DOI\:\ '%0'.=DOI invalide \: « %0 ». -should\ start\ with\ a\ name=devrait débuter par un nom -should\ end\ with\ a\ name=devrait se terminer par un nom +should\ start\ with\ a\ name=Devrait débuter par un nom +should\ end\ with\ a\ name=Devrait se terminer par un nom unexpected\ closing\ curly\ bracket=accolade fermante incongrue unexpected\ opening\ curly\ bracket=accolade ouvrante incongrue capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=Des majuscules ne sont pas incluses entre accolades {} -should\ contain\ a\ four\ digit\ number=devrait contenir un nombre à quatre chiffres -should\ contain\ a\ valid\ page\ number\ range=devrait contenir une gamme de pages valide +should\ contain\ a\ four\ digit\ number=Devrait contenir un nombre à quatre chiffres +should\ contain\ a\ valid\ page\ number\ range=Devrait contenir une gamme de pages valide No\ results\ found.=Aucun résultat trouvé. Found\ %0\ results.=%0 résultats trouvés. Invalid\ regular\ expression=Expression régulière invalide @@ -1417,7 +1417,7 @@ Show\ remaining\ fields=Afficher les champs restants link\ should\ refer\ to\ a\ correct\ file\ path=Le lien doit correspondre à un chemin de fichier valide abbreviation\ detected=Abréviation détectée wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=Mauvais type d'entrée car le proceedings a des numéros de page -Abbreviate\ journal\ names=Abrégez les noms de journaux +Abbreviate\ journal\ names=Abréger les noms de journaux Abbreviating...=Abrègement en cours... Abbreviation\ '%0'\ for\ journal\ '%1'\ already\ defined.=L'abréviation '%0' pour le journal '%1' est déjà définie. Abbreviation\ cannot\ be\ empty=L'abréviation ne peut pas être vide @@ -1458,17 +1458,17 @@ Reload=Recharger Capitalize=Convertir en majuscules Capitalize\ all\ words,\ but\ converts\ articles,\ prepositions,\ and\ conjunctions\ to\ lower\ case.=Convertir en majuscules tous les mots, mais convertir les articles, prépositions et conjonctions en minuscules. Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Convertir le premier mot en majuscules, et les autres mots en minuscules. -Changes\ all\ letters\ to\ lower\ case.=Convertit toutes les lettres en minuscules. -Changes\ all\ letters\ to\ upper\ case.=Convertit toutes les lettres en majuscules. +Changes\ all\ letters\ to\ lower\ case.=Convertir toutes les lettres en minuscules. +Changes\ all\ letters\ to\ upper\ case.=Convertir toutes les lettres en majuscules. Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=Convertit en majuscules la première lettre de tous les mots, et les autres lettres en minuscules. Cleans\ up\ LaTeX\ code.=Nettoyer le code LaTeX. -Converts\ HTML\ code\ to\ LaTeX\ code.=Convertit le code HTML en code LaTeX. +Converts\ HTML\ code\ to\ LaTeX\ code.=Convertir le code HTML en code LaTeX. HTML\ to\ Unicode=HTML vers Unicode Converts\ HTML\ code\ to\ Unicode.=Convertit du code HTML en Unicode. -Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Convertit l'encodage LaTeX en caractères Unicode. -Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Convertit les caractères Unicode en encodage LaTeX. -Converts\ ordinals\ to\ LaTeX\ superscripts.=Convertit les numéros ordinaux en exposants LaTeX. -Converts\ units\ to\ LaTeX\ formatting.=Convertit les unités en code LaTeX. +Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Convertir l'encodage LaTeX en caractères Unicode. +Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Convertir les caractères Unicode en encodage LaTeX. +Converts\ ordinals\ to\ LaTeX\ superscripts.=Convertir les numéros ordinaux en exposants LaTeX. +Converts\ units\ to\ LaTeX\ formatting.=Convertir les unités en code LaTeX. HTML\ to\ LaTeX=HTML vers LaTeX LaTeX\ cleanup=Nettoyage LaTeX LaTeX\ to\ Unicode=LaTeX vers Unicode @@ -1603,7 +1603,7 @@ Export\ cited=Exporter les citées Unable\ to\ generate\ new\ library=Impossible de générer un nouveau fichier Open\ console=Ouvrir la console -Use\ default\ terminal\ emulator=Utilise l'émulateur de terminal par défaut +Use\ default\ terminal\ emulator=Utiliser l'émulateur de terminal par défaut Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Note \: Utiliser le paramètre %DIR% pour le répertoire du fichier ouvert. Error\ occured\ while\ executing\ the\ command\ "%0".=Une erreur est survenue lors de l'exécution de la commande « %0 ». Reformat\ ISSN=Reformater l'ISSN @@ -1620,7 +1620,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Êtes-vous s Remove\ protected\ terms\ file=Supprimer le fichier des termes protégés Add\ selected\ text\ to\ list=Ajouter le texte sélectionné à la liste Add\ {}\ around\ selected\ text=Ajouter {} autour du texte sélectionné -Format\ field=Formatter le champ +Format\ field=Formater le champ New\ protected\ terms\ file=Nouveau fichier de termes protégés change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=modifier le champ %0 de l'entrée %1 de %2 en %3 change\ key\ from\ %0\ to\ %1=modifier la clef de %0 en %1 @@ -1670,7 +1670,7 @@ Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=V Host=Hôte Port=Port -Library=Fichier +Library=Contenu User=Utilisateur Connect=Connexion automatique Connection\ error=Erreur de connexion @@ -1747,8 +1747,8 @@ Select\ first\ entry=Sélectionner la première entrée Select\ last\ entry=Sélectionner la dernière entrée Invalid\ ISBN\:\ '%0'.=ISBN invalide \: « %0 ». -should\ be\ an\ integer\ or\ normalized=devrait être un entier ou une abréviation standard -should\ be\ normalized=devrait être une abréviation standard +should\ be\ an\ integer\ or\ normalized=Devrait être un entier ou une abréviation standard +should\ be\ normalized=Devrait être une abréviation standard Empty\ search\ ID=Identifiant de recherche vide The\ given\ search\ ID\ was\ empty.=L'Identifiant de recherche entré était vide. @@ -1784,7 +1784,7 @@ Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Le type Copied\ %0\ citations.=%0 citations copiées. -journal\ not\ found\ in\ abbreviation\ list=journal non trouvé dans la liste d'abréviations +journal\ not\ found\ in\ abbreviation\ list=\nJournal non trouvé dans la liste d'abréviations Unhandled\ exception\ occurred.=Une exception non gérée est survenue. strings\ included=chaînes incluses @@ -1999,7 +1999,7 @@ Extract\ BibTeX\ from\ plain\ text=Extraire BibTeX à partir du texte brut Input\ text\ to\ parse=Entrer le texte à analyser Starts\ the\ extraction\ of\ the\ BibTeX\ entry=Débute l'extraction des entrées BibTeX -Execute\ command=Lance une commande +Execute\ command=Lancer une commande Open\ File\ Browser=Ouvrir le navigateur de fichiers Use\ default\ file\ browser=Utiliser le navigateur de fichiers par défaut diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties index 09712be515d..8af9e84cd45 100644 --- a/src/main/resources/l10n/JabRef_ja.properties +++ b/src/main/resources/l10n/JabRef_ja.properties @@ -1983,7 +1983,7 @@ OpenOffice/LibreOffice=OpenOffice/LibreOffice Open\ document\ viewer=文書ビューアを表示 Open\ entry\ editor=エディターで開く Previous\ citation\ style=前の引用スタイル -Search\ document\ identifier\ online=文書識別子をオンライン検索 +Search\ document\ identifier\ online=文書IDをオンライン検索 Search\ for\ unlinked\ local\ files=未リンクのローカルファイルを検索 Search\ full\ text\ documents\ online=文書全文をオンライン検索 Find\ and\ replace=検索と置換 From f4145bc119ebb5677b39bc2b7c3bf3aa67a41ec3 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 4 Dec 2019 12:43:53 +0100 Subject: [PATCH 11/17] Use GitVersion to increment build numbers (#5682) * Use GitVersion to increment build numbers * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update deployment.yml * Create GitVersion.yml * Update GitVersion * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update GitVersion.yml * Update GitVersion.yml * Update build.gradle * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update deployment.yml * Upgrade git checkout action * Remove (opsolete) checkout config * Try to unshallow * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update deployment.yml * Update GitVersion.yml * Change default product version to 100.0.0 --- .github/workflows/deployment.yml | 35 ++++++++++++++++++------------- GitVersion.yml | 2 ++ build.gradle | 36 ++------------------------------ 3 files changed, 25 insertions(+), 48 deletions(-) create mode 100644 GitVersion.yml diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index f24fac8c4a6..1c885e07640 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -30,18 +30,20 @@ jobs: steps: - name: Checkout source - uses: actions/checkout@v1 + uses: actions/checkout@v2-beta with: - depth: 1 - submodules: false - - name: Extract branch name - shell: bash + fetch-depth: 0 + - name: Fetch tags and master for GitVersion run: | - ref=${GITHUB_REF#refs/heads/} - ref=${ref#refs/pull/} - ref=${ref%/merge} - echo "##[set-output name=branch;]${ref}" - id: extract_branch + git fetch --tags origin + git branch --create-reflog master origin/master + - name: Install GitVersion + uses: gittools/actions/setup-gitversion@v0.3 + with: + versionSpec: '5.1.2' + - name: Run GitVersion + id: gitversion + uses: gittools/actions/execute-gitversion@v0.3 - name: Set up JDK uses: actions/setup-java@v1 with: @@ -82,11 +84,11 @@ jobs: zip.close() shell: python - name: Build runtime image - run: ./gradlew -Pdev=true jlinkZip + run: ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip - name: Build installer run: | export BADASS_JLINK_JPACKAGE_HOME="${GITHUB_WORKSPACE}${{ matrix.jdk14Path }}" - ./gradlew -Pdev=true jpackage + ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage shell: bash - name: Add installer as artifact uses: actions/upload-artifact@master @@ -97,18 +99,23 @@ jobs: run: ${{ matrix.archivePortable }} shell: bash - name: Build and publish snap - if: matrix.os == 'ubuntu-latest' && steps.extract_branch.outputs.branch == 'master' + if: matrix.os == 'ubuntu-latest' && steps.gitversion.outputs.branchName == 'master' env: SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }} run: | mkdir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg docker run -v $(pwd):$(pwd) -t lyzardking/snapcraft-bionic sh -c "apt update -qq && cd $(pwd) && snapcraft && mv jabref*.snap build/distribution/ && snapcraft push build/distribution/jabref*.snap --release edge || true" shell: bash + - name: Rename files + run: | + get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"} + get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"} + shell: pwsh - name: Upload to builds.jabref.org uses: garygrossgarten/github-action-scp@release with: local: build/distribution - remote: www/${{ steps.extract_branch.outputs.branch }} + remote: www/${{ steps.gitversion.outputs.branchName }} host: builds.jabref.org username: builds_jabref_org privateKey: ${{ secrets.buildJabRefPrivateKey }} diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 00000000000..4233c35ce01 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,2 @@ +assembly-versioning-format: '{major}.{minor}.{buildmetadata}' +assembly-informational-format: '{major}.{minor}{PreReleaseTagWithDash}--{CommitDate}--{ShortSha}' diff --git a/build.gradle b/build.gradle index 6b623734704..10cf5c5cf3f 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ apply plugin: LocalizationPlugin apply from: 'eclipse.gradle' group = "org.jabref" -version = "5.0.0" +version = project.findProperty('projVersion') ?: '100.0.0' sourceCompatibility = 13 targetCompatibility = 13 @@ -283,7 +283,7 @@ processResources { filteringCharset = 'UTF-8' filesMatching("build.properties") { - expand(version: createVersionString(), + expand(version: project.findProperty('projVersionInfo') ?: '100.0.0', "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)), "authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), "developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), @@ -723,35 +723,3 @@ task bundleLibreOffice(type: Jar) { destinationDir = file('lib') archiveName = 'libreoffice.jar' } - -// Returns the value of project.version in production and a string of the format VERSION-dev--DATE--BRANCH--GIT_HASH for development versions -def createVersionString() { - if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo - if (OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName - if (OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // first the date (%cd), then the branch name, and finally the commit id (%h) - return project.version + "-dev--" + commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - } else { - return project.version - } -} From ac91193f122037751256e228987a65e45c8e784f Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 4 Dec 2019 12:52:51 +0100 Subject: [PATCH 12/17] Change travis to github in Readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2fb535a168e..7add8ce7413 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # JabRef Bibliography Management -[![Build Status](https://travis-ci.org/JabRef/jabref.svg?branch=master)](https://travis-ci.org/JabRef/jabref) +[![Deployment Status](https://github.com/JabRef/jabref/workflows/Deployment/badge.svg)](https://github.com/JabRef/jabref/actions?query=workflow%3ADeployment) +[![Build Status](https://github.com/JabRef/jabref/workflows/Tests/badge.svg)](https://github.com/JabRef/jabref/actions?query=workflow%3ATests) [![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master) [![Donation](https://img.shields.io/badge/donate%20to-jabref-orange.svg)](https://donations.jabref.org) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/jabref/localized.svg)](https://crowdin.com/project/jabref) @@ -94,7 +95,7 @@ When you want to develop, it is necessary to generate additional sources using ` and then generate the Eclipse `gradlew eclipse`. For IntelliJ IDEA, just import the project via a Gradle Import by pointing at the `build.gradle`. -`gradlew test` executes all tests. We use [Travis CI](https://travis-ci.org/) for executing the tests after each commit. For developing, it is sufficient to locally only run the associated test for the classes you changed. Travis will report any other failure. +`gradlew test` executes all tests. We use [Github Actions](https://github.com/JabRef/jabref/actions) for executing the tests after each commit. For developing, it is sufficient to locally only run the associated test for the classes you changed. Github will report any other failure. [BibTeX]: https://www.ctan.org/pkg/bibtex [Biblatex]: https://www.ctan.org/pkg/biblatex From c5f396bf72b08cb71324b0cb9e138e0b183040a8 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 4 Dec 2019 12:55:54 +0100 Subject: [PATCH 13/17] Try to force creating reflog --- .github/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 1c885e07640..9d6f6b38e6e 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -36,7 +36,7 @@ jobs: - name: Fetch tags and master for GitVersion run: | git fetch --tags origin - git branch --create-reflog master origin/master + git branch --force --create-reflog master origin/master - name: Install GitVersion uses: gittools/actions/setup-gitversion@v0.3 with: From c445ff03d2348cbbf2944fb00df519cabb438f1c Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 4 Dec 2019 13:08:09 +0100 Subject: [PATCH 14/17] Disable failing MathSciNet test due to missing subscription --- .../java/org/jabref/logic/importer/fetcher/MathSciNetTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java index 6bf142f76ab..75b7d616282 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java @@ -61,6 +61,7 @@ void searchByEntryFindsEntry() throws Exception { } @Test + @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response") void searchByIdInEntryFindsEntry() throws Exception { BibEntry searchEntry = new BibEntry(); searchEntry.setField(StandardField.MR_NUMBER, "3537908"); From 1c1550eda521e748cccb1f6c9fb396dcd8cbdc24 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 4 Dec 2019 13:22:01 +0100 Subject: [PATCH 15/17] Check for existing master branch --- .github/workflows/deployment.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 9d6f6b38e6e..fbb322b4bac 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -36,7 +36,11 @@ jobs: - name: Fetch tags and master for GitVersion run: | git fetch --tags origin - git branch --force --create-reflog master origin/master + git rev-parse --verify master + if (-not $?) { + git branch --force --create-reflog master origin/master + } + shell: pwsh - name: Install GitVersion uses: gittools/actions/setup-gitversion@v0.3 with: From 16bb6fd6b49e0f6e3f596fb9aef2ed0d8e11596b Mon Sep 17 00:00:00 2001 From: Christoph Date: Wed, 4 Dec 2019 20:22:10 +0100 Subject: [PATCH 16/17] New translations JabRef_en.properties (French) (#5709) --- src/main/resources/l10n/JabRef_fr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties index e3b3c2bf7fc..db4e5962b54 100644 --- a/src/main/resources/l10n/JabRef_fr.properties +++ b/src/main/resources/l10n/JabRef_fr.properties @@ -1093,7 +1093,7 @@ Select\ Writer\ document=Sélectionner le document Writer Sync\ OpenOffice/LibreOffice\ bibliography=Synchroniser la bibliographie OpenOffice/LibreOffice Select\ which\ open\ Writer\ document\ to\ work\ on=Sélectionner le document Writer ouvert sur lequel travailler Connected\ to\ document=Connecté au document -Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Insérer une citation sans texte (l'entrée apparaitra dans la liste des références) +Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Insérer une citation sans texte (l'entrée apparaîtra dans la liste des références) Cite\ selected\ entries\ with\ extra\ information=Citer les entrées sélectionnées avec des informations complémentaires Ensure\ that\ the\ bibliography\ is\ up-to-date=Assure que la bibliographie est à jour Your\ OpenOffice/LibreOffice\ document\ references\ the\ BibTeX\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Votre document OpenOffice/LibreOffice appelle la clef BibTeX « %0 », qui n'a pas pu être trouvée dans votre fichier actuel. @@ -1611,7 +1611,7 @@ Reformat\ ISSN=Reformater l'ISSN Countries\ and\ territories\ in\ English=Pays et territoires en anglais Electrical\ engineering\ terms=Termes du génie électrique Enabled=Activé -Internal\ list=List interne +Internal\ list=Liste interne Manage\ protected\ terms\ files=Gérer les fichiers des termes protégés Months\ and\ weekdays\ in\ English=Mois et jours de la semaine en anglais The\ text\ after\ the\ last\ line\ starting\ with\ \#\ will\ be\ used=Le texte après la dernière ligne commençant par \# sera utilisé @@ -1654,7 +1654,7 @@ No\ abbreviation\ files\ loaded=Aucun fichier d'abréviation n'est chargé Loading\ built\ in\ lists=Chargement des listes internes JabRef\ built\ in\ list=Liste interne de JabRef -IEEE\ built\ in\ list=List interne de IEEE +IEEE\ built\ in\ list=Liste interne de IEEE Event\ log=Journal des évènements We\ now\ give\ you\ insight\ into\ the\ inner\ workings\ of\ JabRef's\ internals.\ This\ information\ might\ be\ helpful\ to\ diagnose\ the\ root\ cause\ of\ a\ problem.\ Please\ feel\ free\ to\ inform\ the\ developers\ about\ an\ issue.=Nous vous donnons à présent un aperçu du fonctionnement interne de JabRef. Cette information pourrait être utile pour diagnostiquer la cause du problème. Veuillez bien informer les développeurs des anomalies rencontrées. From fe8f4cd49014e259b9fa2b28cbb8b0928c8df377 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Wed, 4 Dec 2019 21:30:22 +0100 Subject: [PATCH 17/17] Fix eclipse classpath build file Add missing --add opens for controlsfx in eclipse classpath --- eclipse.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclipse.gradle b/eclipse.gradle index caf1047d413..d50036524e5 100644 --- a/eclipse.gradle +++ b/eclipse.gradle @@ -28,6 +28,9 @@ eclipse { javafxcontrols.entryAttributes['add-exports'] = 'javafx.controls/com.sun.javafx.scene.control=org.jabref:javafx.controls/com.sun.javafx.scene.control.behavior=org.jabref:javafx.controls/javafx.scene.control=org.jabref'; javafxcontrols.entryAttributes['add-opens'] = 'javafx.controls/com.sun.javafx.scene.control=org.jabref:javafx.controls/com.sun.javafx.scene.control.behavior=org.jabref:javafx.controls/javafx.scene.control=org.jabref'; + def javafxgraphics = entries.find { isJavafxGraphics(it) }; + javafxgraphics.entryAttributes['add-opens'] = 'javafx.graphics/javafx.scene=org.controlsfx.controls'; + def graaltruffle = entries.find{ isTruffleGraal(it) } ; graaltruffle.entryAttributes['add-exports'] = 'com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle'; @@ -56,6 +59,8 @@ boolean isControlsfx(entry) { return entry.properties.path.contains('controlsfx' boolean isJavafxControls(entry) { return entry.properties.path.contains('javafx-controls'); } +boolean isJavafxGraphics(entry) { return entry.properties.path.contains('javafx-graphics'); } + boolean isTruffleGraal(entry) {return entry.properties.path.contains('org.graalvm.regex'); } // add formatter and cleanup settings to Eclipse settings