Skip to content

Commit aa95a25

Browse files
committed
Merge remote-tracking branch 'upstream/main' into addRightlickToGroup
* upstream/main: Update abbrv.jabref.org (#12365) Bump buildres/abbrv.jabref.org from `78e1b08` to `c202741` (#12363) Bump org.beryx.jlink from 3.1.0-rc-1 to 3.1.1 (#12362) Bump tech.units:indriya from 2.2.1 to 2.2.2 (#12361) Bump com.dlsc.gemsfx:gemsfx from 2.80.0 to 2.81.0 (#12360) Bump org.mariadb.jdbc:mariadb-java-client from 2.7.9 to 2.7.12 (#12359) Bump org.mockito:mockito-core from 5.14.2 to 5.15.2 (#12358) Fix content not correctly parsed at pdf content importer (#12338) Bump de.undercouch:citeproc-java from 3.1.0 to 3.2.0 (#12347) Bump org.openrewrite.rewrite from 6.29.0 to 6.29.2 (#12345) Improve utf8 detection (#12342) Bump org.fxmisc.richtext:richtextfx from 0.11.3 to 0.11.4 (#12346) Bump ai.djl:bom from 0.30.0 to 0.31.1 (#12344) Bump com.puppycrawl.tools:checkstyle from 10.21.0 to 10.21.1 (#12343)
2 parents 2b6c513 + 5f3fbbc commit aa95a25

File tree

25 files changed

+74
-65
lines changed

25 files changed

+74
-65
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
1313

1414
### Changed
1515

16+
- We improved the offline parsing of BibTeX data from PDF-documents. [#12278](https://github.com/JabRef/jabref/issues/12278)
17+
1618
### Fixed
1719

20+
- We fixed an issue where a bib file with UFF-8 charset was wrongly loaded with a different charset [forum#5369](https://discourse.jabref.org/t/jabref-5-15-opens-bib-files-with-shift-jis-encoding-instead-of-utf-8/5369/)
21+
1822
### Removed
1923

24+
- "Web of Science" [journal abbreviation list](https://docs.jabref.org/advanced/journalabbreviations) was removed. [abbrv.jabref.org#176](https://github.com/JabRef/abbrv.jabref.org/issues/176)
25+
2026
## [6.0-alpha] – 2024-12-23
2127

2228
### Added

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins {
1515

1616
id 'org.openjfx.javafxplugin' version '0.1.0'
1717

18-
id 'org.beryx.jlink' version '3.1.0-rc-1'
18+
id 'org.beryx.jlink' version '3.1.1'
1919

2020
// nicer test outputs during running and completion
2121
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
@@ -29,7 +29,7 @@ plugins {
2929

3030
id 'idea'
3131

32-
id 'org.openrewrite.rewrite' version '6.29.0'
32+
id 'org.openrewrite.rewrite' version '6.29.3'
3333

3434
id "org.itsallcode.openfasttrace" version "3.0.1"
3535
}
@@ -211,7 +211,7 @@ dependencies {
211211

212212
implementation 'com.fasterxml:aalto-xml:1.3.3'
213213

214-
implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.9'
214+
implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.12'
215215

216216
implementation 'org.postgresql:postgresql:42.7.4'
217217

@@ -243,8 +243,8 @@ dependencies {
243243
exclude group: 'org.openjfx'
244244
}
245245
implementation 'org.fxmisc.flowless:flowless:0.7.3'
246-
implementation 'org.fxmisc.richtext:richtextfx:0.11.3'
247-
implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.80.0') {
246+
implementation 'org.fxmisc.richtext:richtextfx:0.11.4'
247+
implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.81.0') {
248248
exclude module: 'javax.inject' // Split package, use only jakarta.inject
249249
exclude module: 'commons-lang3'
250250
exclude group: 'org.apache.commons.validator'
@@ -256,7 +256,7 @@ dependencies {
256256
exclude group: 'tech.units'
257257
}
258258
// Required by gemsfx
259-
implementation 'tech.units:indriya:2.2.1'
259+
implementation 'tech.units:indriya:2.2.2'
260260
// Required by gemsfx and langchain4j
261261
implementation ('com.squareup.retrofit2:retrofit:2.11.0') {
262262
exclude group: 'com.squareup.okhttp3'
@@ -281,7 +281,7 @@ dependencies {
281281
// route all requests to log4j to SLF4J
282282
implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.24.3'
283283

284-
implementation('de.undercouch:citeproc-java:3.1.0') {
284+
implementation('de.undercouch:citeproc-java:3.2.0') {
285285
exclude group: 'org.antlr'
286286
}
287287

@@ -358,7 +358,7 @@ dependencies {
358358
}
359359

360360
implementation 'org.apache.velocity:velocity-engine-core:2.4.1'
361-
implementation platform('ai.djl:bom:0.30.0')
361+
implementation platform('ai.djl:bom:0.31.1')
362362
implementation 'ai.djl:api'
363363
implementation 'ai.djl.huggingface:tokenizers'
364364
implementation 'ai.djl.pytorch:pytorch-model-zoo'
@@ -383,7 +383,7 @@ dependencies {
383383
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
384384
testImplementation 'org.junit.platform:junit-platform-launcher:1.11.4'
385385

386-
testImplementation 'org.mockito:mockito-core:5.14.2'
386+
testImplementation 'org.mockito:mockito-core:5.15.2'
387387
testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
388388
testImplementation 'org.xmlunit:xmlunit-matchers:2.10.0'
389389
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.3.0'
@@ -396,12 +396,12 @@ dependencies {
396396
// recommended by https://github.com/wiremock/wiremock/issues/2149#issuecomment-1835775954
397397
testImplementation 'org.wiremock:wiremock-standalone:3.10.0'
398398

399-
checkstyle 'com.puppycrawl.tools:checkstyle:10.21.0'
399+
checkstyle 'com.puppycrawl.tools:checkstyle:10.21.1'
400400
// xjc needs the runtime as well for the ant task, otherwise it fails
401401
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
402402
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
403403

404-
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.22.0"))
404+
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.23.2"))
405405
rewrite("org.openrewrite.recipe:rewrite-static-analysis")
406406
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
407407
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")

src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void updateItem(CitationKeyPatternsPanelItemModel item, boolean empty) {
124124
setStyle("");
125125
} else if (isSelected()) {
126126
setStyle("-fx-background-color: -fx-selection-bar");
127-
} else if (item.getEntryType().getName().equals(CitationKeyPatternsPanelViewModel.ENTRY_TYPE_DEFAULT_NAME)) {
127+
} else if (CitationKeyPatternsPanelViewModel.ENTRY_TYPE_DEFAULT_NAME.equals(item.getEntryType().getName())) {
128128
setStyle("-fx-background-color: -fx-default-button");
129129
} else {
130130
setStyle("");

src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelViewModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class CitationKeyPatternsPanelViewModel {
2626

2727
if (itemOneName.equals(itemTwoName)) {
2828
return 0;
29-
} else if (itemOneName.equals(ENTRY_TYPE_DEFAULT_NAME)) {
29+
} else if (ENTRY_TYPE_DEFAULT_NAME.equals(itemOneName)) {
3030
return -1;
31-
} else if (itemTwoName.equals(ENTRY_TYPE_DEFAULT_NAME)) {
31+
} else if (ENTRY_TYPE_DEFAULT_NAME.equals(itemTwoName)) {
3232
return 1;
3333
}
3434

src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public static Set<ExternalFileType> fromString(String storedFileTypes) {
205205
// Read the prefs information for file types:
206206
String[][] vals = StringUtil.decodeStringDoubleArray(storedFileTypes);
207207
for (String[] val : vals) {
208-
if ((val.length == 2) && val[1].equals(FILE_TYPE_REMOVED_FLAG)) {
208+
if ((val.length == 2) && FILE_TYPE_REMOVED_FLAG.equals(val[1])) {
209209
// This entry indicates that a default entry type should be removed:
210210
ExternalFileType toRemove = null;
211211
for (ExternalFileType type : types) {

src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ public void setValues() {
403403
if (parentNode != null) {
404404
parentNode.getGroup()
405405
.getIconName()
406-
.filter(iconName -> !iconName.equals(DefaultGroupsFactory.ALL_ENTRIES_GROUP_DEFAULT_ICON))
406+
.filter(iconName -> !DefaultGroupsFactory.ALL_ENTRIES_GROUP_DEFAULT_ICON.equals(iconName))
407407
.ifPresent(iconProperty::setValue);
408408
parentNode.getGroup().getColor().ifPresent(color -> colorUseProperty.setValue(true));
409409
}

src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void setValues() {
147147
catalogs.addAll(WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
148148
.stream()
149149
.map(SearchBasedFetcher::getName)
150-
.filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
150+
.filter(name -> !CompositeSearchBasedFetcher.FETCHER_NAME.equals(name))
151151
.map(name -> {
152152
boolean enabled = importerPreferences.getCatalogs().contains(name);
153153
return new StudyCatalogItem(name, enabled);

src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public ManageStudyDefinitionViewModel(ImportFormatPreferences importFormatPrefer
7575
.map(SearchBasedFetcher::getName)
7676
// The user wants to select specific fetchers
7777
// The fetcher summarizing ALL fetchers can be emulated by selecting ALL fetchers (which happens rarely when doing an SLR)
78-
.filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
78+
.filter(name -> !CompositeSearchBasedFetcher.FETCHER_NAME.equals(name))
7979
.map(name -> {
8080
boolean enabled = DEFAULT_SELECTION.contains(name);
8181
return new StudyCatalogItem(name, enabled);
@@ -108,7 +108,7 @@ public ManageStudyDefinitionViewModel(Study study,
108108
.map(SearchBasedFetcher::getName)
109109
// The user wants to select specific fetchers
110110
// The fetcher summarizing ALL fetchers can be emulated by selecting ALL fetchers (which happens rarely when doing an SLR)
111-
.filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
111+
.filter(name -> !CompositeSearchBasedFetcher.FETCHER_NAME.equals(name))
112112
.map(name -> {
113113
boolean enabled = studyDatabases.contains(new StudyDatabase(name, true));
114114
return new StudyCatalogItem(name, enabled);

src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private static Map<String, String> serializeMetaData(Map<String, List<String>> s
9898
continue;
9999
}
100100

101-
boolean isSaveActions = metaItem.getKey().equals(MetaData.SAVE_ACTIONS);
101+
boolean isSaveActions = MetaData.SAVE_ACTIONS.equals(metaItem.getKey());
102102
// The last "MetaData.SEPARATOR_STRING" adds compatibility to JabRef v5.9 and earlier
103103
StringJoiner joiner = new StringJoiner(MetaData.SEPARATOR_STRING, "", MetaData.SEPARATOR_STRING);
104104
boolean lastWasSaveActionsEnablement = false;

0 commit comments

Comments
 (0)