Skip to content

Commit c269ae2

Browse files
committed
Merge branch 'multimodule-followup' of github.com:JabRef/jabref into multimodule-followup
* 'multimodule-followup' of github.com:JabRef/jabref: Fix import order & OpenRewrite Add PR link to changelog Add Crowdin action (#13007) Bump tech.units:indriya from 2.2.2 to 2.2.3 (#13006) Bump org.openrewrite.recipe:rewrite-recipe-bom from 3.5.0 to 3.7.0 (#13005) Bump com.konghq:unirest-java-core from 4.4.5 to 4.4.6 (#13004)
2 parents f7caa7e + 400667a commit c269ae2

File tree

11 files changed

+54
-13
lines changed

11 files changed

+54
-13
lines changed

.github/workflows/automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
(
1818
startsWith(github.event.pull_request.title, '[Bot] ') ||
1919
startsWith(github.event.pull_request.title, 'Bump ') ||
20-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
20+
startsWith(github.event.pull_request.title, 'New Crowdin Translations') ||
2121
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
2222
)
2323
)

.github/workflows/crowdin.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Crowdin Action
2+
3+
on:
4+
push:
5+
branches:
6+
- use-crowdin-action
7+
schedule:
8+
# run on each Wednesday
9+
- cron: '2 3 * * 3'
10+
workflow_dispatch:
11+
12+
jobs:
13+
synchronize-with-crowdin:
14+
if: github.repository == 'JabRef/jabref'
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: crowdin action
22+
uses: crowdin/github-action@v2
23+
with:
24+
upload_sources: true
25+
upload_translations: false
26+
upload_language: de
27+
download_translations: true
28+
localization_branch_name: l10n_crowdin_translations
29+
create_pull_request: true
30+
pull_request_title: 'New Crowdin Translations'
31+
pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
32+
pull_request_base_branch_name: 'main'
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE }}
35+
36+
# A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
37+
CROWDIN_PROJECT_ID: 294858
38+
39+
# Visit https://crowdin.com/settings#api-key to create this token
40+
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/on-pr-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
(
1515
startsWith(github.event.pull_request.title, '[Bot] ') ||
1616
startsWith(github.event.pull_request.title, 'Bump ') ||
17-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
17+
startsWith(github.event.pull_request.title, 'New Crowdin Translations') ||
1818
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
1919
)
2020
)

.github/workflows/on-pr-opened-updated.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
(
1616
startsWith(github.event.pull_request.title, '[Bot] ') ||
1717
startsWith(github.event.pull_request.title, 'Bump ') ||
18-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
18+
startsWith(github.event.pull_request.title, 'New Crowdin Translations') ||
1919
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
2020
)
2121
)

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ jobs:
331331
(
332332
startsWith(github.event.pull_request.title, '[Bot] ') ||
333333
startsWith(github.event.pull_request.title, 'Bump ') ||
334-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
334+
startsWith(github.event.pull_request.title, 'New Crowdin Translations') ||
335335
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
336336
)
337337
)
@@ -367,7 +367,7 @@ jobs:
367367
(
368368
startsWith(github.event.pull_request.title, '[Bot] ') ||
369369
startsWith(github.event.pull_request.title, 'Bump ') ||
370-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
370+
startsWith(github.event.pull_request.title, 'New Crowdin Translations') ||
371371
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
372372
)
373373
)

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
1717

1818
### Removed
1919

20-
- We removed support for MySQL/MariaDB and Oracle.
20+
- We removed support for MySQL/MariaDB and Oracle. [#12990](https://github.com/JabRef/jabref/pull/12990)
2121
- We removed library migrations (users need to use JabRef 6.0-alpha.1 to perform migrations) [#12990](https://github.com/JabRef/jabref/pull/12990)
2222

2323
## [6.0-alpha2] – 2025-04-27

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
// This is the behavior when applied in the root project (https://docs.openrewrite.org/reference/gradle-plugin-configuration#multi-module-gradle-projects)
1919

2020
dependencies {
21-
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.5.0"))
21+
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.7.0"))
2222
rewrite("org.openrewrite.recipe:rewrite-static-analysis")
2323
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
2424
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")

crowdin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
files:
2-
- source: /src/main/resources/l10n/JabRef_en.properties
3-
translation: /src/main/resources/l10n/JabRef_%two_letters_code%.properties
2+
- source: /jablib/src/main/resources/l10n/JabRef_en.properties
3+
translation: /jablib/src/main/resources/l10n/JabRef_%two_letters_code%.properties
44
languages_mapping:
55
two_letters_code:
66
pt-BR: pt_BR

jabgui/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies {
5555
}
5656

5757
// Required by gemsfx
58-
implementation("tech.units:indriya:2.2.2")
58+
implementation("tech.units:indriya:2.2.3")
5959
// Required by gemsfx and langchain4j
6060
implementation ("com.squareup.retrofit2:retrofit:2.11.0") {
6161
exclude(group = "com.squareup.okhttp3")
@@ -96,7 +96,7 @@ dependencies {
9696

9797
implementation("org.eclipse.jgit:org.eclipse.jgit:7.2.0.202503040940-r")
9898

99-
implementation("com.konghq:unirest-java-core:4.4.5")
99+
implementation("com.konghq:unirest-java-core:4.4.6")
100100

101101
implementation("org.apache.httpcomponents.client5:httpclient5:5.4.4")
102102

jabgui/src/main/java/org/jabref/cli/ArgumentProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.jabref.model.util.DummyFileUpdateMonitor;
2424
import org.jabref.model.util.FileUpdateMonitor;
2525

26+
import org.apache.commons.cli.ParseException;
2627
import org.slf4j.Logger;
2728
import org.slf4j.LoggerFactory;
2829

@@ -49,7 +50,7 @@ public ArgumentProcessor(String[] args,
4950
Mode startupMode,
5051
GuiPreferences preferences,
5152
FileUpdateMonitor fileUpdateMonitor)
52-
throws org.apache.commons.cli.ParseException {
53+
throws ParseException {
5354
this.cli = new CliOptions(args);
5455
this.startupMode = startupMode;
5556
this.preferences = preferences;

0 commit comments

Comments
 (0)