Skip to content

Commit 4d57861

Browse files
committed
Merge remote-tracking branch 'upstream/master' into inspireFetcher
* upstream/master: (23 commits) Bump junit-vintage-engine from 5.6.1 to 5.6.2 (#6276) Number of items found in ImportEntriesDialog (#6248) Fix dependency label Bump flexmark-ext-gfm-strikethrough from 0.61.0 to 0.61.6 (#6273) Bump unirest-java from 3.7.01 to 3.7.02 (#6275) Bump junit-platform-launcher from 1.6.1 to 1.6.2 (#6279) Bump flexmark-ext-gfm-tasklist from 0.61.0 to 0.61.6 (#6278) Bump junit-jupiter from 5.6.1 to 5.6.2 (#6274) Bump flexmark from 0.61.0 to 0.61.6 (#6280) Bump classgraph from 4.8.68 to 4.8.69 (#6277) Bump org.beryx.jlink from 2.17.4 to 2.17.5 (#6281) Improve performance (#6270) Improve calculation of matched entries upon change (#6268) Fix sort by priority (#6222) (#6265) Squashed 'src/main/resources/csl-styles/' changes from 88726cb..db54e56 Use https everywhere Entry editor: Add more tooltips and wrap tooltips if necessary (#6239) JDK14 switch - and checkstyle skipping (#6250) Bump postgresql from 42.2.11 to 42.2.12 (#6254) Bump unirest-java from 3.7.00 to 3.7.01 (#6253) ...
2 parents 1244d7d + 67b1203 commit 4d57861

38 files changed

+3586
-963
lines changed

.dependabot/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ update_configs:
66
directory: "/"
77
update_schedule: "weekly"
88
default_labels:
9-
- "dependencies"
9+
- "t: dependencies"
1010
automerged_updates:
1111
- match:
1212
dependency_type: "all"

.idea/runConfigurations/JabRef_Main.xml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
1515
- We updated EditionChecker to permit edition to start with a number. [#6144](https://github.com/JabRef/jabref/issues/6144)
1616
- We added tooltips for most fields in the entry editor containing a short description. [#5847](https://github.com/JabRef/jabref/issues/5847)
1717
- We added support for basic markdown in custom formatted previews [#6194](https://github.com/JabRef/jabref/issues/6194)
18+
- We now show the number of items found and selected to import in the online search dialog. [#6248](https://github.com/JabRef/jabref/pull/6248)
1819

1920
### Changed
2021

@@ -27,13 +28,16 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
2728

2829
### Fixed
2930

31+
- We greatly improved the performance of the overall application and many operations. [#5071](https://github.com/JabRef/jabref/issues/5071)
32+
- We fixed an issue where sort by priority was broken. [#6222](https://github.com/JabRef/jabref/issues/6222)
3033
- We fixed an issue where opening a library from the recent libraries menu was not possible. [#5939](https://github.com/JabRef/jabref/issues/5939)
31-
- We fixed an issue with inconsistent capitalization of file extensions when downloading files [#6115](https://github.com/JabRef/jabref/issues/6115)
34+
- We fixed an issue with inconsistent capitalization of file extensions when downloading files. [#6115](https://github.com/JabRef/jabref/issues/6115)
3235
- We fixed the display of language and encoding in the preferences dialog. [#6130](https://github.com/JabRef/jabref/pull/6130)
3336
- We fixed an issue where search full-text documents downloaded files with same name, overwriting existing files. [#6174](https://github.com/JabRef/jabref/pull/6174)
3437
- We fixed an issue where custom jstyles for Open/LibreOffice where not saved correctly [#6170](https://github.com/JabRef/jabref/issues/6170)
3538
- We fixed an issue where the INSPIRE fetcher was no longer working [#6229](https://github.com/JabRef/jabref/issues/6229)
3639

40+
- We fixe an issue where custom jstyles for Open/LibreOffice where not saved correctly. [#6170](https://github.com/JabRef/jabref/issues/6170)
3741

3842

3943
### Removed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ An explanation of donation possibilities and usage of donations is available at
7676
[![Join the chat at https://gitter.im/JabRef/jabref](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/JabRef/jabref?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
7777
[![OpenHub](https://www.openhub.net/p/jabref/widgets/project_thin_badge.gif)](https://www.openhub.net/p/jabref)
7878

79-
> Not a programmer? [Learn how to help.](http://contribute.jabref.org)
79+
> Not a programmer? [Learn how to help.](https://contribute.jabref.org)
8080
8181
Want to be part of a free and open-source project that tens of thousands of scientists use every day? Check out the ways you can contribute, below:
8282

build.gradle

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
id 'com.github.ben-manes.versions' version '0.28.0'
2323
id 'org.javamodularity.moduleplugin' version '1.5.0'
2424
id 'org.openjfx.javafxplugin' version '0.0.8'
25-
id 'org.beryx.jlink' version '2.17.4'
25+
id 'org.beryx.jlink' version '2.17.5'
2626

2727
// nicer test outputs during running and completion
2828
id 'com.adarshr.test-logger' version '2.0.0'
@@ -120,7 +120,7 @@ dependencies {
120120
implementation group: 'org.apache.tika', name: 'tika-core', version: '1.24'
121121

122122
// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
123-
implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
123+
implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
124124

125125
implementation 'commons-cli:commons-cli:1.4'
126126

@@ -144,7 +144,7 @@ dependencies {
144144

145145
implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.6.0'
146146

147-
implementation 'org.postgresql:postgresql:42.2.11'
147+
implementation 'org.postgresql:postgresql:42.2.12'
148148

149149
implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
150150
// causing module issues
@@ -171,7 +171,7 @@ dependencies {
171171
implementation 'org.controlsfx:controlsfx:11.0.1'
172172

173173
implementation 'org.jsoup:jsoup:1.13.1'
174-
implementation 'com.konghq:unirest-java:3.7.00'
174+
implementation 'com.konghq:unirest-java:3.7.02'
175175

176176
implementation 'org.slf4j:slf4j-api:2.0.0-alpha1'
177177
implementation group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT'
@@ -196,14 +196,14 @@ dependencies {
196196
exclude module: "log4j-core"
197197
}
198198

199-
implementation 'com.vladsch.flexmark:flexmark:0.61.0'
200-
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.61.0'
201-
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.61.0'
199+
implementation 'com.vladsch.flexmark:flexmark:0.61.6'
200+
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.61.6'
201+
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.61.6'
202202

203-
testImplementation 'io.github.classgraph:classgraph:4.8.66'
204-
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.1'
205-
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.1'
206-
testImplementation 'org.junit.platform:junit-platform-launcher:1.6.1'
203+
testImplementation 'io.github.classgraph:classgraph:4.8.69'
204+
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
205+
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.2'
206+
testImplementation 'org.junit.platform:junit-platform-launcher:1.6.2'
207207

208208
testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.9'
209209
testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'

config/checkstyle/checkstyle.xml

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
<property name="header" value=""/>
99
</module>
1010

11+
<!-- BeforeExecutionFileFilters is required for sources that are based on java14 -->
12+
<module name="BeforeExecutionExclusionFileFilter">
13+
<property name="fileNamePattern" value="AuthorAndsReplacer.java|Ordinal.java" />
14+
</module>
15+
1116
<module name="SuppressionFilter">
1217
<property name="file" value="${config_loc}/suppressions.xml"/>
1318
</module>

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,7 @@ private void createMainTable() {
303303
mainTable.addSelectionListener(event -> mainTable.getSelectedEntries()
304304
.stream()
305305
.findFirst()
306-
.ifPresent(entry -> {
307-
entryEditor.setEntry(entry);
308-
}));
306+
.ifPresent(entryEditor::setEntry));
309307

310308
// TODO: Register these actions globally
311309
/*

0 commit comments

Comments
 (0)