Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into inspireFetcher
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
Siedlerchr committed Apr 13, 2020
2 parents 1244d7d + 67b1203 commit 4d57861
Show file tree
Hide file tree
Showing 38 changed files with 3,586 additions and 963 deletions.
2 changes: 1 addition & 1 deletion .dependabot/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ update_configs:
directory: "/"
update_schedule: "weekly"
default_labels:
- "dependencies"
- "t: dependencies"
automerged_updates:
- match:
dependency_type: "all"
Expand Down
3 changes: 3 additions & 0 deletions .idea/runConfigurations/JabRef_Main.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We updated EditionChecker to permit edition to start with a number. [#6144](https://github.com/JabRef/jabref/issues/6144)
- We added tooltips for most fields in the entry editor containing a short description. [#5847](https://github.com/JabRef/jabref/issues/5847)
- We added support for basic markdown in custom formatted previews [#6194](https://github.com/JabRef/jabref/issues/6194)
- 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)

### Changed

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

### Fixed

- We greatly improved the performance of the overall application and many operations. [#5071](https://github.com/JabRef/jabref/issues/5071)
- We fixed an issue where sort by priority was broken. [#6222](https://github.com/JabRef/jabref/issues/6222)
- We fixed an issue where opening a library from the recent libraries menu was not possible. [#5939](https://github.com/JabRef/jabref/issues/5939)
- We fixed an issue with inconsistent capitalization of file extensions when downloading files [#6115](https://github.com/JabRef/jabref/issues/6115)
- We fixed an issue with inconsistent capitalization of file extensions when downloading files. [#6115](https://github.com/JabRef/jabref/issues/6115)
- We fixed the display of language and encoding in the preferences dialog. [#6130](https://github.com/JabRef/jabref/pull/6130)
- 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)
- We fixed an issue where custom jstyles for Open/LibreOffice where not saved correctly [#6170](https://github.com/JabRef/jabref/issues/6170)
- We fixed an issue where the INSPIRE fetcher was no longer working [#6229](https://github.com/JabRef/jabref/issues/6229)

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


### Removed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ An explanation of donation possibilities and usage of donations is available at
[![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)
[![OpenHub](https://www.openhub.net/p/jabref/widgets/project_thin_badge.gif)](https://www.openhub.net/p/jabref)

> Not a programmer? [Learn how to help.](http://contribute.jabref.org)
> Not a programmer? [Learn how to help.](https://contribute.jabref.org)
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:

Expand Down
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
id 'com.github.ben-manes.versions' version '0.28.0'
id 'org.javamodularity.moduleplugin' version '1.5.0'
id 'org.openjfx.javafxplugin' version '0.0.8'
id 'org.beryx.jlink' version '2.17.4'
id 'org.beryx.jlink' version '2.17.5'

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

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

implementation 'commons-cli:commons-cli:1.4'

Expand All @@ -144,7 +144,7 @@ dependencies {

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

implementation 'org.postgresql:postgresql:42.2.11'
implementation 'org.postgresql:postgresql:42.2.12'

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

implementation 'org.jsoup:jsoup:1.13.1'
implementation 'com.konghq:unirest-java:3.7.00'
implementation 'com.konghq:unirest-java:3.7.02'

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

implementation 'com.vladsch.flexmark:flexmark:0.61.0'
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.61.0'
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.61.0'
implementation 'com.vladsch.flexmark:flexmark:0.61.6'
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.61.6'
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.61.6'

testImplementation 'io.github.classgraph:classgraph:4.8.66'
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.1'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.1'
testImplementation 'org.junit.platform:junit-platform-launcher:1.6.1'
testImplementation 'io.github.classgraph:classgraph:4.8.69'
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.2'
testImplementation 'org.junit.platform:junit-platform-launcher:1.6.2'

testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.9'
testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
Expand Down
5 changes: 5 additions & 0 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
<property name="header" value=""/>
</module>

<!-- BeforeExecutionFileFilters is required for sources that are based on java14 -->
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="AuthorAndsReplacer.java|Ordinal.java" />
</module>

<module name="SuppressionFilter">
<property name="file" value="${config_loc}/suppressions.xml"/>
</module>
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/jabref/gui/BasePanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,7 @@ private void createMainTable() {
mainTable.addSelectionListener(event -> mainTable.getSelectedEntries()
.stream()
.findFirst()
.ifPresent(entry -> {
entryEditor.setEntry(entry);
}));
.ifPresent(entryEditor::setEntry));

// TODO: Register these actions globally
/*
Expand Down
Loading

0 comments on commit 4d57861

Please sign in to comment.