Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into gradlew-update-7.0
Browse files Browse the repository at this point in the history
* upstream/main:
  Bump checkstyle from 8.41.1 to 8.42 (#7668)
  Bump postgresql from 42.2.19 to 42.2.20 (#7670)
  Bump org.beryx.jlink from 2.23.6 to 2.23.7 (#7669)
  Fix exception when searching (#7659)
  • Loading branch information
Siedlerchr committed Apr 26, 2021
2 parents 7ea3496 + 68095ab commit 76a4715
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where the "Search for unlinked local files" would throw an exception when parsing the content of a PDF-file with missing "series" information [#5128](https://github.com/JabRef/jabref/issues/5128)
- We fixed an issue where the XMP Importer would incorrectly return an empty default entry when importing pdfs [#6577](https://github.com/JabRef/jabref/issues/6577)
- We fixed an issue where opening the menu 'Library properties' marked the library as modified [#6451](https://github.com/JabRef/jabref/issues/6451)
- We fixed an issue when importing resulted in an exception [#7343](https://github.com/JabRef/jabref/issues/7343)

### Removed

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
id 'com.github.ben-manes.versions' version '0.38.0'
id 'org.javamodularity.moduleplugin' version '1.7.0'
id 'org.openjfx.javafxplugin' version '0.0.9'
id 'org.beryx.jlink' version '2.23.6'
id 'org.beryx.jlink' version '2.23.7'
// nicer test outputs during running and completion
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
id 'com.adarshr.test-logger' version '3.0.0'
Expand Down Expand Up @@ -143,7 +143,7 @@ dependencies {

implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.2'

implementation 'org.postgresql:postgresql:42.2.19'
implementation 'org.postgresql:postgresql:42.2.20'

implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
// causing module issues
Expand Down Expand Up @@ -218,7 +218,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.41.1'
checkstyle 'com.puppycrawl.tools:checkstyle:8.42'
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.3'
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/logic/importer/ImportCleanup.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ public BibEntry doPostCleanup(BibEntry entry) {
* Performs a format conversion of the given entry collection into the targeted format.
*/
public void doPostCleanup(Collection<BibEntry> entries) {
entries.parallelStream().forEach(entry -> doPostCleanup(entry));
entries.forEach(this::doPostCleanup);
}
}

0 comments on commit 76a4715

Please sign in to comment.