Skip to content

Commit bb88fb2

Browse files
committed
Merge remote-tracking branch 'upstream/master' into test-module-issue
* upstream/master: (33 commits) 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) Improvements for Entry Preview (in the context of #7083 and in addition to #7093) (#7185) Fix pdf content importer exception if DOI is empty (#7207) New translations JabRef_en.properties (Turkish) (#7204) New Crowdin updates (#7198) New Crowdin updates (#7192) Added missing test Changed tests to parameterized tests Extraction of Globals.prefs.put and .get (#7121) Fix newly added entry not synced to db (#7178) Bump org.eclipse.jgit from 5.9.0.202009080501-r to 5.10.0.202012080955-r (#7187) ...
2 parents 8aee951 + 914964f commit bb88fb2

File tree

182 files changed

+3484
-2615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+3484
-2615
lines changed

.github/workflows/stale.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,27 @@ name: Mark stale issues and pull requests
22

33
on:
44
schedule:
5-
- cron: "0 0 * * *"
5+
- cron: "20 19 * * *"
66

77
jobs:
88
stale:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/stale@master
12+
- uses: actions/stale@v3
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
15-
stale-issue-message: 'This issue will be closed in 7 days due to inactivity :zzz: Please provide the requested information if the problem persists.'
15+
days-before-stale: 180
16+
days-before-close: 14
17+
stale-issue-message: |
18+
This issue has been inactive for half a year. Since JabRef is constantly evolving this issue may not be relevant any longer and it will be closed in two weeks if no further activity occurs.
19+
20+
As part of an effort to ensure that the JabRef team is focusing on important and valid issues, we would like to ask if you could update the issue if it still persists. This could be in the following form:
21+
22+
- If there has been a longer discussion, add a short summary of the most important points as a new comment (if not yet existing).
23+
- Provide further steps or information on how to reproduce this issue.
24+
- Upvote the initial post if you like to see it implemented soon. Votes are not the only metric that we use to determine the requests that are implemented, however, they do factor into our decision-making process.
25+
- If all information is provided and still up-to-date, then just add a short comment that the issue is still relevant.
26+
27+
Thank you for your contribution!
1628
stale-issue-label: 'status: stale'
17-
days-before-stale: 30
18-
only-labels: 'status: waiting-for-customer-feedback'

.idea/runConfigurations/JabRef_Main.xml

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Anita Armbruster
3838
Antonio Ribeiro
3939
Arno Blouin
4040
Arthur Fröhlich
41+
AtrusRiven
4142
Atul Kaushik
4243
August Janse
4344
Ayachi Nene

CHANGELOG.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
1717
- 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)
1818
- We added connection check function in network preference setting [#6560](https://github.com/JabRef/jabref/issues/6560)
1919
- We added support for exporting to YAML. [#6974](https://github.com/JabRef/jabref/issues/6974)
20-
- We added a DOI format and organization check to detect [American Physical Society](https://journals.aps.org/) journals to copy the article ID
21-
to the page field for cases where the page numbers are missing. [#7019](https://github.com/JabRef/jabref/issues/7019)
20+
- 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)
2221
- We added a new fetcher to enable users to search jstor.org [#6627](https://github.com/JabRef/jabref/issues/6627)
2322
- 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)
2423
- We added a new formatter to output shorthand month format. [#6579](https://github.com/JabRef/jabref/issues/6579)
@@ -28,8 +27,7 @@ to the page field for cases where the page numbers are missing. [#7019](https://
2827

2928
### Changed
3029

31-
- We changed the default preferences for OpenOffice/LibreOffice integration to automatically sync the bibliography when
32-
inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://github.com/JabRef/jabref/issues/6957)
30+
- We changed the default preferences for OpenOffice/LibreOffice integration to automatically sync the bibliography when inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://github.com/JabRef/jabref/issues/6957)
3331
- We restructured the 'File' tab and extracted some parts into the 'Linked files' tab [#6779](https://github.com/JabRef/jabref/pull/6779)
3432
- JabRef now offers journal lists from <https://abbrv.jabref.org>. JabRef the lists which use a dot inside the abbreviations. [#5749](https://github.com/JabRef/jabref/pull/5749)
3533
- We removed two useless preferences in the groups preferences dialog. [#6836](https://github.com/JabRef/jabref/pull/6836)
@@ -48,7 +46,8 @@ inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://git
4846
- We changed the name of a group type from "Searching for keywords" to "Searching for a keyword". [6995](https://github.com/JabRef/jabref/pull/6995)
4947
- We changed the way JabRef displays the title of a tab and of the window. [4161](https://github.com/JabRef/jabref/issues/4161)
5048
- We changed connect timeouts for server requests to 30 seconds in general and 5 seconds for GROBID server (special) and improved user notifications on connection issues. [7026](https://github.com/JabRef/jabref/pull/7026)
51-
- We changed the way linked files are opened on Linux to use the native openFile method, compatible with confined packages. [7037](https://github.com/JabRef/jabref/pull/7037)
49+
- We changed the order of the library tab context menu items. [#7171](https://github.com/JabRef/jabref/issues/7171)
50+
- We changed the way linked files are opened on Linux to use the native openFile method, compatible with confined packages. [7037](https://github.com/JabRef/jabref/pull/7037)
5251
- We refined the entry preview to show the full names of authors and editors, to list the editor only if no author is present, have the year ealier. [#7083](https://github.com/JabRef/jabref/issues/7083)
5352

5453
### Fixed
@@ -77,11 +76,15 @@ inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://git
7776
- We fixed an issue where the color of groups of type "free search expression" not persisting after restarting the application [#6999](https://github.com/JabRef/jabref/issues/6999)
7877
- We fixed an issue where modifications in the source tab where not saved without switching to another field before saving the library [#6622](https://github.com/JabRef/jabref/issues/6622)
7978
- We fixed an issue where the "Document Viewer" did not show the first page of the opened pdf document and did not show the correct total number of pages [#7108](https://github.com/JabRef/jabref/issues/7108)
79+
- We fixed an issue where the context menu was not updated after a file link was changed. [#5777](https://github.com/JabRef/jabref/issues/5777)
8080
- We fixed an issue where the password for a shared SQL database was not remembered [#6869](https://github.com/JabRef/jabref/issues/6869)
81+
- We fixed an issue where newly added entires were not synced to a shared SQL database [#7176](https://github.com/JabRef/jabref/issues/7176)
82+
- We fixed an issue where the PDF-Content importer threw an exception when no DOI number is present at the first page of the PDF document [#7203](https://github.com/JabRef/jabref/issues/7203)
8183

8284
### Removed
8385

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

8689
## [5.1] – 2020-08-30
8790

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
id 'com.github.ben-manes.versions' version '0.36.0'
1515
id 'org.javamodularity.moduleplugin' version '1.7.0'
1616
id 'org.openjfx.javafxplugin' version '0.0.9'
17-
id 'org.beryx.jlink' version '2.22.3'
17+
id 'org.beryx.jlink' version '2.23.0'
1818
// nicer test outputs during running and completion
1919
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
2020
id 'com.adarshr.test-logger' version '2.1.1'
@@ -103,20 +103,20 @@ dependencies {
103103

104104
implementation 'org.apache.pdfbox:pdfbox:2.0.21'
105105
implementation 'org.apache.pdfbox:fontbox:2.0.21'
106-
implementation 'org.apache.pdfbox:xmpbox:2.0.21'
106+
implementation 'org.apache.pdfbox:xmpbox:2.0.22'
107107

108108
implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.8'
109109
implementation 'com.h2database:h2-mvstore:1.4.200'
110110

111-
implementation group: 'org.apache.tika', name: 'tika-core', version: '1.24.1'
111+
implementation group: 'org.apache.tika', name: 'tika-core', version: '1.25'
112112

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

116116
implementation 'commons-cli:commons-cli:1.4'
117117

118118
implementation 'org.libreoffice:libreoffice:7.0.3'
119-
implementation 'org.libreoffice:unoloader:7.0.3'
119+
implementation 'org.libreoffice:unoloader:7.0.4'
120120

121121
implementation 'io.github.java-diff-utils:java-diff-utils:4.9'
122122
implementation 'info.debatty:java-string-similarity:2.0.0'
@@ -131,7 +131,7 @@ dependencies {
131131
exclude group: 'org.apache.lucene', module: 'lucene-sandbox'
132132
}
133133

134-
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.9.0.202009080501-r'
134+
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.10.0.202012080955-r'
135135

136136

137137
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.12.0'
@@ -145,7 +145,7 @@ dependencies {
145145
exclude module: 'oraclepki'
146146
}
147147

148-
implementation ('com.google.guava:guava:30.0-jre') {
148+
implementation ('com.google.guava:guava:30.1-jre') {
149149
// TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
150150
exclude module: "jsr305"
151151
}
@@ -165,7 +165,7 @@ dependencies {
165165
implementation 'org.controlsfx:controlsfx:11.0.3'
166166

167167
implementation 'org.jsoup:jsoup:1.13.1'
168-
implementation 'com.konghq:unirest-java:3.11.05'
168+
implementation 'com.konghq:unirest-java:3.11.06'
169169

170170
implementation 'org.slf4j:slf4j-api:2.0.0-alpha1'
171171
implementation group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT'
@@ -194,19 +194,19 @@ dependencies {
194194
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2'
195195
implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2'
196196

197-
testImplementation 'io.github.classgraph:classgraph:4.8.92'
197+
testImplementation 'io.github.classgraph:classgraph:4.8.97'
198198
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
199199
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.0'
200200
testImplementation 'org.junit.platform:junit-platform-launcher:1.7.0'
201201

202-
testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.18'
202+
testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.19'
203203
testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
204204
testRuntime group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
205205
testImplementation 'org.mockito:mockito-core:3.6.28'
206206
testImplementation 'org.xmlunit:xmlunit-core:2.8.1'
207207
testImplementation 'org.xmlunit:xmlunit-matchers:2.8.1'
208-
testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.14.1'
209-
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.14.1'
208+
testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.15.0'
209+
testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.15.0'
210210
testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT"
211211
testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
212212
testImplementation "org.hamcrest:hamcrest-library:2.2"

docs/getting-into-the-code/code-howtos.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.
211211

212212
## How to work with Preferences
213213

214-
`model` and `logic` must not know JabRefPreferences. See `ProxyPreferences` for encapsulated preferences and [https://github.com/JabRef/jabref/pull/658](https://github.com/JabRef/jabref/pull/658) for a detailed discussion.
214+
`model` and `logic` must not know `JabRefPreferences`. See `ProxyPreferences` for encapsulated preferences and [https://github.com/JabRef/jabref/pull/658](https://github.com/JabRef/jabref/pull/658) for a detailed discussion.
215215

216216
See [https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java](https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java) \(via [https://github.com/JabRef/jabref/pull/3092](https://github.com/JabRef/jabref/pull/3092)\) for the current way how to deal with preferences.
217217

@@ -291,9 +291,12 @@ Or even better, try to mock the preferences and insert them via dependency injec
291291
@Test
292292
public void getTypeReturnsBibLatexArticleInBibLatexMode() {
293293
// Mock preferences
294-
JabrefPreferences mockedPrefs = mock(JabrefPreferences.class);
294+
PreferencesService mockedPrefs = mock(PreferencesService.class);
295+
GeneralPreferences mockedGeneralPrefs = mock(GeneralPReferences.class);
295296
// Switch to BibLatex mode
296-
when(mockedPrefs.getBoolean("BiblatexMode")).thenReturn(true);
297+
when(mockedPrefs.getGeneralPrefs()).thenReturn(mockedGeneralPrefs);
298+
when(mockedGeneralPrefs.getDefaultBibDatabaseMode())
299+
.thenReturn(BibDatabaseMode.BIBLATEX);
297300

298301
// Now test
299302
EntryTypes biblatexentrytypes = new EntryTypes(mockedPrefs);

src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
requires org.apache.commons.lang3;
8282
requires org.antlr.antlr4.runtime;
8383
requires flowless;
84-
requires org.apache.tika.core;
84+
requires tika.core;
8585

8686
requires flexmark;
8787
requires flexmark.ext.gfm.strikethrough;

src/main/java/org/jabref/cli/ArgumentProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,8 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
456456
private void importPreferences() {
457457
try {
458458
Globals.prefs.importPreferences(cli.getPreferencesImport());
459-
Globals.entryTypesManager.addCustomOrModifiedTypes(Globals.prefs.loadBibEntryTypes(BibDatabaseMode.BIBTEX),
460-
Globals.prefs.loadBibEntryTypes(BibDatabaseMode.BIBLATEX));
459+
Globals.entryTypesManager.addCustomOrModifiedTypes(Globals.prefs.getBibEntryTypes(BibDatabaseMode.BIBTEX),
460+
Globals.prefs.getBibEntryTypes(BibDatabaseMode.BIBLATEX));
461461
List<TemplateExporter> customExporters = Globals.prefs.getCustomExportFormats(Globals.journalAbbreviationRepository);
462462
LayoutFormatterPreferences layoutPreferences =
463463
Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository);

0 commit comments

Comments
 (0)