Skip to content

Syncing the upstream update#5

Merged
elliotgnn merged 36 commits into
implmentation-issue-10822from
merge_sync
Oct 25, 2025
Merged

Syncing the upstream update#5
elliotgnn merged 36 commits into
implmentation-issue-10822from
merge_sync

Conversation

@elliotgnn

@elliotgnn elliotgnn commented Oct 25, 2025

Copy link
Copy Markdown
Owner

Closes _____

Steps to test

Mandatory checks

wanling0000 and others added 30 commits October 16, 2025 08:50
* Changes by koppor

* Changes by subhramit

* update the JabRef code style

* fix git pull action

* fix git push action

* test: migrate semantic conflict cases to SemanticMergeAnalyzerTest and add unit tests

* fix: remove incorrect mention of `computeMergePlan`

* fix: remove incorrect mention of `computeMergePlan`

* Revert unintended renaming caused by IDE auto-formatting

* Address part of trag-bot's suggestions in JabRef#13946

* Add missing English localization keys

* remove obsolete inMerging branch in createCommitOnCurrentBranch

* test: replace assertTrue with assertEquals

* Clean up comments and variable names + Modify a test assertion

* Change prepareMerge() to return Optional<PullPlan> for no-op cases

* Fix failed tests

* Update comments

* remove exception control flow, assert presence of PullPlan instead

* Handle the optional PullPlan

* refactor(git): address review feedback

* chore: fix OpenRewrite config and apply code style cleanup

* Apply suggestions from code review

rename variables

Co-authored-by: Subhramit Basu <subhramit.bb@live.in>

* fix:remove unnecessary annotation and avoid throwing RuntimeException

---------

Co-authored-by: Subhramit Basu <subhramit.bb@live.in>
* Parameterize tests for Issue JabRef#676

* Address PR review feedback: reformat CsvSource, rename variables, inline helper method, and improve readability
* Add definition links for Markdown

* add ability to jumpToEntry from LSP and when running in standalone open the article in the bibfile

* fix jbang

* fix jbang again

* fix jbang again...

* reformat

* reformat again

* rename Logging Class

* fix modernizer

* switch to jspecify annotation

* remove workspace capabilities

* remove unused messagehandler

* remove unused import

* refactor

* refactor: enhance citation key pattern matching and validation

* sort alphabetically

* docs: add clarification comment regarding LSP position handling

---------

Co-authored-by: Christoph <siedlerkiller@gmail.com>
* New translations jabref_en.properties (French)

* New translations jabref_en.properties (Italian)

* New translations jabref_en.properties (Portuguese, Brazilian)
* fix: prevent Windows tempdir deletion failure

* fix: reformat
Bumps [jablib/src/main/resources/csl-locales](https://github.com/citation-style-language/locales) from `fbb76f6` to `10ce56f`.
- [Release notes](https://github.com/citation-style-language/locales/releases)
- [Commits](citation-style-language/locales@fbb76f6...10ce56f)

---
updated-dependencies:
- dependency-name: jablib/src/main/resources/csl-locales
  dependency-version: 10ce56fb7730fd3524548d37386c23a792afe621
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [jablib/src/main/resources/csl-styles](https://github.com/citation-style-language/styles) from `7235025` to `997e2d3`.
- [Release notes](https://github.com/citation-style-language/styles/releases)
- [Commits](citation-style-language/styles@7235025...997e2d3)

---
updated-dependencies:
- dependency-name: jablib/src/main/resources/csl-styles
  dependency-version: 997e2d3ca89d408a1d9c8d87ae6a06552bbad6be
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.8-jre to 33.5.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.5.0-jre
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [net.java.dev.jna:jna-jpms](https://github.com/java-native-access/jna) from 5.18.0 to 5.18.1.
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](java-native-access/jna@5.18.0...5.18.1)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna-jpms
  dependency-version: 5.18.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…14111)

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.13.4 to 6.0.0.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits/r6.0.0)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…f#14112)

Bumps [dev.langchain4j:langchain4j-bom](https://github.com/langchain4j/langchain4j) from 1.4.0 to 1.7.1.
- [Release notes](https://github.com/langchain4j/langchain4j/releases)
- [Commits](langchain4j/langchain4j@1.4.0...1.7.1)

---
updated-dependencies:
- dependency-name: dev.langchain4j:langchain4j-bom
  dependency-version: 1.7.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christoph <siedlerkiller@gmail.com>
JabRef#14109)

Bumps [org.gradlex:java-module-dependencies](https://github.com/gradlex-org/java-module-dependencies) from 1.10 to 1.11.
- [Release notes](https://github.com/gradlex-org/java-module-dependencies/releases)
- [Changelog](https://github.com/gradlex-org/java-module-dependencies/blob/main/CHANGELOG.md)
- [Commits](gradlex-org/java-module-dependencies@v1.10...v1.11)

---
updated-dependencies:
- dependency-name: org.gradlex:java-module-dependencies
  dependency-version: '1.11'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christoph <siedlerkiller@gmail.com>
* Add test of [authList]

* Consistently order argument providers and tests

* Move remaining lastAuthor tests

* Incorporate reviewer feedback

---------

Co-authored-by: espertusnu <espertusnu@users.noreply.github.com>
Co-authored-by: Christoph <siedlerkiller@gmail.com>
…4121)

* Separate issue linking workflows, make them run on `edited`

* Add workflow name to `workflow_run` for pr-comment
* Reformatted database variable to catalogue

* Renamed StudyDatabase.java to StudyCatalog and updated its usage in other classes

* Created an abstract StudyYamlMigrator class as a template for study.yml migrations

* Created an implementation of the abstract Migrator class for migrations from the current study.yml version to the new one

* Created a StudyMetadata class to handle the metadata part of the study.yml file

* Created a new class called StudyYamlService for handling the migration and parsing of study.yml if needed

* StudyYamlMigrator no longer uses child classes in constructor in order to avoid deadlock

* Ran openrewrite and changed the jetbrains annotations in StudyYamlV1Migrator to JSpecify annotations

* Changed StudyYamlParserTest.java to use the new StudyYamlParserTest instead of StudyYamlParser

* Changed the usage of the word catalogue to catalog to be consistent with the rest of the codebase

* Added functions for adding a metadata field to the study.yml

* Added unit tests for MigratorV1, removed the study type field as it was not needed

* Changed database variable to catalog and an immutable map is returned from getCatalogSpecific form StudyQuery

* Reformatted files

* Removed studytype parameter in StudyMetadata

* yaml mapper variable in StudyYamlMigrator is now a static field

* Changed null handling on some variables to use Optional

* Changed the use of StringBuilder to StringJoiner in StudyYamlV1Migrator

* Added Optionals to various functions

* Refactored the tests for StudyYamlV1Migrator to use Optionals correctly

* Refactored the tests for StudyYamlV1Migrator to use Optionals correctly

* Refactored the tests for StudyYamlV1Migrator to use Optionals correctly

* Refactored StudyQuery to not use collections import

* Disabled the requirement for handlers for java8 optionals in StudyYamlParser

* Reverted the disabling of the requirement for handlers for optionals in StudyYamlParser and removed Optionals in StudyQuery

* Changed the usage of Optionals in Study and readded Optionals on StudyQuery

* Added new dependency jackson datatype jdk 8 for serializing Optionals

* Refactored Study and StudyQuery to use more Optionals, StudyYamlParser should support proper deserialization of Optionals

* Added annotations for Json deserialization to avoid conflicts

* getCatalogSpecificOptional function is ignored when deserializing Json

* updated StudyQuery equals method for compatibility with testing

* Update jablib/src/main/java/org/jabref/logic/crawler/StudyYamlV1Migrator.java

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

* Reverted the update to instanceof check because of unsafe type conversion

* Added nonnull annotations and changed the metadata field to not use Optional

* Added nonnull annotations to getVersion function from StudyYamlV1Migrator

* Changed the suppress warning annotation to the whole function in StudyYamlV1Migrator

* fix version and remove unused stuff

* readd

---------

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Co-authored-by: Christoph <siedlerkiller@gmail.com>
)

* fix: Slightly improved visual consistency of the CitationkeyTab

* docs: Update CHANGELOG

* docs: Update CHANGELOG.md

Co-authored-by: Subhramit Basu <subhramit.bb@live.in>

* fix: Make the HelpButton's weird method more clear

* Small fixes

* line breaks

* Remove artifact

* Remove artifact

* l10n

---------

Co-authored-by: Subhramit Basu <subhramit.bb@live.in>
Co-authored-by: Christoph <siedlerkiller@gmail.com>
Co-authored-by: Carl Christian Snethlage <calixtus@users.noreply.github.com>
* New translations jabref_en.properties (French)

* New translations jabref_en.properties (Spanish)

* New translations jabref_en.properties (Arabic)

* New translations jabref_en.properties (Danish)

* New translations jabref_en.properties (German)

* New translations jabref_en.properties (Greek)

* New translations jabref_en.properties (Finnish)

* New translations jabref_en.properties (Italian)

* New translations jabref_en.properties (Japanese)

* New translations jabref_en.properties (Korean)

* New translations jabref_en.properties (Dutch)

* New translations jabref_en.properties (Norwegian)

* New translations jabref_en.properties (Polish)

* New translations jabref_en.properties (Portuguese)

* New translations jabref_en.properties (Russian)

* New translations jabref_en.properties (Swedish)

* New translations jabref_en.properties (Turkish)

* New translations jabref_en.properties (Ukrainian)

* New translations jabref_en.properties (Chinese Simplified)

* New translations jabref_en.properties (Chinese Traditional)

* New translations jabref_en.properties (Vietnamese)

* New translations jabref_en.properties (Portuguese, Brazilian)

* New translations jabref_en.properties (Indonesian)

* New translations jabref_en.properties (Persian)

* New translations jabref_en.properties (Tagalog)
Co-authored-by: espertusnu <espertusnu@users.noreply.github.com>
* fix: corrected path conversion logic

* refactored keyFile to be Path

* fixed checkstyle violation
* feat: implement no_color mode

* fix format

* apply OpenRewrite changes for String.format

* Refactor: Apply suggestions from code review

- Move textFormatter version to version catalog

- Reformat JABREF_BANNER concatenation

change val to var

* fix format

* fix format

* fix format

* fix (again) format

* Nitpicks and removed unnecessary changes

* Remove more unnecessary changes

* Undo gradle-wrapper.properties again

* Remove transitive, removed unnecessary deps

* Removed more unnecessary changes

* Reintroduce deps after testing

---------

Co-authored-by: Carl Christian Snethlage <calixtus@users.noreply.github.com>
Added Pebble to the list of template engines considered.
Added section on using @ParameterizedTests with examples.
* Add links to other duplicate checks

* Move to package-info.java
* Collects sorting items under Sort submenu in groups menu (JabRef#14017)

* Addchangelog entry for sort submenu in groups panel (JabRef#14017)

* add sort-label for groups submenu (JabRef#14017)

* inlined changes for sortgroup (JabRef#14017)

---------

Co-authored-by: Jenny Hanås <jenha090@student.liu.se>
* New translations jabref_en.properties (French)

* New translations jabref_en.properties (Italian)
palukku and others added 6 commits October 24, 2025 14:03
* add AbstractJabKitTest for easier CLI testing refactored ArgumentProcessorTest

* added utils for resources and refactored for old code to use them

* Add CLI for pseudonymize

* Add interface to get stdout and stderr from command line execution

* add test for convert, new dependency for the test needed

* added test for search cli

* fix removed unneeded sout statements
@elliotgnn elliotgnn self-assigned this Oct 25, 2025
@elliotgnn elliotgnn requested a review from XMJ3083 October 25, 2025 10:35

@XMJ3083 XMJ3083 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks good overall, I don’t see any issues.

@elliotgnn elliotgnn merged commit 9b62d0c into implmentation-issue-10822 Oct 25, 2025
62 of 69 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.