Skip to content

Commit 082580c

Browse files
committed
Merge remote-tracking branch 'upstream/master' into importerbackgroundtask
* upstream/master: add language mapping for chinese remove chinese content fix hamcrest link Add Traditional Chinese (#7240) Show development information Allow manual trigger of the deployment workflow Release v5.2 Adapt changelog for 5.2 release Update external-libraries.md checkstyle L10n master (#7235) fix fetcher architecture test Add missing author Add error dialog "Problem finding files" (#6842) Disable ACM, Google Scholar, JSTOR (#7229)
2 parents ad50cc9 + 46ec6d9 commit 082580c

34 files changed

+238
-136
lines changed

.github/workflows/deployment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Deployment
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- master

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ Hollyqqqqq
163163
Houssem Nasri
164164
hrandrianasolo
165165
Hussain Arif
166+
IfIWantedTo
166167
Igor Chernyavsky
167168
Igor Steinmacher
168169
Illes Solt

CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Changelog
32

43
All notable changes to this project will be documented in this file.
@@ -12,13 +11,22 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
1211

1312
### Added
1413

14+
### Changed
15+
16+
### Fixed
17+
18+
### Removed
19+
20+
## [5.2] – 2020-12-24
21+
22+
### Added
23+
1524
- 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)
1625
- 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)
1726
- 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)
1827
- We added connection check function in network preference setting [#6560](https://github.com/JabRef/jabref/issues/6560)
1928
- We added support for exporting to YAML. [#6974](https://github.com/JabRef/jabref/issues/6974)
2029
- We added a DOI format and organization check to detect [American Physical Society](https://journals.aps.org/) journals to copy the article ID to the page field for cases where the page numbers are missing. [#7019](https://github.com/JabRef/jabref/issues/7019)
21-
- We added a new fetcher to enable users to search jstor.org [#6627](https://github.com/JabRef/jabref/issues/6627)
2230
- We added an error message in the New Entry dialog that is shown in case the fetcher did not find anything . [#7000](https://github.com/JabRef/jabref/issues/7000)
2331
- We added a new formatter to output shorthand month format. [#6579](https://github.com/JabRef/jabref/issues/6579)
2432
- We added support for the new Microsoft Edge browser in all platforms. [#7056](https://github.com/JabRef/jabref/pull/7056)
@@ -83,6 +91,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
8391

8492
### Removed
8593

94+
- We removed the Google Scholar fetcher and the ACM fetcher do not work due to traffic limitations [#6369](https://github.com/JabRef/jabref/issues/6369)
8695
- We removed the menu entry "Manage external file types" because it's already in 'Preferences' dialog [#6991](https://github.com/JabRef/jabref/issues/6991)
8796
- We removed the integrity check "Abbreviation detected" for the field journal/journaltitle in the entry editor [#3925](https://github.com/JabRef/jabref/issues/3925)
8897

@@ -483,7 +492,8 @@ The changelog of JabRef 4.x is available at the [v4.3.1 tag](https://github.com/
483492
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).
484493
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).
485494

486-
[Unreleased]: https://github.com/JabRef/jabref/compare/v5.1...HEAD
495+
[Unreleased]: https://github.com/JabRef/jabref/compare/v5.2...HEAD
496+
[5.2]: https://github.com/JabRef/jabref/compare/v5.1...v5.2
487497
[5.1]: https://github.com/JabRef/jabref/compare/v5.0...v5.1
488498
[5.0]: https://github.com/JabRef/jabref/compare/v5.0-beta...v5.0
489499
[5.0-beta]: https://github.com/JabRef/jabref/compare/v5.0-alpha...v5.0-beta

crowdin.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ files:
55
two_letters_code:
66
pt-BR: pt_BR
77
id: in
8+
zh-CN: zh_CN
9+
zh-TW: zh_TW

docs/adr/0009-use-plain-junit5-for-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ assertFalse(actual.contains("\n"));
4949

5050
### Hamcrest
5151

52-
Homepage: <http://hamcrest.org/JavaHamcrest/>
52+
Homepage: <https://github.com/hamcrest/JavaHamcrest>
5353

5454
* Good, because offers advanced matchers (such as `contains`)
5555
* Bad, because not full fluent API

external-libraries.md

Lines changed: 81 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This file is manually kept in sync with build.gradle and the binary jars contain
55

66
One can list all dependencies by using Gradle task `dependencyReport`.
77
It generates the file [build/reports/project/dependencies.txt](build/reports/project/dependencies.txt).
8-
There, [one can use](https://stackoverflow.com/a/49727249/873282) `sed 's/^.* //' | sort | uniq` to flatten the dependencies.
8+
Below, there is a howto to generate the content at "Sorted list of runtime dependencies output by gradle".
99

1010
## Legend
1111

@@ -78,6 +78,13 @@ URL: https://github.com/google/j2objc
7878
License: Apache-2.0
7979
```
8080
81+
```yaml
82+
Id: com.googlecode.javaewah:JavaEWAH
83+
Project: JavaEWAH
84+
URL: https://github.com/lemire/javaewah
85+
License: Apache-2.0
86+
```
87+
8188
```yaml
8289
Id: com.ibm.icu:icu4j
8390
Project: International Components for Unicode for Java (ICU4J)
@@ -301,6 +308,27 @@ URL: http://logging.apache.org/log4j/2.x/
301308
License: Apache-2.0
302309
```
303310
311+
```yaml
312+
Id: org.apache.lucene:lucene-core
313+
Project: Apache Lucene
314+
URL: https://lucene.apache.org/
315+
License: Apache-2.0
316+
```
317+
318+
```yaml
319+
Id: org.apache.lucene:lucene-queries
320+
Project: Apache Lucene
321+
URL: https://lucene.apache.org/
322+
License: Apache-2.0
323+
```
324+
325+
```yaml
326+
Id: org.apache.lucene:lucene-ueryparser
327+
Project: Apache Lucene
328+
URL: https://lucene.apache.org/
329+
License: Apache-2.0
330+
```
331+
304332
```yaml
305333
Id: org.apache.pdfbox:fontbox
306334
Project: Apache PDFBox
@@ -357,6 +385,13 @@ URL: http://fxexperience.com/controlsfx/
357385
License: BSD-3-Clause
358386
```
359387
388+
```yaml
389+
Id: org.eclipse.jgit:org.eclipse.jgit
390+
Project: Eclipse JGit
391+
URL: https://www.eclipse.org/jgit/
392+
License: BSD-3-Clause
393+
```
394+
360395
```yaml
361396
Id: org.fxmisc.flowless:flowless
362397
Project: Flowless
@@ -435,31 +470,17 @@ License: GPL-2.0 WITH Classpath-exception-2.0
435470
```
436471
437472
```yaml
438-
Id: org.openoffice:juh
439-
Project: OpenOffice.org
440-
URL: http://www.openoffice.org/api/SDK
441-
License: LGPL 3.0
473+
Id: org.libreoffice:libreoffice
474+
Project: LibreOffice
475+
URL: https://api.libreoffice.org/
476+
License: MPL-2.0 OR LGPL 3.0+
442477
```
443478
444479
```yaml
445-
Id: org.openoffice:jurt
446-
Project: OpenOffice.org
447-
URL: http://www.openoffice.org/api/SDK
448-
License: Apache-2.0
449-
```
450-
451-
```yaml
452-
Id: org.openoffice:ridl
453-
Project: OpenOffice.org
454-
URL: http://www.openoffice.org/api/SDK
455-
License: Apache-2.0
456-
```
457-
458-
```yaml
459-
Id: org.openoffice:unoil
460-
Project: OpenOffice.org
461-
URL: http://www.openoffice.org/api/SDK
462-
License: Apache-2.0
480+
Id: org.libreoffice:unloader
481+
Project: LibreOffice UNO Loader
482+
URL: https://api.libreoffice.org/
483+
License: MPL-2.0 AND Apache-2.0
463484
```
464485
465486
```yaml
@@ -473,20 +494,21 @@ License: BSD-3-Clause
473494
474495
1. `gradlew dependencies > build\reports\project\dependencies.txt`
475496
2. Manually edit depedencies.txt to contain the tree of "compileClasspath" and "implementation" only
476-
3. sed 's/^.* //' < dependencies.txt | sort | uniq
497+
3. `sed 's/^.* //' < build/reports/project/dependencies.txt | sort | uniq > build/dependencies-for-external-libraries.txt`
477498

478499
```text
479500
com.github.tomtung:latex2unicode_2.12:0.2.6
480501
com.google.code.gson:gson:2.8.6
481502
com.google.errorprone:error_prone_annotations:2.3.4
482503
com.google.guava:failureaccess:1.0.1
483-
com.google.guava:guava:29.0-jre
504+
com.google.guava:guava:30.1-jre
484505
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
485506
com.google.j2objc:j2objc-annotations:1.3
507+
com.googlecode.javaewah:JavaEWAH:1.1.7
486508
com.h2database:h2-mvstore:1.4.200
487509
com.ibm.icu:icu4j:62.1
488510
com.jfoenix:jfoenix:9.0.10
489-
com.konghq:unirest-java:3.10.00
511+
com.konghq:unirest-java:3.11.06
490512
com.microsoft.azure:applicationinsights-core:2.4.1
491513
com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1
492514
com.oracle.ojdbc:ojdbc10:19.3.0.0
@@ -498,10 +520,8 @@ com.oracle.ojdbc:ucp:19.3.0.0
498520
com.sun.istack:istack-commons-runtime:3.0.8
499521
com.sun.xml.fastinfoset:FastInfoset:1.2.16
500522
com.tobiasdiez:easybind:2.1.0
501-
com.vladsch.flexmark:flexmark:0.62.2
502523
com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2
503524
com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2
504-
com.vladsch.flexmark:flexmark-util:0.62.2
505525
com.vladsch.flexmark:flexmark-util-ast:0.62.2
506526
com.vladsch.flexmark:flexmark-util-builder:0.62.2
507527
com.vladsch.flexmark:flexmark-util-collection:0.62.2
@@ -513,46 +533,52 @@ com.vladsch.flexmark:flexmark-util-misc:0.62.2
513533
com.vladsch.flexmark:flexmark-util-options:0.62.2
514534
com.vladsch.flexmark:flexmark-util-sequence:0.62.2
515535
com.vladsch.flexmark:flexmark-util-visitor:0.62.2
536+
com.vladsch.flexmark:flexmark-util:0.62.2
537+
com.vladsch.flexmark:flexmark:0.62.2
516538
commons-cli:commons-cli:1.4
517539
commons-codec:commons-codec:1.11
518540
commons-logging:commons-logging:1.2
519541
de.jensd:fontawesomefx-commons:11.0
520542
de.jensd:fontawesomefx-materialdesignfont:1.7.22-11
521-
de.saxsys:mvvmfx:1.8.0
522543
de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT
544+
de.saxsys:mvvmfx:1.8.0
523545
de.undercouch:citeproc-java:2.1.0-SNAPSHOT
524546
eu.lestard:doc-annotations:0.2
525547
info.debatty:java-string-similarity:2.0.0
526-
io.github.java-diff-utils:java-diff-utils:4.7
548+
io.github.java-diff-utils:java-diff-utils:4.9
527549
jakarta.activation:jakarta.activation-api:1.2.1
528550
jakarta.annotation:jakarta.annotation-api:1.3.5
529551
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
530552
net.jcip:jcip-annotations:1.0
531553
net.jodah:typetools:0.6.1
532-
org.antlr:antlr4-runtime:4.8-1
533554
org.antlr:antlr-runtime:3.5.2
555+
org.antlr:antlr4-runtime:4.9
534556
org.apache.commons:commons-csv:1.8
535557
org.apache.commons:commons-lang3:3.9
536558
org.apache.commons:commons-text:1.8
537559
org.apache.httpcomponents:httpasyncclient:4.1.4
538-
org.apache.httpcomponents:httpclient:4.5.12
539-
org.apache.httpcomponents:httpcore:4.4.13
560+
org.apache.httpcomponents:httpclient:4.5.13
540561
org.apache.httpcomponents:httpcore-nio:4.4.13
541-
org.apache.httpcomponents:httpmime:4.5.12
562+
org.apache.httpcomponents:httpcore:4.4.13
563+
org.apache.httpcomponents:httpmime:4.5.13
542564
org.apache.logging.log4j:log4j-api:3.0.0-SNAPSHOT
543565
org.apache.logging.log4j:log4j-core:3.0.0-SNAPSHOT
544566
org.apache.logging.log4j:log4j-jcl:3.0.0-SNAPSHOT
545567
org.apache.logging.log4j:log4j-plugins:3.0.0-SNAPSHOT
546568
org.apache.logging.log4j:log4j-slf4j18-impl:3.0.0-SNAPSHOT
547-
org.apache.pdfbox:fontbox:2.0.20
548-
org.apache.pdfbox:pdfbox:2.0.20
549-
org.apache.pdfbox:xmpbox:2.0.20
550-
org.apache.tika:tika-core:1.24.1
551-
org.bouncycastle:bcprov-jdk15on:1.66
552-
org.checkerframework:checker-qual:2.11.1
553-
org.controlsfx:controlsfx:11.0.2
554-
org.fxmisc.flowless:flowless:0.6.1
555-
org.fxmisc.richtext:richtextfx:0.10.5
569+
org.apache.lucene:lucene-core:8.7.0
570+
org.apache.lucene:lucene-queries:8.7.0
571+
org.apache.lucene:lucene-queryparser:8.7.0
572+
org.apache.pdfbox:fontbox:2.0.22
573+
org.apache.pdfbox:pdfbox:2.0.22
574+
org.apache.pdfbox:xmpbox:2.0.22
575+
org.apache.tika:tika-core:1.25
576+
org.bouncycastle:bcprov-jdk15on:1.67
577+
org.checkerframework:checker-qual:3.5.0
578+
org.controlsfx:controlsfx:11.0.3
579+
org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r
580+
org.fxmisc.flowless:flowless:0.6.2
581+
org.fxmisc.richtext:richtextfx:0.10.4
556582
org.fxmisc.undo:undofx:2.1.0
557583
org.fxmisc.wellbehaved:wellbehavedfx:0.3.3
558584
org.glassfish.hk2.external:jakarta.inject:2.6.1
@@ -566,20 +592,22 @@ org.jbibtex:jbibtex:1.0.17
566592
org.jetbrains:annotations:15.0
567593
org.jsoup:jsoup:1.13.1
568594
org.jvnet.staxex:stax-ex:1.8.1
569-
org.mariadb.jdbc:mariadb-java-client:2.6.2
570-
org.openjfx:javafx-base:14
571-
org.openjfx:javafx-controls:14
572-
org.openjfx:javafx-fxml:14
573-
org.openjfx:javafx-graphics:14
574-
org.openjfx:javafx-media:14
575-
org.openjfx:javafx-swing:14
576-
org.openjfx:javafx-web:14
577-
org.ow2.asm:asm:6.2.1
595+
org.libreoffice:libreoffice:7.0.3
596+
org.libreoffice:unoloader:7.0.4
597+
org.mariadb.jdbc:mariadb-java-client:2.7.1
598+
org.openjfx:javafx-base:15
599+
org.openjfx:javafx-controls:15
600+
org.openjfx:javafx-fxml:15
601+
org.openjfx:javafx-graphics:15
602+
org.openjfx:javafx-media:15
603+
org.openjfx:javafx-swing:15
604+
org.openjfx:javafx-web:15
578605
org.ow2.asm:asm-analysis:6.2.1
579606
org.ow2.asm:asm-commons:6.2.1
580607
org.ow2.asm:asm-tree:6.2.1
581608
org.ow2.asm:asm-util:6.2.1
582-
org.postgresql:postgresql:42.2.16
609+
org.ow2.asm:asm:6.2.1
610+
org.postgresql:postgresql:42.2.18
583611
org.reactfx:reactfx:2.0-M5
584612
org.scala-lang:scala-library:2.12.8
585613
org.slf4j:slf4j-api:2.0.0-alpha1

src/main/java/org/jabref/gui/JabRefFrame.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ private MenuBar createMenu() {
773773

774774
new SeparatorMenuItem(),
775775

776-
factory.createMenuItem(StandardActions.SET_FILE_LINKS, new AutoLinkFilesAction(this, prefs, stateManager, undoManager, Globals.TASK_EXECUTOR)),
776+
factory.createMenuItem(StandardActions.SET_FILE_LINKS, new AutoLinkFilesAction(dialogService, prefs, stateManager, undoManager, Globals.TASK_EXECUTOR)),
777777

778778
new SeparatorMenuItem(),
779779

0 commit comments

Comments
 (0)