Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Browse files Browse the repository at this point in the history
…dtask

* 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)
  • Loading branch information
Siedlerchr committed Dec 25, 2020
2 parents ad50cc9 + 46ec6d9 commit 082580c
Show file tree
Hide file tree
Showing 34 changed files with 238 additions and 136 deletions.
1 change: 1 addition & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Deployment

on:
workflow_dispatch:
push:
branches:
- master
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ Hollyqqqqq
Houssem Nasri
hrandrianasolo
Hussain Arif
IfIWantedTo
Igor Chernyavsky
Igor Steinmacher
Illes Solt
Expand Down
16 changes: 13 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Changelog

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

### Added

### Changed

### Fixed

### Removed

## [5.2] – 2020-12-24

### Added

- 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)
- 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)
- 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)
- We added connection check function in network preference setting [#6560](https://github.com/JabRef/jabref/issues/6560)
- We added support for exporting to YAML. [#6974](https://github.com/JabRef/jabref/issues/6974)
- 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)
- We added a new fetcher to enable users to search jstor.org [#6627](https://github.com/JabRef/jabref/issues/6627)
- 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)
- We added a new formatter to output shorthand month format. [#6579](https://github.com/JabRef/jabref/issues/6579)
- We added support for the new Microsoft Edge browser in all platforms. [#7056](https://github.com/JabRef/jabref/pull/7056)
Expand Down Expand Up @@ -83,6 +91,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve

### Removed

- 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)
- We removed the menu entry "Manage external file types" because it's already in 'Preferences' dialog [#6991](https://github.com/JabRef/jabref/issues/6991)
- We removed the integrity check "Abbreviation detected" for the field journal/journaltitle in the entry editor [#3925](https://github.com/JabRef/jabref/issues/3925)

Expand Down Expand Up @@ -483,7 +492,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.1...HEAD
[Unreleased]: https://github.com/JabRef/jabref/compare/v5.2...HEAD
[5.2]: https://github.com/JabRef/jabref/compare/v5.1...v5.2
[5.1]: https://github.com/JabRef/jabref/compare/v5.0...v5.1
[5.0]: https://github.com/JabRef/jabref/compare/v5.0-beta...v5.0
[5.0-beta]: https://github.com/JabRef/jabref/compare/v5.0-alpha...v5.0-beta
Expand Down
2 changes: 2 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ files:
two_letters_code:
pt-BR: pt_BR
id: in
zh-CN: zh_CN
zh-TW: zh_TW
2 changes: 1 addition & 1 deletion docs/adr/0009-use-plain-junit5-for-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ assertFalse(actual.contains("\n"));

### Hamcrest

Homepage: <http://hamcrest.org/JavaHamcrest/>
Homepage: <https://github.com/hamcrest/JavaHamcrest>

* Good, because offers advanced matchers (such as `contains`)
* Bad, because not full fluent API
Expand Down
134 changes: 81 additions & 53 deletions external-libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This file is manually kept in sync with build.gradle and the binary jars contain

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

## Legend

Expand Down Expand Up @@ -78,6 +78,13 @@ URL: https://github.com/google/j2objc
License: Apache-2.0
```
```yaml
Id: com.googlecode.javaewah:JavaEWAH
Project: JavaEWAH
URL: https://github.com/lemire/javaewah
License: Apache-2.0
```
```yaml
Id: com.ibm.icu:icu4j
Project: International Components for Unicode for Java (ICU4J)
Expand Down Expand Up @@ -301,6 +308,27 @@ URL: http://logging.apache.org/log4j/2.x/
License: Apache-2.0
```
```yaml
Id: org.apache.lucene:lucene-core
Project: Apache Lucene
URL: https://lucene.apache.org/
License: Apache-2.0
```
```yaml
Id: org.apache.lucene:lucene-queries
Project: Apache Lucene
URL: https://lucene.apache.org/
License: Apache-2.0
```
```yaml
Id: org.apache.lucene:lucene-ueryparser
Project: Apache Lucene
URL: https://lucene.apache.org/
License: Apache-2.0
```
```yaml
Id: org.apache.pdfbox:fontbox
Project: Apache PDFBox
Expand Down Expand Up @@ -357,6 +385,13 @@ URL: http://fxexperience.com/controlsfx/
License: BSD-3-Clause
```
```yaml
Id: org.eclipse.jgit:org.eclipse.jgit
Project: Eclipse JGit
URL: https://www.eclipse.org/jgit/
License: BSD-3-Clause
```
```yaml
Id: org.fxmisc.flowless:flowless
Project: Flowless
Expand Down Expand Up @@ -435,31 +470,17 @@ License: GPL-2.0 WITH Classpath-exception-2.0
```
```yaml
Id: org.openoffice:juh
Project: OpenOffice.org
URL: http://www.openoffice.org/api/SDK
License: LGPL 3.0
Id: org.libreoffice:libreoffice
Project: LibreOffice
URL: https://api.libreoffice.org/
License: MPL-2.0 OR LGPL 3.0+
```
```yaml
Id: org.openoffice:jurt
Project: OpenOffice.org
URL: http://www.openoffice.org/api/SDK
License: Apache-2.0
```
```yaml
Id: org.openoffice:ridl
Project: OpenOffice.org
URL: http://www.openoffice.org/api/SDK
License: Apache-2.0
```
```yaml
Id: org.openoffice:unoil
Project: OpenOffice.org
URL: http://www.openoffice.org/api/SDK
License: Apache-2.0
Id: org.libreoffice:unloader
Project: LibreOffice UNO Loader
URL: https://api.libreoffice.org/
License: MPL-2.0 AND Apache-2.0
```
```yaml
Expand All @@ -473,20 +494,21 @@ License: BSD-3-Clause
1. `gradlew dependencies > build\reports\project\dependencies.txt`
2. Manually edit depedencies.txt to contain the tree of "compileClasspath" and "implementation" only
3. sed 's/^.* //' < dependencies.txt | sort | uniq
3. `sed 's/^.* //' < build/reports/project/dependencies.txt | sort | uniq > build/dependencies-for-external-libraries.txt`

```text
com.github.tomtung:latex2unicode_2.12:0.2.6
com.google.code.gson:gson:2.8.6
com.google.errorprone:error_prone_annotations:2.3.4
com.google.guava:failureaccess:1.0.1
com.google.guava:guava:29.0-jre
com.google.guava:guava:30.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.googlecode.javaewah:JavaEWAH:1.1.7
com.h2database:h2-mvstore:1.4.200
com.ibm.icu:icu4j:62.1
com.jfoenix:jfoenix:9.0.10
com.konghq:unirest-java:3.10.00
com.konghq:unirest-java:3.11.06
com.microsoft.azure:applicationinsights-core:2.4.1
com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1
com.oracle.ojdbc:ojdbc10:19.3.0.0
Expand All @@ -498,10 +520,8 @@ com.oracle.ojdbc:ucp:19.3.0.0
com.sun.istack:istack-commons-runtime:3.0.8
com.sun.xml.fastinfoset:FastInfoset:1.2.16
com.tobiasdiez:easybind:2.1.0
com.vladsch.flexmark:flexmark:0.62.2
com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2
com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2
com.vladsch.flexmark:flexmark-util:0.62.2
com.vladsch.flexmark:flexmark-util-ast:0.62.2
com.vladsch.flexmark:flexmark-util-builder:0.62.2
com.vladsch.flexmark:flexmark-util-collection:0.62.2
Expand All @@ -513,46 +533,52 @@ com.vladsch.flexmark:flexmark-util-misc:0.62.2
com.vladsch.flexmark:flexmark-util-options:0.62.2
com.vladsch.flexmark:flexmark-util-sequence:0.62.2
com.vladsch.flexmark:flexmark-util-visitor:0.62.2
com.vladsch.flexmark:flexmark-util:0.62.2
com.vladsch.flexmark:flexmark:0.62.2
commons-cli:commons-cli:1.4
commons-codec:commons-codec:1.11
commons-logging:commons-logging:1.2
de.jensd:fontawesomefx-commons:11.0
de.jensd:fontawesomefx-materialdesignfont:1.7.22-11
de.saxsys:mvvmfx:1.8.0
de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT
de.saxsys:mvvmfx:1.8.0
de.undercouch:citeproc-java:2.1.0-SNAPSHOT
eu.lestard:doc-annotations:0.2
info.debatty:java-string-similarity:2.0.0
io.github.java-diff-utils:java-diff-utils:4.7
io.github.java-diff-utils:java-diff-utils:4.9
jakarta.activation:jakarta.activation-api:1.2.1
jakarta.annotation:jakarta.annotation-api:1.3.5
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
net.jcip:jcip-annotations:1.0
net.jodah:typetools:0.6.1
org.antlr:antlr4-runtime:4.8-1
org.antlr:antlr-runtime:3.5.2
org.antlr:antlr4-runtime:4.9
org.apache.commons:commons-csv:1.8
org.apache.commons:commons-lang3:3.9
org.apache.commons:commons-text:1.8
org.apache.httpcomponents:httpasyncclient:4.1.4
org.apache.httpcomponents:httpclient:4.5.12
org.apache.httpcomponents:httpcore:4.4.13
org.apache.httpcomponents:httpclient:4.5.13
org.apache.httpcomponents:httpcore-nio:4.4.13
org.apache.httpcomponents:httpmime:4.5.12
org.apache.httpcomponents:httpcore:4.4.13
org.apache.httpcomponents:httpmime:4.5.13
org.apache.logging.log4j:log4j-api:3.0.0-SNAPSHOT
org.apache.logging.log4j:log4j-core:3.0.0-SNAPSHOT
org.apache.logging.log4j:log4j-jcl:3.0.0-SNAPSHOT
org.apache.logging.log4j:log4j-plugins:3.0.0-SNAPSHOT
org.apache.logging.log4j:log4j-slf4j18-impl:3.0.0-SNAPSHOT
org.apache.pdfbox:fontbox:2.0.20
org.apache.pdfbox:pdfbox:2.0.20
org.apache.pdfbox:xmpbox:2.0.20
org.apache.tika:tika-core:1.24.1
org.bouncycastle:bcprov-jdk15on:1.66
org.checkerframework:checker-qual:2.11.1
org.controlsfx:controlsfx:11.0.2
org.fxmisc.flowless:flowless:0.6.1
org.fxmisc.richtext:richtextfx:0.10.5
org.apache.lucene:lucene-core:8.7.0
org.apache.lucene:lucene-queries:8.7.0
org.apache.lucene:lucene-queryparser:8.7.0
org.apache.pdfbox:fontbox:2.0.22
org.apache.pdfbox:pdfbox:2.0.22
org.apache.pdfbox:xmpbox:2.0.22
org.apache.tika:tika-core:1.25
org.bouncycastle:bcprov-jdk15on:1.67
org.checkerframework:checker-qual:3.5.0
org.controlsfx:controlsfx:11.0.3
org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r
org.fxmisc.flowless:flowless:0.6.2
org.fxmisc.richtext:richtextfx:0.10.4
org.fxmisc.undo:undofx:2.1.0
org.fxmisc.wellbehaved:wellbehavedfx:0.3.3
org.glassfish.hk2.external:jakarta.inject:2.6.1
Expand All @@ -566,20 +592,22 @@ org.jbibtex:jbibtex:1.0.17
org.jetbrains:annotations:15.0
org.jsoup:jsoup:1.13.1
org.jvnet.staxex:stax-ex:1.8.1
org.mariadb.jdbc:mariadb-java-client:2.6.2
org.openjfx:javafx-base:14
org.openjfx:javafx-controls:14
org.openjfx:javafx-fxml:14
org.openjfx:javafx-graphics:14
org.openjfx:javafx-media:14
org.openjfx:javafx-swing:14
org.openjfx:javafx-web:14
org.ow2.asm:asm:6.2.1
org.libreoffice:libreoffice:7.0.3
org.libreoffice:unoloader:7.0.4
org.mariadb.jdbc:mariadb-java-client:2.7.1
org.openjfx:javafx-base:15
org.openjfx:javafx-controls:15
org.openjfx:javafx-fxml:15
org.openjfx:javafx-graphics:15
org.openjfx:javafx-media:15
org.openjfx:javafx-swing:15
org.openjfx:javafx-web:15
org.ow2.asm:asm-analysis:6.2.1
org.ow2.asm:asm-commons:6.2.1
org.ow2.asm:asm-tree:6.2.1
org.ow2.asm:asm-util:6.2.1
org.postgresql:postgresql:42.2.16
org.ow2.asm:asm:6.2.1
org.postgresql:postgresql:42.2.18
org.reactfx:reactfx:2.0-M5
org.scala-lang:scala-library:2.12.8
org.slf4j:slf4j-api:2.0.0-alpha1
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/JabRefFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ private MenuBar createMenu() {

new SeparatorMenuItem(),

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

new SeparatorMenuItem(),

Expand Down
Loading

0 comments on commit 082580c

Please sign in to comment.