Skip to content

Commit 5277005

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: (54 commits) Split relativizeSymlinks parameterized tests in separate tests (#13782) Update the search syntax highlight for web search (#13801) Chore(deps): Bump ai.djl:bom from 0.33.0 to 0.34.0 in /versions (#13833) Fix typos in CHANGELOG.md (#13826) Chore(deps): Bump com.konghq:unirest-modules-gson in /versions (#13831) Chore(deps): Bump org.gradlex:extra-java-module-info in /build-logic (#13830) Chore(deps): Bump org.apache.logging.log4j:log4j-to-slf4j in /versions (#13832) Chore(deps): Bump io.zonky.test.postgres:embedded-postgres-binaries-bom (#13834) Chore(deps): Bump jablib/src/main/resources/csl-locales (#13829) Chore(deps): Bump jablib/src/main/resources/csl-styles (#13827) Chore(deps): Bump jablib/src/main/abbrv.jabref.org (#13828) add: CAYW endpoint formats (#13785) New Crowdin updates (#13823) chore(deps): update dependency org.kohsuke:github-api to v2.0-rc.5 (#13822) Add support for automatic ICORE conference ranking lookup [#13476] (#13699) New Crowdin updates (#13820) Initialize search bar auto-completion with real database context (no tab switch needed) (#13816) Fixes #13274: Allow cygwin-paths on Windows (#13297) Refine "REDACTED" replacement of API key value in web fetcher search URL (#13814) changed ISSNCleanup into NormalizeIssn, refactored respective tests #13748 (#13767) ...
2 parents 2c4d427 + e75937b commit 5277005

File tree

206 files changed

+5772
-2309
lines changed

Some content is hidden

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

206 files changed

+5772
-2309
lines changed

.github/workflows/tests-code.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,8 @@ jobs:
483483
with:
484484
files: |
485485
jablib/src/main/java/**/*.java
486+
files_ignore: |
487+
jablib/src/main/java/**/*-*.java
486488
487489
- name: Build ${{ matrix.launcher }} launcher including changed classes
488490
shell: bash

.jbang/CheckoutPR.java

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

23-
//DEPS org.kohsuke:github-api:2.0-rc.4
23+
//DEPS org.kohsuke:github-api:2.0-rc.5
2424
//DEPS org.eclipse.jgit:org.eclipse.jgit.pgm:7.3.0.202506031305-r
2525

2626
public class CheckoutPR {

.jbang/JabKitLauncher.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
//JAVA 24
66
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
77

8+
//SOURCES ../jabkit/src/main/java/org/jabref/cli/converter/CygWinPathConverter.java
89
//SOURCES ../jabkit/src/main/java/org/jabref/cli/ArgumentProcessor.java
910
//SOURCES ../jabkit/src/main/java/org/jabref/cli/CheckConsistency.java
1011
//SOURCES ../jabkit/src/main/java/org/jabref/cli/CheckIntegrity.java

.jbang/JabSrvLauncher.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/CAYWQueryParams.java
2020
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/CAYWResource.java
2121
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/BibLatexFormatter.java
22+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/NatbibFormatter.java
23+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/MMDFormatter.java
24+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/PandocFormatter.java
25+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/TypstFormatter.java
2226
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/CAYWFormatter.java
2327
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/FormatterService.java
2428
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/cayw/format/SimpleJsonFormatter.java
@@ -65,7 +69,7 @@
6569
//DEPS info.picocli:picocli:4.7.7
6670
//DEPS org.postgresql:postgresql:42.7.7
6771
//DEPS org.bouncycastle:bcprov-jdk18on:1.81
68-
//DEPS com.konghq:unirest-modules-gson:4.5.0
72+
//DEPS com.konghq:unirest-modules-gson:4.5.1
6973
//DEPS jakarta.ws.rs:jakarta.ws.rs-api:4.0.0
7074
//DEPS org.glassfish.jersey.core:jersey-server:3.1.11
7175
//DEPS org.glassfish.jersey.inject:jersey-hk2:3.1.11
@@ -77,7 +81,7 @@
7781
//DEPS org.glassfish.grizzly:grizzly-framework:4.0.2
7882
//DEPS jakarta.validation:jakarta.validation-api:3.1.1
7983
//DEPS org.hibernate.validator:hibernate-validator:9.0.1.Final
80-
//DEPS com.konghq:unirest-modules-gson:4.5.0
84+
//DEPS com.konghq:unirest-modules-gson:4.5.1
8185
//DEPS com.google.guava:guava:33.4.8-jre
8286
//DEPS org.jabref:afterburner.fx:2.0.0
8387
//DEPS net.harawata:appdirs:1.4.0

CHANGELOG.md

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

1212
### Added
1313

14+
- We added support for Cygwin-file paths on a Windows Operating System. [#13274](https://github.com/JabRef/jabref/issues/13274)
15+
- We fixed an issue where "Print preview" would throw a `NullPointerException` if no printers were available. [#13708](https://github.com/JabRef/jabref/issues/13708)
1416
- We added the option to enable the language server in the preferences. [#13697](https://github.com/JabRef/jabref/pull/13697)
1517
- We introduced an option in Preferences under (under Linked files -> Linked file name conventions) to automatically rename linked files when an entry data changes. [#11316](https://github.com/JabRef/jabref/issues/11316)
1618
- We added tooltips (on hover) for 'Library-specific file directory', 'User-specific file directory' and 'LaTeX file directory' fields of the library properties window. [#12269](https://github.com/JabRef/jabref/issues/12269)
@@ -27,15 +29,19 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
2729
- We added a new ID based fetcher for [EuropePMC](https://europepmc.org/). [#13389](https://github.com/JabRef/jabref/pull/13389)
2830
- We added quick settings for welcome tab. [#12664](https://github.com/JabRef/jabref/issues/12664)
2931
- We added an initial [cite as you write](https://retorque.re/zotero-better-bibtex/citing/cayw/) endpoint. [#13187](https://github.com/JabRef/jabref/issues/13187)
32+
- We added pagination support for the web search entries dialog, improving navigation for large search results. [#5507](https://github.com/JabRef/jabref/issues/5507)
3033
- We added "copy preview as markdown" feature. [#12552](https://github.com/JabRef/jabref/issues/12552)
3134
- In case no citation relation information can be fetched, we show the data providers reason. [#13549](https://github.com/JabRef/jabref/pull/13549)
3235
- When relativizing file names, symlinks are now taken into account. [#12995](https://github.com/JabRef/jabref/issues/12995)
3336
- We added a new button for shortening the DOI near the DOI field in the general tab when viewing an entry. [#13639](https://github.com/JabRef/jabref/issues/13639)
3437
- We added support for finding CSL-Styles based on their short title (e.g. apa instead of "american psychological association"). [#13728](https://github.com/JabRef/jabref/pull/13728)
38+
- We added a field for the latest ICORE conference ranking lookup on the General Tab. [#13476](https://github.com/JabRef/jabref/issues/13476)
3539
- We added BibLaTeX datamodel validation support in order to improve error message quality in entries' fields validation. [#13318](https://github.com/JabRef/jabref/issues/13318)
40+
- We added more supported formats of CAYW endpoint of HTTP server. [#13578](https://github.com/JabRef/jabref/issues/13578)
3641

3742
### Changed
3843

44+
- We changed `ISSNCleanup` into `NormalizeIssn` a `ISSN` formatter. [#13748](https://github.com/JabRef/jabref/issues/13748)
3945
- We changed Citation Relations tab and gave tab panes more descriptive titles and tooltips. [#13619](https://github.com/JabRef/jabref/issues/13619)
4046
- We changed the name from Open AI Provider to Open AI (or API compatible). [#13585](https://github.com/JabRef/jabref/issues/13585)
4147
- We improved the citations relations caching by implementing an offline storage. [#11189](https://github.com/JabRef/jabref/issues/11189)
@@ -81,7 +87,10 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
8187
- We introduced walkthrough functionality [#12664](https://github.com/JabRef/jabref/issues/12664)
8288
- The Welcome tab now has a responsive layout. [#12664](https://github.com/JabRef/jabref/issues/12664)
8389
- We introduced a donation prompt in the Welcome tab. [#12664](https://github.com/JabRef/jabref/issues/12664)
84-
- We changed to syntax for the websearch to the one of the main search bar. [#13607](https://github.com/JabRef/jabref/issues/13607)
90+
- We changed the syntax for the web search to the one of the main search bar. [#13607](https://github.com/JabRef/jabref/issues/13607)
91+
- We improved nested scrolling for the web search tab in the preferences dialog [#13791](https://github.com/JabRef/jabref/pull/13791)
92+
- We improved the event viewer for debugging [#13783](https://github.com/JabRef/jabref/pull/13783).
93+
- We improved "REDACTED" replacement of API key value in web fetcher search URL [#13796](https://github.com/JabRef/jabref/issues/13796)
8594

8695
### Fixed
8796

@@ -110,11 +119,16 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
110119
- We fixed an issue showing an empty tooltip in maintable. [#11681](https://github.com/JabRef/jabref/issues/11681)
111120
- We fixed an issue displaying a warning if a file to open is not found. [#13430](https://github.com/JabRef/jabref/pull/13430)
112121
- We fixed an issue where Document Viewer showed technical exceptions when opening entries with non-PDF files. [#13198](https://github.com/JabRef/jabref/issues/13198)
122+
- We fixed an issue with double display of the library filename in the tab tooltip in the case of a changed library. [#13781](https://github.com/JabRef/jabref/pull/13781)
113123
- When creating a library, if you drag a PDF file containing only a single column, the dialog will now automatically close. [#13262](https://github.com/JabRef/jabref/issues/13262)
114-
- We fixed an issue where the tab showing the fulltext search results would appear blank after switching library. [#13241](https://github.com/JabRef/jabref/issues/13241)
124+
- We fixed an issue where the tab showing the fulltext search results would appear blank after switching libraries. [#13241](https://github.com/JabRef/jabref/issues/13241)
115125
- We fixed an issue where "Copy to" was enabled even if no other library was opened. [#13280](https://github.com/JabRef/jabref/pull/13280)
116126
- We fixed an issue where the groups were still displayed after closing all libraries. [#13382](https://github.com/JabRef/jabref/issues/13382)
117127
- Enhanced field selection logic in the Merge Entries dialog when fetching from DOI to prefer valid years and entry types. [#12549](https://github.com/JabRef/jabref/issues/12549)
128+
- We improved consistency in the Add Buttons. [#13791](https://github.com/JabRef/jabref/pull/13791)
129+
- We fixed an issue where theme or font size are not respected for all dialogs [#13558](https://github.com/JabRef/jabref/issues/13558)
130+
- We removed unnecessary spacing and margin in the AutomaticFieldEditor. [#13792](https://github.com/JabRef/jabref/pull/13792)
131+
- We fixed an issue where global search auto-completion only worked after switching tabs. [#11428](https://github.com/JabRef/jabref/issues/11428)
118132

119133
### Removed
120134

build-logic/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ repositories {
1010

1111
dependencies {
1212
implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
13-
implementation("com.autonomousapps:dependency-analysis-gradle-plugin:3.0.0")
13+
implementation("com.autonomousapps:dependency-analysis-gradle-plugin:3.0.1")
1414
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.11.0")
15-
implementation("org.gradlex:extra-java-module-info:1.13")
15+
implementation("org.gradlex:extra-java-module-info:1.13.1")
1616
implementation("org.gradlex:java-module-dependencies:1.9.2")
1717
implementation("org.gradlex:java-module-packaging:1.1") // required for platform-specific packaging of JavaFX dependencies
1818
implementation("org.gradlex:java-module-testing:1.7")

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
22
id("org.jabref.gradle.base.repositories")
33
id("org.jabref.gradle.feature.compile") // for openrewrite
4-
id("org.openrewrite.rewrite") version "7.14.1"
4+
id("org.openrewrite.rewrite") version "7.15.0"
55
id("org.itsallcode.openfasttrace") version "3.1.0"
66
}
77

88
// OpenRewrite should rewrite all sources
99
// This is the behavior when applied in the root project (https://docs.openrewrite.org/reference/gradle-plugin-configuration#multi-module-gradle-projects)
1010

1111
dependencies {
12-
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.13.0"))
12+
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.14.0"))
1313
rewrite("org.openrewrite.recipe:rewrite-static-analysis")
1414
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
1515
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")

0 commit comments

Comments
 (0)