Skip to content

Commit aca504a

Browse files
committed
merge
2 parents a51e3b0 + 0d6969b commit aca504a

File tree

88 files changed

+2368
-419
lines changed

Some content is hidden

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

88 files changed

+2368
-419
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Go through the checklist below. It is mandatory, even for a draft pull request.
1919
2020
Keep ALL the items. Replace the dots inside [.] and mark them as follows:
2121
[x] done
22-
[ ] not done
22+
[ ] TODO (yet to be done)
2323
[/] not applicable
2424
-->
2525

.github/workflows/automerge.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@ jobs:
1111
# Run only if PR is inside JabRef's main repository and created by dependabot or by an update workflow
1212
if: >
1313
(github.repository == 'JabRef/jabref') &&
14-
(github.event.pull_request.head.repo.full_name == 'JabRef/jabref') &&
1514
(
16-
(github.actor == 'dependabot[bot]') ||
15+
(github.actor == 'renovate-bot' && startsWith(github.event.pull_request.title, 'chore(deps):')) ||
1716
(
18-
startsWith(github.event.pull_request.title, '[Bot] ') ||
19-
startsWith(github.event.pull_request.title, 'Bump ') ||
20-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
21-
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
17+
(github.event.pull_request.head.repo.full_name == 'JabRef/jabref') &&
18+
(
19+
(github.actor == 'dependabot[bot]') ||
20+
(
21+
startsWith(github.event.pull_request.title, '[Bot] ') ||
22+
startsWith(github.event.pull_request.title, 'Bump ') ||
23+
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
24+
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
25+
)
26+
)
2227
)
2328
)
2429
steps:

.github/workflows/pr-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
# This step runs in both cases using the proper variables.
8080
- name: ghprcomment@main
8181
if: ${{ github.event_name == 'workflow_dispatch' || (steps.read-pr_number.outputs.pr_number != '' && steps.isCrossRepository.outputs.isCrossRepository == 'true') }}
82-
uses: jbangdev/jbang-action@v0.126.1
82+
uses: jbangdev/jbang-action@v0.126.2
8383
with:
8484
script: https://github.com/koppor/ghprcomment/blob/main/ghprcomment.java
8585
scriptargs: "-r JabRef/jabref -p ${{ steps.set-vars.outputs.pr_number }} -w ${{ steps.set-vars.outputs.workflow_run_id }}"

.github/workflows/update-gradle-wrapper.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Update Gradle Wrapper
33
on:
44
schedule:
55
- cron: "0 5 * * 1"
6+
pull_request:
7+
paths:
8+
- .github/workflows/update-gradle-wrapper.yml
69
workflow_dispatch:
710

811
jobs:

.jbang/CheckoutPR.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
2222

2323
//DEPS org.kohsuke:github-api:2.0-rc.3
24-
//DEPS org.eclipse.jgit:org.eclipse.jgit.pgm:7.2.1.202505142326-r
24+
//DEPS org.eclipse.jgit:org.eclipse.jgit.pgm:7.3.0.202506031305-r
2525

2626
public class CheckoutPR {
2727
public static void main(String[] args) throws Exception {

.jbang/CloneJabRef.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//JAVA 21+
77
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
88

9-
//DEPS org.eclipse.jgit:org.eclipse.jgit.pgm:7.2.1.202505142326-r
9+
//DEPS org.eclipse.jgit:org.eclipse.jgit.pgm:7.3.0.202506031305-r
1010

1111
public class CloneJabRef {
1212
public static void main(String[] args) throws Exception {

CHANGELOG.md

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

1212
### Added
1313

14+
- We introduced a settings parameters to manage citations' relations local storage time-to-live with a default value set to 30 days. [#11189](https://github.com/JabRef/jabref/issues/11189)
15+
16+
### Changed
17+
18+
- We improved the citations relations caching by implementing an offline storage. [#11189](https://github.com/JabRef/jabref/issues/11189)
1419
- We added a tooltip to keywords that resemble Math Subject Classification (MSC) codes. [#12944](https://github.com/JabRef/jabref/issues/12944)
1520
- We added a feature to convert keywords that resemble MSC codes to their descriptions. [#12944](https://github.com/JabRef/jabref/issues/12944)
1621
- We introduced a new command line application called `jabkit`. [#13012](https://github.com/JabRef/jabref/pull/13012) [#110](https://github.com/JabRef/jabref/issues/110)
@@ -23,6 +28,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
2328
- We added a new button to toggle the file path between an absolute and relative formats in context of library properties. [#13031](https://github.com/JabRef/jabref/issues/13031)
2429
- We introduced user-configurable group 'Imported entries' for automatic import of entries from web search, PDF import and web fetchers. [#12548](https://github.com/JabRef/jabref/issues/12548)
2530
- We added automatic selection of the “Enter Identifier” tab with pre-filled clipboard content if the clipboard contains a valid identifier when opening the “Create New Entry” dialog. [#13087](https://github.com/JabRef/jabref/issues/13087)
31+
- We added batch fetching of bibliographic data for multiple entries in the "Lookup" menu. [#12275](https://github.com/JabRef/jabref/issues/12275)
2632
- We added an "Open example library" button to Welcome Tab. [#13014](https://github.com/JabRef/jabref/issues/13014)
2733
- We added automatic detection and selection of the identifier type (e.g., DOI, ISBN, arXiv) based on clipboard content when opening the "New Entry" dialog [#13111](https://github.com/JabRef/jabref/pull/13111)
2834
- We added support for import of a Refer/BibIX file format. [#13069](https://github.com/JabRef/jabref/issues/13069)
@@ -44,13 +50,15 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
4450

4551
- We added a fallback for the "Convert to biblatex" cleanup when it failed to populate the `date` field if `year` contained a full date in ISO format (e.g., `2011-11-11`). [#11868](https://github.com/JabRef/jabref/issues/11868)
4652
- We fixed an issue where directory check for relative path was not handled properly under library properties. [#13017](https://github.com/JabRef/jabref/issues/13017)
53+
- We fixed an exception on tab dragging. [#12921](https://github.com/JabRef/jabref/issues/12921)
4754
- We fixed an issue where the option for which method to use when parsing plaintext citations was unavailable in the 'Create New Entry' tool. [#8808](https://github.com/JabRef/jabref/issues/8808)
4855
- We fixed an issue where the "Make/Sync bibliography" button in the OpenOffice/LibreOffice sidebar was not enabled when a jstyle was selected. [#13055](https://github.com/JabRef/jabref/pull/13055)
4956
- We fixed an issue where CSL bibliography title properties would be saved even if the "Modify bibliography title" dialog was closed without pressing the "OK" button. [#13074](https://github.com/JabRef/jabref/pull/13074)
5057
- We added "Hanging Indent" as the default selected bibliography body format for CSL styles that specify it (e.g. APA). [#13074](https://github.com/JabRef/jabref/pull/13074)
5158
- We fixed an issue where bibliography entries generated from CSL styles had leading spaces. [#13074](https://github.com/JabRef/jabref/pull/13074)
5259
- We fixed an issue where the preview area in the "Select Style" dialog of the LibreOffice integration was too small to display full content. [#13051](https://github.com/JabRef/jabref/issues/13051)
5360
- We fixed an issue where the tab showing the fulltext search results was not displayed. [#12865](https://github.com/JabRef/jabref/issues/12865)
61+
- We fixed an issue showing an empty tooltip in maintable. [#11681](https://github.com/JabRef/jabref/issues/11681)
5462

5563
### Removed
5664

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
implementation("org.gradlex:extra-java-module-info:1.12")
1313
implementation("org.gradlex:java-module-packaging:1.0.1") // required for platform-specific packaging of JavaFX dependencies
1414
implementation("org.gradlex:java-module-testing:1.7")
15-
implementation("org.gradlex.jvm-dependency-conflict-resolution:org.gradlex.jvm-dependency-conflict-resolution.gradle.plugin:2.3")
15+
implementation("org.gradlex.jvm-dependency-conflict-resolution:org.gradlex.jvm-dependency-conflict-resolution.gradle.plugin:2.4")
1616

1717
configurations
1818
.matching { it.name.contains("downloadSources") }

build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,43 @@ extraJavaModuleInfo {
158158
// PATCH REASON:
159159
exports("com.sun.javafx.scene.control")
160160
}
161+
162+
// Workaround for https://github.com/wiremock/wiremock/issues/2149
163+
module("org.wiremock:wiremock", "wiremock") {
164+
overrideModuleName()
165+
patchRealModule()
166+
exportAllPackages()
167+
168+
requires("wiremock.slf4j.spi.shim")
169+
requires("com.fasterxml.jackson.core")
170+
requires("com.fasterxml.jackson.databind")
171+
requires("com.fasterxml.jackson.datatype.jsr310")
172+
requires("com.google.common")
173+
requires("commons.fileupload")
174+
requires("org.eclipse.jetty.server")
175+
requires("org.eclipse.jetty.servlet")
176+
requires("org.eclipse.jetty.servlets")
177+
requires("org.eclipse.jetty.webapp")
178+
requires("org.eclipse.jetty.proxy")
179+
requires("org.eclipse.jetty.http2.server")
180+
requires("org.eclipse.jetty.alpn.server")
181+
requires("org.eclipse.jetty.alpn.java.server")
182+
requires("org.eclipse.jetty.alpn.java.client")
183+
requires("org.eclipse.jetty.alpn.client")
184+
requires("java.xml")
185+
requires("org.custommonkey.xmlunit")
186+
requires("org.slf4j")
187+
requires("org.xmlunit")
188+
189+
uses("com.github.tomakehurst.wiremock.extension.Extension")
190+
191+
// workaround for https://github.com/wiremock/wiremock/issues/2874
192+
mergeJar("com.github.jknack:handlebars")
193+
mergeJar("com.github.jknack:handlebars-helpers")
194+
195+
// Required to provide package "wiremock.org.slf4j.helpers"
196+
mergeJar("com.github.koppor:wiremock-slf4j-shim")
197+
}
161198
}
162199

163200
testing {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ org.gradle.vfs.watch=true
22

33
# Hint by https://docs.gradle.org/current/userguide/performance.html#increase_the_heap_size
44
# Otherwise, one gets "Java heap space" errors.
5-
org.gradle.jvmargs=-Xmx6096M
5+
org.gradle.jvmargs=-Xmx6g
66

77
# hint by https://docs.gradle.org/current/userguide/performance.html#enable_configuration_cache
88
# Blocked by https://github.com/beryx/badass-jlink-plugin/issues/304

0 commit comments

Comments
 (0)