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:
  Bump pdfbox from 2.0.21 to 2.0.22 (#7213)
  Bump fontbox from 2.0.21 to 2.0.22 (#7219)
  Bump archunit-junit5-api from 0.14.1 to 0.15.0 (#7220)
  Bump unoloader from 7.0.3 to 7.0.4 (#7214)
  Bump guava from 30.0-jre to 30.1-jre (#7218)
  Bump xmpbox from 2.0.21 to 2.0.22 (#7217)
  Bump classgraph from 4.8.94 to 4.8.97 (#7211)
  Bump byte-buddy-parent from 1.10.18 to 1.10.19 (#7216)
  Bump archunit-junit5-engine from 0.14.1 to 0.15.0 (#7215)
  Bump org.beryx.jlink from 2.22.3 to 2.23.0 (#7212)
  Add missing author
  Remove field check for journal abbrev in entry editor (#7208)
  • Loading branch information
Siedlerchr committed Dec 21, 2020
2 parents 2cb8a2d + f0ce88a commit 8d429cd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Anita Armbruster
Antonio Ribeiro
Arno Blouin
Arthur Fröhlich
AtrusRiven
Atul Kaushik
August Janse
Ayachi Nene
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
### Removed

- 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)

## [5.1] – 2020-08-30

Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins {
id 'com.github.ben-manes.versions' version '0.36.0'
id 'org.javamodularity.moduleplugin' version '1.7.0'
id 'org.openjfx.javafxplugin' version '0.0.9'
id 'org.beryx.jlink' version '2.22.3'
id 'org.beryx.jlink' version '2.23.0'
// nicer test outputs during running and completion
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
id 'com.adarshr.test-logger' version '2.1.1'
Expand Down Expand Up @@ -100,9 +100,9 @@ dependencies {
// Include all jar-files in the 'lib' folder as dependencies
implementation fileTree(dir: 'lib', includes: ['*.jar'])

implementation 'org.apache.pdfbox:pdfbox:2.0.21'
implementation 'org.apache.pdfbox:fontbox:2.0.21'
implementation 'org.apache.pdfbox:xmpbox:2.0.21'
implementation 'org.apache.pdfbox:pdfbox:2.0.22'
implementation 'org.apache.pdfbox:fontbox:2.0.22'
implementation 'org.apache.pdfbox:xmpbox:2.0.22'

implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.8'
implementation 'com.h2database:h2-mvstore:1.4.200'
Expand All @@ -115,7 +115,7 @@ dependencies {
implementation 'commons-cli:commons-cli:1.4'

implementation 'org.libreoffice:libreoffice:7.0.3'
implementation 'org.libreoffice:unoloader:7.0.3'
implementation 'org.libreoffice:unoloader:7.0.4'

implementation 'io.github.java-diff-utils:java-diff-utils:4.9'
implementation 'info.debatty:java-string-similarity:2.0.0'
Expand All @@ -141,7 +141,7 @@ dependencies {
exclude module: 'oraclepki'
}

implementation ('com.google.guava:guava:30.0-jre') {
implementation ('com.google.guava:guava:30.1-jre') {
// TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
exclude module: "jsr305"
}
Expand Down Expand Up @@ -190,19 +190,19 @@ dependencies {
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2'
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2'

testImplementation 'io.github.classgraph:classgraph:4.8.94'
testImplementation 'io.github.classgraph:classgraph:4.8.97'
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.0'
testImplementation 'org.junit.platform:junit-platform-launcher:1.7.0'

testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.18'
testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.19'
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'
testImplementation 'org.mockito:mockito-core:3.6.28'
testImplementation 'org.xmlunit:xmlunit-core:2.8.1'
testImplementation 'org.xmlunit:xmlunit-matchers:2.8.1'
testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.14.1'
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.14.1'
testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.15.0'
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.15.0'
testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT"
testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
testImplementation "org.hamcrest:hamcrest-library:2.2"
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/org/jabref/logic/integrity/FieldCheckers.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ public FieldCheckers(BibDatabaseContext databaseContext, FilePreferences filePre
private static Multimap<Field, ValueChecker> getAllMap(BibDatabaseContext databaseContext, FilePreferences filePreferences, JournalAbbreviationRepository abbreviationRepository, boolean allowIntegerEdition) {
ArrayListMultimap<Field, ValueChecker> fieldCheckers = ArrayListMultimap.create(50, 10);

for (Field field : FieldFactory.getJournalNameFields()) {
fieldCheckers.put(field, new AbbreviationChecker(abbreviationRepository));
}
for (Field field : FieldFactory.getBookNameFields()) {
fieldCheckers.put(field, new AbbreviationChecker(abbreviationRepository));
}
Expand Down

0 comments on commit 8d429cd

Please sign in to comment.