Skip to content

Commit 442cca3

Browse files
author
Krishna Kumar Parthasarathy
committed
Merge branch 'main' of https://github.com/krishnagjsForGit/jabref into fix-for-issue-12810
2 parents af437c8 + 869e80e commit 442cca3

File tree

3,280 files changed

+14688
-11071
lines changed

Some content is hidden

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

3,280 files changed

+14688
-11071
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
// Install java.
3232
// See https://github.com/devcontainers/features/tree/main/src/java#options for details.
3333
"ghcr.io/devcontainers/features/java:1": {
34-
"version": "23.0.1-tem",
34+
"version": "24.0.1-tem",
3535
"installGradle": false,
3636
"jdkDistro": "Temurin"
3737
}

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ gradlew text eol=lf
1313
*.properties text eol=lf
1414

1515
CHANGELOG.md merge=union
16+
jablib/src/main/resources/l10n/JabRef_en.properties merge=union
1617
src/main/resources/l10n/JabRef_en.properties merge=union

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
label: JabRef version
1414
options:
1515
- "5.15 (latest release)"
16-
- "6.0-alpha"
16+
- "6.0-alpha2"
1717
- Latest development branch build (please note build date below)
1818
- Other (please describe below)
1919
description: The version as shown in the about dialog.

.github/dependabot.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ updates:
1313
- dependency-name: com.microsoft.azure:applicationinsights-logging-log4j2
1414
versions:
1515
- ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
16-
- package-ecosystem: gradle
17-
directory: "buildSrc/"
18-
schedule:
19-
interval: weekly
20-
labels:
21-
- "dependencies"
2216
- package-ecosystem: "github-actions"
2317
directory: "/"
2418
schedule:

.github/ghprcomment.yml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,27 @@
88
99
To verify compilation locally, run `./gradlew build` or try running JabRef.
1010
11-
- jobName: 'Unit tests'
11+
- jobName: 'Unit tests - jablib'
1212
message: >
13-
JUnit tests are failing.
13+
JUnit tests of `jablib` are failing.
14+
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
15+
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
16+
17+
18+
You can then run these tests in IntelliJ to reproduce the failing tests locally.
19+
We offer a quick test running howto in the section [Final build system checks](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.html#final-build-system-checks) in our setup guide.
20+
- jobName: 'Unit tests - jabkit'
21+
message: >
22+
JUnit tests of `jabkit` are failing.
23+
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
24+
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
25+
26+
27+
You can then run these tests in IntelliJ to reproduce the failing tests locally.
28+
We offer a quick test running howto in the section [Final build system checks](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.html#final-build-system-checks) in our setup guide.
29+
- jobName: 'Unit tests - jabsrv'
30+
message: >
31+
JUnit tests of `jabsrv` are failing.
1432
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
1533
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
1634
@@ -38,7 +56,7 @@
3856
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
3957
To see the test output, locate "Tests / OpenRewrite (pull_request)" and click on it.
4058
41-
59+
4260
The issues found can be **automatically fixed**.
4361
Please execute the gradle task *`rewriteRun`* from the [`rewrite` group of the Gradle Tool window](https://devdocs.jabref.org/code-howtos/faq.html#failing-openrewrite-tests) in IntelliJ, then check the results, commit, and push.
4462
- jobName: Modernizer
@@ -88,10 +106,13 @@
88106
- jobName: no-force-push
89107
always: true
90108
message: >
91-
Do not force-push!
92-
Force pushing is a very bad practice when working together on a project (mainly because it is [not supported well by GitHub itself](https://github.com/orgs/community/discussions/3478)).
109+
Hey, we noticed that you **force-pushed** your changes.
110+
Force pushing is a bad practice when working together on a project (mainly because it is [not supported well by GitHub itself](https://github.com/orgs/community/discussions/3478)).
93111
Commits are lost and comments on commits lose their context, thus making it harder to review changes.
94112
At the end, all commits will be [squashed](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) anyway before being merged into the `main` branch.
113+
114+
115+
In future, **please avoid that**. For now, you can continue working.
95116
- jobName: 'Conflicts with target branch'
96117
message: >
97118
Your pull request conflicts with the target branch.
@@ -119,7 +140,7 @@
119140
always: true
120141
message: >
121142
Note that your PR will not be reviewed/accepted until you have gone through the mandatory checks in the description and marked each of them them exactly in the format of `[x]` (done), `[ ]` (not done yet) or `[/]` (not applicable).
122-
- jobName: 'Determine issue number'
143+
- jobName: 'Issue number present'
123144
always: true
124145
message: |
125146
Your pull request needs to link an issue.

.github/workflows/deployment-arm64.yml

Lines changed: 0 additions & 270 deletions
This file was deleted.

0 commit comments

Comments
 (0)