Skip to content

Commit c17550d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into allEntriesDuplicates
* upstream/main: (25 commits) Remove remainging "testLogging" (#10769) Reuse JUnit 5.7's @DisabledIfEnvironmentVariable (#10768) Refactored LibraryTab (#10732) Fix annotation (#10766) Add initial .git-blame-ignore-revs (#10765) Streamline test output (#10762) Fix NPE when opening and re-opening a library (#10763) Changed default status of 'Automatically open folder of attached files' (#10748) Implement test cases for search (#10193) Add cites field to bib entries for citation relation (#10752) Ignore submodule changes (for normal devs) (#10754) Fix line endings Bump lycheeverse/lychee-action from 1.8.0 to 1.9.0 (#10760) Bump appleboy/ssh-action from 1.0.2 to 1.0.3 (#10761) Bump org.apache.lucene:lucene-core from 9.9.0 to 9.9.1 (#10759) Bump org.openrewrite.rewrite from 6.5.4 to 6.6.3 (#10758) Bump org.glassfish.jersey.containers:jersey-container-grizzly2-http (#10755) Bump org.jsoup:jsoup from 1.16.2 to 1.17.2 (#10756) Bump org.mockito:mockito-core from 5.7.0 to 5.8.0 (#10757) Remove abstract ...
2 parents 42774ed + 5dbc76e commit c17550d

File tree

125 files changed

+1914
-1153
lines changed

Some content is hidden

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

125 files changed

+1914
-1153
lines changed

.git-blame-ignore-revs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Automatic code reformatting
2+
c5bcad738fe6e8dfcb62442a426c2778241515a1
3+
4+
# net.sf.jabref -> org.jabref
5+
b2ad6eb279f5def38fa21be12cb5dd4545c1ba1a
6+
dd385f4ad6dc9251bfdb1c0b75ded402f680b32a
7+
a6e80311c6376c973b5860658f6e4ace7a3fd1f4
8+
648a4703e80ac0dbe1ff044f354bc0e332e4064d
9+
ac08c6a2c55e1600bf5072c0ea2e6aac920b915d
10+
ec863166cf4f38a1a6bcc80a607fd33299b815aa
11+
8c61577e4377746fc064db2a136bb68968cd4055
12+
0ef3228f0c1334ff203d4ea5e698e3ad88cb7089
13+
ce939b4ef19ca856e7ecac08275cf1ca764207b6
14+
7f1a8069d03737c202bcb7ce352b3755c6a36f5f
15+
dbd0cfbc8177ada414e89da038cd014657d48ed3
16+
bc7ea00c8cc3ec9ec8b1a799b0dd96513bc51404
17+
9a5cff44aa1e0d4b737296a30b97f7f384c8b885
18+
bf81b595a77f0f7f254872be6f05a063c44528d8
19+
277b40c9e79e0158d272de33e24fa7fc06af91bf
20+
662dd326d212ecfd336a00214e969145ec501c5a
21+
33f040cfbb16111ada117f858e98d606a6bee4fd
22+
29fe730f64eeb62ff9de10fcb460a63297e24be6
23+
24+
# This commit should not exist
25+
185d7345946c29a2a4e2726c912be0c4db4810b9
26+
# Resulted in this problematic merge commits
27+
7e1645978b3028df5e65af19f0f819ddfd0f24aa
28+
a31f396765492ac12eaab228e33eb9d22487403b

.github/workflows/check-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
restore-keys: cache-lychee-
3030
- name: Link Checker
3131
id: lychee
32-
uses: lycheeverse/lychee-action@v1.8.0
32+
uses: lycheeverse/lychee-action@v1.9.0
3333
with:
3434
fail: true
3535
args: --accept '200,201,202,203,204,429,500' --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'

.github/workflows/cleanup-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
2727
- name: Delete folder on builds.jabref.org
2828
if: steps.checksecrets.outputs.secretspresent == 'YES'
29-
uses: appleboy/[email protected].2
29+
uses: appleboy/[email protected].3
3030
with:
3131
script: rm -rf /var/www/builds.jabref.org/www/pull/${{ github.event.pull_request.number }} || true
3232
host: build-upload.jabref.org

.github/workflows/refresh-csl-subtrees.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
cd src/main/resources/csl-locales
3232
git checkout master
3333
git pull
34+
- name: Persist changes
35+
run: |
36+
git add -f src/main/resources/csl-styles
37+
git add -f src/main/resources/csl-locales
38+
git diff-index --quiet HEAD || git commit -m 'Update CSL styles'
3439
- uses: peter-evans/create-pull-request@v5
3540
with:
3641
token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}

.github/workflows/refresh-journal-lists.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ jobs:
3737
- name: Check whether journal-list.mv can be generated (the "real" generation is done inside JabRef's build process)
3838
run: |
3939
./gradlew generateJournalListMV
40+
- name: Persist changes
41+
run: |
42+
git add -f buildres/abbrv.jabref.org
43+
git diff-index --quiet HEAD || git commit -m 'Update journal abbreviation lists'
4044
- uses: peter-evans/create-pull-request@v5
4145
with:
4246
token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}

.gitmodules

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
[submodule "buildres/abbrv.jabref.org"]
1+
[submodule "abbrv.jabref.org"]
22
path = buildres/abbrv.jabref.org
33
url = https://github.com/JabRef/abbrv.jabref.org.git
4-
[submodule "buildres/csl-styles"]
4+
ignore = all
5+
shallow = true
6+
[submodule "csl-styles"]
57
path = src/main/resources/csl-styles
68
url = https://github.com/citation-style-language/styles.git
7-
[submodule "buildres/csl-locales"]
9+
ignore = all
10+
shallow = true
11+
[submodule "csl-locales"]
812
path = src/main/resources/csl-locales
913
url = https://github.com/citation-style-language/locales.git
14+
ignore = all
15+
shallow = true

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,21 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
1111

1212
### Added
1313

14+
- When importing entries form the "Citation relations" tab, the field [cites](https://docs.jabref.org/advanced/entryeditor/entrylinks) is now filled according to the relationship between the entries. [#10572](https://github.com/JabRef/jabref/pull/10752)
15+
1416
### Changed
1517

18+
- The "Automatically open folders of attached files" preference default status has been changed to enabled on Windows. [koppor#56](https://github.com/koppor/jabref/issues/56)
19+
- The Custom export format now uses the custom DOI base URI in the preferences for the `DOICheck`, if activated [forum#4084](https://discourse.jabref.org/t/export-html-disregards-custom-doi-base-uri/4084)
20+
- The index directories for full text search have now more readable names to increase debugging possibilities using Apache Lucense's Lurk. [#10193](https://github.com/JabRef/jabref/issues/10193)
21+
- The fulltext search also indexes files ending with .pdf (but do not having an explicit file type set). [#10193](https://github.com/JabRef/jabref/issues/10193)
22+
- We changed the order of the lists in the "Citation relations" tab. `Cites` are now on the left and `Cited by` on the right [#10572](https://github.com/JabRef/jabref/pull/10752)
23+
1624
### Fixed
1725

1826
- We fixed an issue where attempting to cancel the importing/generation of an entry from id is ignored. [#10508](https://github.com/JabRef/jabref/issues/10508)
1927
- We fixed an issue where the preview panel showing the wrong entry (an entry that is not selected in the entry table). [#9172](https://github.com/JabRef/jabref/issues/9172)
28+
- The last page of a PDF is now indexed by the full text search. [#10193](https://github.com/JabRef/jabref/issues/10193)
2029
- We fixed an issue where the duplicate check did not take umlauts or other LaTeX-encoded characters into account. [#10744](https://github.com/JabRef/jabref/pull/10744)
2130
- We fixed the colors of the icon on hover for unset special fields. [#10431](https://github.com/JabRef/jabref/issues/10431)
2231

build.gradle

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ plugins {
2727

2828
id 'idea'
2929

30-
id 'org.openrewrite.rewrite' version '6.5.4'
30+
id 'org.openrewrite.rewrite' version '6.6.3'
3131
}
3232

3333
// Enable following for debugging
@@ -101,7 +101,7 @@ dependencyLocking {
101101
}
102102

103103
javafx {
104-
version = "21"
104+
version = "20"
105105
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
106106
}
107107

@@ -119,7 +119,7 @@ dependencies {
119119
exclude group: 'org.junit.jupiter'
120120
}
121121

122-
implementation 'org.apache.lucene:lucene-core:9.9.0'
122+
implementation 'org.apache.lucene:lucene-core:9.9.1'
123123
implementation 'org.apache.lucene:lucene-queryparser:9.9.1'
124124
implementation 'org.apache.lucene:lucene-queries:9.9.0'
125125
implementation 'org.apache.lucene:lucene-analysis-common:9.9.1'
@@ -184,7 +184,7 @@ dependencies {
184184
implementation 'org.controlsfx:controlsfx:11.2.0'
185185
implementation 'com.github.Dansoftowner:jSystemThemeDetector:3.8'
186186

187-
implementation 'org.jsoup:jsoup:1.16.2'
187+
implementation 'org.jsoup:jsoup:1.17.2'
188188
implementation 'com.konghq:unirest-java:3.14.5'
189189

190190
implementation 'org.slf4j:slf4j-api:2.0.9'
@@ -232,7 +232,7 @@ dependencies {
232232
// testImplementation 'org.glassfish.hk2:hk2-junitrunner:3.0.4'
233233
// HTTP server
234234
// implementation 'org.glassfish.jersey.containers:jersey-container-netty-http:3.1.1'
235-
implementation 'org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.4'
235+
implementation 'org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.5'
236236
testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:3.1.5'
237237
// Allow objects "magically" to be mapped to JSON using GSON
238238
// implementation 'org.glassfish.jersey.media:jersey-media-json-gson:3.1.1'
@@ -244,7 +244,7 @@ dependencies {
244244
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
245245
testImplementation 'org.junit.platform:junit-platform-launcher:1.10.1'
246246

247-
testImplementation 'org.mockito:mockito-core:5.7.0'
247+
testImplementation 'org.mockito:mockito-core:5.8.0'
248248
testImplementation 'org.xmlunit:xmlunit-core:2.9.1'
249249
testImplementation 'org.xmlunit:xmlunit-matchers:2.9.1'
250250
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.2.1'
@@ -433,43 +433,30 @@ test {
433433
// TODO: Remove this as soon as ArchUnit is modularized
434434
runOnClasspath = true
435435
}
436-
437-
testLogging {
438-
// set options for log level LIFECYCLE
439-
// for debugging tests: add "STANDARD_OUT", "STANDARD_ERROR"
440-
events = ["FAILED"]
441-
exceptionFormat "full"
442-
}
443436
}
444437

445438
testlogger {
446-
theme 'standard-parallel'
439+
// See https://github.com/radarsh/gradle-test-logger-plugin#configuration for configuration options
440+
441+
theme 'standard'
442+
447443
showPassed false
448444
showSkipped false
445+
446+
showCauses false
447+
showStackTraces false
449448
}
450449

451450
tasks.register('databaseTest', Test) {
452451
useJUnitPlatform {
453452
includeTags 'DatabaseTest'
454453
}
455-
456-
testLogging {
457-
// set options for log level LIFECYCLE
458-
events = ["FAILED"]
459-
exceptionFormat "full"
460-
}
461454
}
462455

463456
tasks.register('fetcherTest', Test) {
464457
useJUnitPlatform {
465458
includeTags 'FetcherTest'
466459
}
467-
468-
testLogging {
469-
// set options for log level LIFECYCLE
470-
events = ["FAILED"]
471-
exceptionFormat "full"
472-
}
473460
}
474461

475462
tasks.register('guiTest', Test) {

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ Due to [IDEA-119280](https://youtrack.jetbrains.com/issue/IDEA-119280), it is a
1818
6. Open the project view (<kbd>Alt</kbd>+<kbd>1</kbd> , on mac <kbd>cmd><kbd>+<kbd>1</kbd>)
1919
7. Copy all build resources to the folder of the build classes
2020
1. Navigate to the folder `build/resoruces/main`
21-
2. Select all folders below (`bst`, `csl-locales`, ...)
22-
3. Press <kbd>Ctrl</kbd>+<kbd>C</kbd> to mark them for copying
23-
4. Select the folder `out/production/classes`
24-
5. Press <kbd>Ctrl</kbd>+<kbd>V</kbd> to start the copy process
21+
1. Right click -> "Open In" -> "Explorer (Finder on macOS)"
22+
1. Navigate into directory "main"
23+
1. Select the folder `out/production/classes`
24+
1. Right click -> "Open In" -> "Explorer (Finder on macOS)"
25+
1. Navigate into directory "classes"
26+
1. Now you have two Explorer windows opened. Copy all files and directories from the first one to the second one.
2527
8. Locate the class `Launcher` (e.g., by <kbd>ctrl</kbd>+<kbd>N</kbd> and then typing `Launcher`). Press <kbd>Enter</kbd> to jump to that class.
2628
<figure>
2729
<img src="intellij-search-for-launcher.png" alt="IntelliJ search for class “Launcher”">

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)