Skip to content

Commit 79bbb11

Browse files
committed
Merge branch 'fix-group-icons' of github.com:geovani-rocha/jabref into fix-group-icons
* 'fix-group-icons' of github.com:geovani-rocha/jabref: (26 commits) chore(deps): update dependency org.apache.logging.log4j:log4j-to-slf4j to v2.25.4 (JabRef#15436) chore(deps): update jackson monorepo to v3.1.1 (JabRef#15435) Fix PushToPreferences reset and import (JabRef#15395) Add fulltext fetcher for Wiley via their TDM API (JabRef#15388) Embed in-text nature in reference marks for CSL citations (JabRef#15381) Chore(deps): Bump com.gradleup.shadow:shadow-gradle-plugin (JabRef#15430) Fix not on fx thread exceptions for cleanup and cite key generator (JabRef#15424) Revert "Update gradle to nightly of 2026-03-23 (JabRef#15372)" feat: add benchmarks for Lucene fulltext search and linked file indexing, including setup and teardown of the index. (JabRef#15385) Chore(deps): Bump org.openrewrite.recipe:rewrite-recipe-bom (JabRef#15418) Add claude gitignore (JabRef#15413) Fix group filter icon in side pane (JabRef#15408) Add new prs_link feature Chore(deps): Bump org.glassfish.hk2:hk2-api in /versions (JabRef#15422) Chore(deps): Bump org.openrewrite.rewrite from 7.28.2 to 7.29.0 (JabRef#15419) Chore(deps): Bump jablib/src/main/resources/csl-styles (JabRef#15417) Fix for inconsistent "hide tab bar" behavior (JabRef#15409) Update dependency org.glassfish.hk2:hk2-utils to v4 (JabRef#15407) Persist file notifications (JabRef#15403) Update dependency org.glassfish.hk2:hk2-locator to v4 (JabRef#15405) ...
2 parents 025de46 + ca63845 commit 79bbb11

File tree

65 files changed

+891
-352
lines changed

Some content is hidden

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

65 files changed

+891
-352
lines changed

.github/workflows/dockerimages.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ permissions:
2222

2323
jobs:
2424
build:
25-
if: github.repository == 'JabRef/jabref'
2625
strategy:
2726
max-parallel: 1
2827
matrix:
@@ -34,14 +33,14 @@ jobs:
3433
uses: docker/metadata-action@v6
3534
with:
3635
images: |
37-
ghcr.io/JabRef/${{ matrix.component }}
36+
ghcr.io/${{ github.repository_owner }}/${{ matrix.component }}
3837
tags: |
3938
type=schedule,pattern={{date 'YYYY-MM-DD'}}
4039
type=ref,event=tag
4140
type=edge,branch=main
4241
type=ref,event=pr
4342
labels: |
44-
org.opencontainers.image.source=https://github.com/JabRef/jabref
43+
org.opencontainers.image.source=https://github.com/${{ github.repository }}
4544
org.opencontainers.image.title=${{ matrix.component }}
4645
org.opencontainers.image.description=${{ matrix.component == 'jabkit' && 'JabRef''s CLI tool' || 'JabRef''s HTTP server' }}
4746
- name: Login to GitHub Container Registry

.github/workflows/on-issue-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
If not, our [contributing guidelines](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) is the place you should go to.
7272
7373
74-
At this point in time, you raised {{ prs_total }} pull request(s) of which {{ prs_merged_percentage }}% ({{ prs_merged }}/{{ prs_total }}) have been merged.
74+
At this point in time, you raised {{ prs_total }} pull request(s) of which {{ prs_merged_percentage }}% ({{ prs_merged }}/[{{ prs_total }}]({{ prs_link }})) have been merged.
7575
# If this is updated, also update the number at unassign-issues.yml
7676
days_until_unassign: 14
7777
self_unassigned_text: |

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# AI tooling
2+
3+
.claude/
4+
15
# no generated files in version control
26
src/main/gen/
37
src/main/generated/

.jbang/JabLsLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//DEPS com.fasterxml.jackson.core:jackson-annotations:2.21
1818
//DEPS info.picocli:picocli:4.7.7
1919
//DEPS org.apache.commons:commons-lang3:3.20.0
20-
//DEPS org.apache.logging.log4j:log4j-to-slf4j:2.25.3
20+
//DEPS org.apache.logging.log4j:log4j-to-slf4j:2.25.4
2121
//DEPS org.eclipse.lsp4j:org.eclipse.lsp4j:1.0.0
2222
//DEPS org.slf4j:jul-to-slf4j:2.0.17
2323
//DEPS org.slf4j:slf4j-api:2.0.17

.jbang/JabSrvLauncher.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//DEPS jakarta.validation:jakarta.validation-api:3.1.1
2626
//DEPS net.harawata:appdirs:1.5.0
2727
//DEPS org.apache.commons:commons-lang3:3.20.0
28-
//DEPS org.apache.logging.log4j:log4j-to-slf4j:2.25.3
28+
//DEPS org.apache.logging.log4j:log4j-to-slf4j:2.25.4
2929
//DEPS org.bouncycastle:bcprov-jdk18on:1.83
3030
//DEPS org.postgresql:postgresql:42.7.10
3131
//DEPS org.slf4j:slf4j-api:2.0.17
@@ -34,17 +34,17 @@
3434
//DEPS org.tinylog:tinylog-impl:2.7.0
3535
//DEPS org.glassfish.grizzly:grizzly-framework:5.0.0
3636
//DEPS org.glassfish.grizzly:grizzly-http-server:5.0.0
37-
//DEPS org.glassfish.hk2:hk2-api:3.1.1
38-
//DEPS org.glassfish.hk2:hk2-locator:3.1.1
39-
//DEPS org.glassfish.hk2:hk2-utils:3.1.1
37+
//DEPS org.glassfish.hk2:hk2-api:4.0.0
38+
//DEPS org.glassfish.hk2:hk2-locator:4.0.0
39+
//DEPS org.glassfish.hk2:hk2-utils:4.0.0
4040
//DEPS org.glassfish.jersey.containers:jersey-container-grizzly2-http:4.0.2
4141
//DEPS org.glassfish.jersey.core:jersey-server:4.0.2
4242
//DEPS org.glassfish.jersey.inject:jersey-hk2:4.0.2
4343
//DEPS org.hibernate.validator:hibernate-validator:9.1.0.Final
4444
//DEPS org.jabref:afterburner.fx:2.0.0
45-
//DEPS tools.jackson.core:jackson-core:3.1.0
46-
//DEPS tools.jackson.core:jackson-databind:3.1.0
47-
//DEPS tools.jackson.dataformat:jackson-dataformat-yaml:3.1.0
45+
//DEPS tools.jackson.core:jackson-core:3.1.1
46+
//DEPS tools.jackson.core:jackson-databind:3.1.1
47+
//DEPS tools.jackson.dataformat:jackson-dataformat-yaml:3.1.1
4848

4949
//SOURCES ../jabsrv/src/main/java/org/jabref/http/dto/BibEntryDTO.java
5050
//SOURCES ../jabsrv/src/main/java/org/jabref/http/dto/cayw/SimpleJson.java

.linkspector.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ ignorePatterns:
1616
- pattern: "dl\\.acm\\.org"
1717
# works locally, but not in the checker
1818
- pattern: "^https://www.pdflib.com/pdf-knowledge-base/xmp/free-xmp-validator"
19+
# Automated access blocked by Cloudflare, see issue for context: https://github.com/JabRef/jabref/issues/13404
20+
- pattern: "onlinelibrary\\.wiley\\.com"

CHANGELOG.md

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

1212
### Added
1313

14+
- We added support for downloading full-text PDFs from Wiley journals via the Wiley TDM API. [#13404](https://github.com/JabRef/jabref/issues/13404)
1415
- We added `--key-patterns` option to CLI parameters to allows users to set a citation key's pattern for a specific entry type. [#14707](https://github.com/JabRef/jabref/issues/14707)
1516
- We added a CLI option `--field-formatters` to the `convert` and `generate-bib-from-aux` commands to apply field formatters during export. [#11520](https://github.com/JabRef/jabref/issues/11520)
1617
- We added a preference to skip the import dialog for entries received from browser extensions, allowing direct import into the current library. The import dialog is shown by default; users can enable direct import in Preferences.
@@ -24,6 +25,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
2425

2526
### Changed
2627

28+
- We changed the groups filter field to use a filter icon. [#15402](https://github.com/JabRef/jabref/issues/15402)
2729
- We improved the MultiMergeEntries dialog to automatically select the most plausible field value when merging entries (e.g. a more specific date). [#15027](https://github.com/JabRef/jabref/issues/15027)
2830
- We removed the restart prompt when accepting Mr. DLib privacy settings or hiding the Related articles tab in the entry editor. [#15195](https://github.com/JabRef/jabref/issues/15195)
2931
- We replaced the unlinked files dialog with a wizard-based interface for searching and importing files. [#12709](https://github.com/JabRef/jabref/issues/12709)
@@ -39,6 +41,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
3941

4042
### Fixed
4143

44+
- We fixed an issue where the side pane (Groups/Web search) width was not remembered after restarting JabRef. [#8907](https://github.com/JabRef/jabref/issues/8907)
45+
- We fixed the ScienceDirect fulltext fetcher not returning a PDF when the Elsevier API response includes a direct PDF link. [#12161](https://github.com/JabRef/jabref/issues/12161)
4246
- We fixed vertical cursor movement shortcuts (Command+Up/Down for document start/end, Option+Up/Down for paragraph start/end) not working correctly in the BibTeX source editor on macOS. [#5937](https://github.com/JabRef/jabref/issues/5937)
4347
- We fixed text cursor movement shortcuts (Command+Left/Right for line start/end, Option+Left/Right for word navigation) not working correctly in the BibTeX source editor on macOS. [#5937](https://github.com/JabRef/jabref/issues/5937)
4448
- We fixed PDF import to prefer the content extracted title over filename like XMP metadata titles. [#11999](https://github.com/JabRef/jabref/issues/11999)
@@ -65,8 +69,11 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
6569
- We fixed an issue where an exception would be thrown when trying to extract references from a PDF [#15308](https://github.com/JabRef/jabref/pull/15308)
6670
- We fixed an issue where an exception was thrown when importing via cli and no opened library. [#15314](https://github.com/JabRef/jabref/pull/15314)
6771
- We fixed an issue where the Citation Relations tab failed to recognize already-imported papers when their DOI differed only in letter casing. [#12967](https://github.com/JabRef/jabref/issues/12967)
72+
- We fixed an issue where a tab or the tab bar would not show, while the setting "hide tab bar when a single library is present" was toggled off [#12680](https://github.com/JabRef/jabref/issues/12680)
6873
- We improved CSL support with JabRef LibreOffice converter extension. [#14387](https://github.com/JabRef/jabref/issues/14387)
6974
- We fixed an issue where a search group would not be updated in the ui after an entry change [#13378](https://github.com/JabRef/jabref/issues/13378)
75+
- We fixed an issue where a search group would not be updated in the ui after an entry change [#15386](https://github.com/JabRef/jabref/issues/15386)
76+
- We fixed exceptions occuring when generating citation keys or using certain cleanup operations on macOS [#15366](https://github.com/JabRef/jabref/issues/15366)
7077

7178
### Removed
7279

Dockerfile.jabkit

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM maven:3.9.12-amazoncorretto-25-debian AS build
1+
FROM maven:3.9.14-amazoncorretto-25-debian AS build
22

33
# Is not debian-based
4-
# FROM amazoncorretto:25-jdk AS build
4+
# FROM amazoncorretto:26-jdk AS build
55

66
ARG VERSION="100.0.0"
77
ARG VERSION_INFO="100.0.0"
@@ -32,16 +32,27 @@ COPY jabls-cli/build.gradle.kts jabls-cli/
3232
COPY jabsrv/build.gradle.kts jabsrv/
3333
COPY jabsrv-cli/build.gradle.kts jabsrv-cli/
3434
COPY test-support test-support
35+
COPY ./jabgui/src/main/java/module-info.java ./jabgui/src/main/java/module-info.java
36+
COPY ./jabkit/src/main/java/module-info.java ./jabkit/src/main/java/module-info.java
37+
COPY ./jablib/src/main/java/module-info.java ./jablib/src/main/java/module-info.java
38+
COPY ./jabls/src/main/java/module-info.java ./jabls/src/main/java/module-info.java
39+
COPY ./jabls-cli/src/main/java/module-info.java ./jabls-cli/src/main/java/module-info.java
40+
COPY ./jabsrv/src/main/java/module-info.java ./jabsrv/src/main/java/module-info.java
41+
COPY ./jabsrv-cli/src/main/java/module-info.java ./jabsrv-cli/src/main/java/module-info.java
42+
COPY ./test-support/src/main/java/module-info.java ./test-support/src/main/java/module-info.java
43+
3544
COPY versions versions
3645

3746
# Cache gradle and build-logic
3847
RUN ./gradlew --no-daemon :build-logic:jar
3948

4049
COPY . .
4150

42-
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabkit:jpackage && \
43-
mkdir /dist && \
44-
mv jabkit/build/packages/*/* /dist
51+
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabkit:jpackage
52+
53+
RUN mkdir /dist
54+
55+
RUN mv jabkit/build/packages/*/* /dist
4556

4657

4758
# jpackage needs glibc; alpine does not work

Dockerfile.jabsrv

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM maven:3.9.12-amazoncorretto-25-debian AS build
1+
FROM maven:3.9.14-amazoncorretto-25-debian AS build
22

33
# Is not debian-based
4-
# FROM amazoncorretto:25-jdk AS build
4+
# FROM amazoncorretto:26-jdk AS build
55

66
ARG VERSION="100.0.0"
77
ARG VERSION_INFO="100.0.0"
@@ -32,16 +32,27 @@ COPY jabls-cli/build.gradle.kts jabls-cli/
3232
COPY jabsrv/build.gradle.kts jabsrv/
3333
COPY jabsrv-cli/build.gradle.kts jabsrv-cli/
3434
COPY test-support test-support
35+
COPY ./jabgui/src/main/java/module-info.java ./jabgui/src/main/java/module-info.java
36+
COPY ./jabkit/src/main/java/module-info.java ./jabkit/src/main/java/module-info.java
37+
COPY ./jablib/src/main/java/module-info.java ./jablib/src/main/java/module-info.java
38+
COPY ./jabls/src/main/java/module-info.java ./jabls/src/main/java/module-info.java
39+
COPY ./jabls-cli/src/main/java/module-info.java ./jabls-cli/src/main/java/module-info.java
40+
COPY ./jabsrv/src/main/java/module-info.java ./jabsrv/src/main/java/module-info.java
41+
COPY ./jabsrv-cli/src/main/java/module-info.java ./jabsrv-cli/src/main/java/module-info.java
42+
COPY ./test-support/src/main/java/module-info.java ./test-support/src/main/java/module-info.java
43+
3544
COPY versions versions
3645

3746
# Cache gradle and build-logic
3847
RUN ./gradlew --no-daemon :build-logic:jar
3948

4049
COPY . .
4150

42-
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabsrv-cli:jpackage && \
43-
mkdir /dist && \
44-
mv jabsrv-cli/build/packages/*/* /dist
51+
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabsrv-cli:jpackage
52+
53+
RUN mkdir /dist
54+
55+
RUN mv jabsrv-cli/build/packages/*/* /dist
4556

4657

4758
# jpackage needs glibc; alpine does not work

build-logic/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
dependencies {
1111
implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
1212
implementation("com.autonomousapps:dependency-analysis-gradle-plugin:3.6.1")
13-
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.12.0")
14-
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.0")
13+
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.13.0")
14+
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.1")
1515
implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.7.0")
1616
implementation("org.gradlex:extra-java-module-info:1.14")
1717
implementation("org.gradlex:java-module-dependencies:1.12.1")

0 commit comments

Comments
 (0)