Skip to content

Commit c07010f

Browse files
committed
Merge branch 'add-ICORE-ranking-support' of https://github.com/TheYorouzoya/jabref into add-ICORE-ranking-support
2 parents 92d093f + dfea2ac commit c07010f

File tree

165 files changed

+3118
-2145
lines changed

Some content is hidden

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

165 files changed

+3118
-2145
lines changed

.github/workflows/publish.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
name: Publish to maven central
22

33
on:
4-
pull_request:
4+
# On releases
55
push:
6-
branches:
7-
- main
86
tags:
97
- '**'
10-
schedule:
11-
# Run on each Monday
12-
# Additional run in addition to the other events, because some resources could have changes
13-
- cron: '2 3 * * 1'
8+
9+
# Called by the JBang testing jobs to ensure that SNAPSHOT is uptodate
10+
workflow_call:
11+
secrets:
12+
KOPPOR_SIGNING_SECRETKEYRINGFILE_BASE64:
13+
required: true
14+
KOPPOR_SIGNING_KEYID:
15+
required: true
16+
KOPPOR_SIGNING_PASSWORD:
17+
required: true
18+
KOPPOR_MAVENCENTRALUSERNAME:
19+
required: true
20+
KOPPOR_MAVENCENTRALPASSWORD:
21+
required: true
22+
1423
workflow_dispatch:
1524
inputs:
1625
tagbuild:
@@ -19,6 +28,11 @@ on:
1928
default: false
2029
type: boolean
2130

31+
# Additional run in addition to the other events, because some resources could have changes
32+
schedule:
33+
# Run on each Monday
34+
- cron: '2 3 * * 1'
35+
2236
permissions:
2337
actions: write
2438
contents: read
@@ -56,7 +70,8 @@ jobs:
5670
github.event_name == 'schedule' ||
5771
github.event_name == 'workflow_dispatch' ||
5872
(needs.detect_changes.outputs.changed == 'true' &&
59-
((github.event_name == 'push' && github.repository == 'JabRef/jabref') ||
73+
((github.event_name == 'workflow_call' && github.repository == 'JabRef/jabref') ||
74+
(github.event_name == 'push' && github.repository == 'JabRef/jabref') ||
6075
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'JabRef/jabref'))
6176
)
6277
runs-on: ubuntu-latest

.github/workflows/tests-code.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ on:
88
pull_request:
99
merge_group:
1010
workflow_dispatch:
11-
# Re-run JBang tests after the SNAPSHOT is updated
12-
workflow_run:
13-
workflows: ["Publish to maven central"]
14-
types:
15-
- completed
11+
1612
env:
1713
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
1814
BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey_FOR_TESTS}}
@@ -26,6 +22,9 @@ concurrency:
2622
cancel-in-progress: true
2723

2824
permissions:
25+
# required for publish.yml
26+
actions: write
27+
contents: read
2928
pull-requests: write
3029

3130
jobs:
@@ -397,9 +396,20 @@ jobs:
397396
CI: "true"
398397
DBMS: "postgresql"
399398

399+
publish:
400+
if: github.ref == 'refs/heads/main'
401+
uses: ./.github/workflows/publish.yml
402+
secrets:
403+
KOPPOR_SIGNING_SECRETKEYRINGFILE_BASE64: ${{ secrets.KOPPOR_SIGNING_SECRETKEYRINGFILE_BASE64 }}
404+
KOPPOR_SIGNING_KEYID: ${{ secrets.KOPPOR_SIGNING_KEYID }}
405+
KOPPOR_SIGNING_PASSWORD: ${{ secrets.KOPPOR_SIGNING_PASSWORD }}
406+
KOPPOR_MAVENCENTRALUSERNAME: ${{ secrets.KOPPOR_MAVENCENTRALUSERNAME }}
407+
KOPPOR_MAVENCENTRALPASSWORD: ${{ secrets.KOPPOR_MAVENCENTRALPASSWORD }}
408+
400409
jbang:
401410
name: JBang (main)
402411
runs-on: ubuntu-latest
412+
needs: publish
403413
if: github.ref == 'refs/heads/main'
404414
steps:
405415
- name: Checkout source
@@ -435,6 +445,7 @@ jobs:
435445
jbang-pr:
436446
name: JBang (PR)
437447
runs-on: ubuntu-latest
448+
# does not need publish, because the JBang scripts are modified
438449
if: github.ref != 'refs/heads/main'
439450
strategy:
440451
fail-fast: false
@@ -472,6 +483,8 @@ jobs:
472483
with:
473484
files: |
474485
jablib/src/main/java/**/*.java
486+
files_ignore: |
487+
jablib/src/main/java/**/*-*.java
475488
476489
- name: Build ${{ matrix.launcher }} launcher including changed classes
477490
shell: bash

.jbang/JabSrvLauncher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
//DEPS info.picocli:picocli:4.7.7
6666
//DEPS org.postgresql:postgresql:42.7.7
6767
//DEPS org.bouncycastle:bcprov-jdk18on:1.81
68-
//DEPS com.konghq:unirest-modules-gson:4.5.0
68+
//DEPS com.konghq:unirest-modules-gson:4.5.1
6969
//DEPS jakarta.ws.rs:jakarta.ws.rs-api:4.0.0
7070
//DEPS org.glassfish.jersey.core:jersey-server:3.1.11
7171
//DEPS org.glassfish.jersey.inject:jersey-hk2:3.1.11
@@ -77,7 +77,7 @@
7777
//DEPS org.glassfish.grizzly:grizzly-framework:4.0.2
7878
//DEPS jakarta.validation:jakarta.validation-api:3.1.1
7979
//DEPS org.hibernate.validator:hibernate-validator:9.0.1.Final
80-
//DEPS com.konghq:unirest-modules-gson:4.5.0
80+
//DEPS com.konghq:unirest-modules-gson:4.5.1
8181
//DEPS com.google.guava:guava:33.4.8-jre
8282
//DEPS org.jabref:afterburner.fx:2.0.0
8383
//DEPS net.harawata:appdirs:1.4.0

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
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 fixed an issue where "Print preview" would throw a `NullPointerException` if no printers were available. [#13708](https://github.com/JabRef/jabref/issues/13708)
1415
- We added the option to enable the language server in the preferences. [#13697](https://github.com/JabRef/jabref/pull/13697)
1516
- 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)
1617
- 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,6 +28,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
2728
- We added a new ID based fetcher for [EuropePMC](https://europepmc.org/). [#13389](https://github.com/JabRef/jabref/pull/13389)
2829
- We added quick settings for welcome tab. [#12664](https://github.com/JabRef/jabref/issues/12664)
2930
- 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)
31+
- We added pagination support for the web search entries dialog, improving navigation for large search results. [#5507](https://github.com/JabRef/jabref/issues/5507)
3032
- We added "copy preview as markdown" feature. [#12552](https://github.com/JabRef/jabref/issues/12552)
3133
- In case no citation relation information can be fetched, we show the data providers reason. [#13549](https://github.com/JabRef/jabref/pull/13549)
3234
- When relativizing file names, symlinks are now taken into account. [#12995](https://github.com/JabRef/jabref/issues/12995)
@@ -37,6 +39,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
3739

3840
### Changed
3941

42+
- We changed `ISSNCleanup` into `NormalizeIssn` a `ISSN` formatter. [#13748](https://github.com/JabRef/jabref/issues/13748)
4043
- We changed Citation Relations tab and gave tab panes more descriptive titles and tooltips. [#13619](https://github.com/JabRef/jabref/issues/13619)
4144
- We changed the name from Open AI Provider to Open AI (or API compatible). [#13585](https://github.com/JabRef/jabref/issues/13585)
4245
- We improved the citations relations caching by implementing an offline storage. [#11189](https://github.com/JabRef/jabref/issues/11189)
@@ -74,6 +77,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
7477
- We improved JabRef's internal document viewer. It now allows text section, searching and highlighting of search terms and page rotation [#13193](https://github.com/JabRef/jabref/pull/13193).
7578
- When importing a PDF, there is no empty entry column shown in the multi merge dialog. [#13132](https://github.com/JabRef/jabref/issues/13132)
7679
- We added a progress dialog to the "Check consistency" action and progress output to the corresponding cli command. [#12487](https://github.com/JabRef/jabref/issues/12487)
80+
- The BibTeX source is now formatted using the JabRef style at the import inspection dialog. [#13015](https://github.com/JabRef/jabref/issues/13015)
7781
- We made the `check-consistency` command of the toolkit always return an exit code; 0 means no issues found, a non-zero exit code reflects any issues, which allows CI to fail in these cases [#13328](https://github.com/JabRef/jabref/issues/13328).
7882
- We changed the validation error dialog for overriding the default file directories to a confirmation dialog for saving other preferences under the library properties. [#13488](https://github.com/JabRef/jabref/pull/13488)
7983
- We made the copy sub menu on the context menu consistent with the copy sub menu at "Edit". [#13280](https://github.com/JabRef/jabref/pull/13280)
@@ -82,6 +86,9 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
8286
- The Welcome tab now has a responsive layout. [#12664](https://github.com/JabRef/jabref/issues/12664)
8387
- We introduced a donation prompt in the Welcome tab. [#12664](https://github.com/JabRef/jabref/issues/12664)
8488
- We changed to syntax for the websearch to the one of the main search bar. [#13607](https://github.com/JabRef/jabref/issues/13607)
89+
- We improved the for the web search tab in the preferences dialog [#13791](https://github.com/JabRef/jabref/pull/13791)
90+
- We improved the event viewer for debugging [#13783](https://github.com/JabRef/jabref/pull/13783).
91+
- We improved "REDACTED" replacement of API key value in web fetcher search URL [#13796](https://github.com/JabRef/jabref/issues/13796)
8592

8693
### Fixed
8794

@@ -110,11 +117,15 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
110117
- We fixed an issue showing an empty tooltip in maintable. [#11681](https://github.com/JabRef/jabref/issues/11681)
111118
- We fixed an issue displaying a warning if a file to open is not found. [#13430](https://github.com/JabRef/jabref/pull/13430)
112119
- 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)
120+
- 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)
113121
- 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)
122+
- 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)
115123
- We fixed an issue where "Copy to" was enabled even if no other library was opened. [#13280](https://github.com/JabRef/jabref/pull/13280)
116124
- We fixed an issue where the groups were still displayed after closing all libraries. [#13382](https://github.com/JabRef/jabref/issues/13382)
117125
- 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)
126+
- We improved consistency in the Add Buttons. [#13791](https://github.com/JabRef/jabref/pull/13791)
127+
- We fixed an issue where theme or font size are not respected for all dialogs [#13558](https://github.com/JabRef/jabref/issues/13558)
128+
- We removed unnecessary spacing and margin in the AutomaticFieldEditor. [#13792](https://github.com/JabRef/jabref/pull/13792)
118129

119130
### Removed
120131

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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")
1515
implementation("org.gradlex:extra-java-module-info:1.13")
1616
implementation("org.gradlex:java-module-dependencies:1.9.2")

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)