Skip to content

Commit 1daaf65

Browse files
authored
Merge branch 'main' into fix-12810-escape-keyword-separators
2 parents 5a63b71 + fcc67ed commit 1daaf65

21 files changed

+260
-234
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ Please see our [Installation Guide](https://docs.jabref.org/installation).
5959

6060
We are thankful for any bug reports or other feedback.
6161
If you have ideas for new features you want to be included in JabRef, tell us in [the feature section](http://discourse.jabref.org/c/features) of our forum!
62-
If you need support in using JabRef, please read [the documentation](https://docs.jabref.org/) first, the [frequently asked questions (FAQ)](https://docs.jabref.org/faq) and also have a look at our [community forum](https://discourse.jabref.org/c/help/7).
62+
If you need support in using JabRef, please read the [user documentation](https://docs.jabref.org/), especially the [frequently asked questions (FAQ)](https://docs.jabref.org/faq) and also take a look at our [community forum](https://discourse.jabref.org/c/help/7).
6363
You can use our [GitHub issue tracker](https://github.com/JabRef/jabref/issues) to file bug reports.
6464

6565
An explanation of donation possibilities and usage of donations is available at our [donations page](https://donations.jabref.org).
6666

6767
## Contributing
6868

6969
Want to be part of a free and open-source project that tens of thousands of researchers use every day?
70-
Please have a look at our [guidelines for contributing](CONTRIBUTING.md).
70+
Please take a look at our [guidelines for contributing](CONTRIBUTING.md).
7171

7272
## Research and Education
7373

build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ dependencies {
235235
implementation('org.jabref:afterburner.fx:2.0.0') {
236236
exclude group: 'org.openjfx'
237237
}
238-
implementation 'org.kordamp.ikonli:ikonli-javafx:12.3.1'
238+
implementation 'org.kordamp.ikonli:ikonli-javafx:12.4.0'
239239
implementation 'org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1'
240240
implementation 'com.github.sialcasa.mvvmFX:mvvmfx-validation:f195849ca9' //jitpack
241241
implementation 'de.saxsys:mvvmfx:1.8.0'
@@ -266,8 +266,8 @@ dependencies {
266266

267267
// region HTTP clients
268268
implementation 'org.jsoup:jsoup:1.19.1'
269-
implementation 'com.konghq:unirest-java-core:4.4.5'
270-
implementation 'com.konghq:unirest-modules-gson:4.4.5'
269+
implementation 'com.konghq:unirest-java-core:4.4.6'
270+
implementation 'com.konghq:unirest-modules-gson:4.4.6'
271271
implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.3'
272272
// endregion
273273

@@ -281,7 +281,7 @@ dependencies {
281281
// route all requests to log4j to SLF4J
282282
implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.24.3'
283283

284-
implementation('de.undercouch:citeproc-java:3.2.0') {
284+
implementation('de.undercouch:citeproc-java:3.2.1') {
285285
exclude group: 'org.antlr'
286286
}
287287

@@ -383,7 +383,7 @@ dependencies {
383383

384384
testImplementation 'io.github.classgraph:classgraph:4.8.179'
385385
testImplementation 'org.junit.jupiter:junit-jupiter:5.12.2'
386-
testImplementation 'org.junit.platform:junit-platform-launcher:1.12.1'
386+
testImplementation 'org.junit.platform:junit-platform-launcher:1.12.2'
387387

388388
testImplementation 'org.mockito:mockito-core:5.17.0'
389389
testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
@@ -403,7 +403,7 @@ dependencies {
403403
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
404404
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
405405

406-
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.5.0"))
406+
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.6.1"))
407407
rewrite("org.openrewrite.recipe:rewrite-static-analysis")
408408
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
409409
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")

docs/code-howtos/cli.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
parent: Code Howtos
3+
---
4+
# Command Line Interface
5+
6+
The package `org.jabref.cli` is responsible for handling the command line options.
7+
8+
During development, one can configure IntelliJ to pass command line parameters:
9+
10+
![IntelliJ-run-configuration](../images/intellij-run-configuration-command-line.png)
11+
12+
Passing command line arguments using gradle is currently not possible as all arguments (such as `-Dfile.encoding=windows-1252`) are passed to the application.
13+
14+
Without [jlink](https://docs.oracle.com/en/java/javase/11/tools/jlink.html), it is not possible to generate a fat jar anymore. During development, the capabilities of the IDE has to be used.

docs/code-howtos/faq.md

+11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ parent: Code Howtos
55

66
Following is a list of common errors encountered by developers which lead to failing tests, with their common solutions:
77

8+
## git hints
9+
10+
* Sync your fork with the JabRef repository: [General howto by GitHub](https://help.github.com/articles/syncing-a-fork/)
11+
* Branches and pull requests (🇩🇪): [https://github.com/unibas-marcelluethi/software-engineering/blob/master/docs/week2/exercises/practical-exercises.md](https://github.com/unibas-marcelluethi/software-engineering/blob/master/docs/week2/exercises/practical-exercises.md)
12+
813
## Failing tests
914

1015
### Failing <b>Checkstyle</b> tests
@@ -149,4 +154,10 @@ And similarly for `csl-locales` or `abbrv.jabref.org`.
149154
150155
To avoid this, avoid staging using `git add .` from CLI. Preferably use a GUI-based git manager, such as the one built in IntelliJ or open git gui from the command line. Even if you accidentally stage them, don't commit all files, selectively commit the files you touched using the GUI based tool, and push.
151156
157+
## Q: I get `java: package org.jabref.logic.journals does not exist`
158+
159+
A: You have to ignore `buildSrc/src/main` as source directory in IntelliJ as indicated in our [setup guide](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
160+
161+
Also filed as IntelliJ issue [IDEA-240250](https://youtrack.jetbrains.com/issue/IDEA-240250).
162+
152163
<!-- markdownlint-disable-file MD033 -->

docs/code-howtos/groups.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
parent: Code Howtos
3+
---
4+
# Groups
5+
6+
Diagram showing aspects of groups: [Groups.uml](https://github.com/JabRef/jabref/tree/3b3716b1e05a0d3273c886e102a8efe5e96472e0/docs/Groups.uml).

docs/code-howtos/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ This is implemented in `FileUtil`:
6262
org.jabref.logic.util.io.FileUtil.relativize(java.nio.file.Path, org.jabref.model.database.BibDatabaseContext, org.jabref.logic.FilePreferences)
6363
```
6464

65-
## Setting a Directory for a .bib File
65+
## Setting a directory for a `.bib` file
6666

6767
* `@comment{jabref-meta: fileDirectory:<directory>`
6868
* “fileDirectory” is determined by Globals.pref.get(“userFileDir”) (which defaults to “fileDirectory”

docs/getting-into-the-code/development-strategy.md

-59
This file was deleted.

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Ensure you have a Java 23 SDK configured by navigating to **File > Project Struc
1212
**Note:** In some MacBooks, `Project Structure` can be found at the "IntelliJ" button of the app menu instead of at "File".
1313

1414
{% figure caption:"JDKs 11, 14, and 15 shown in available SDKs. JDK 23 is missing." %}
15-
![Plattform Settings - SDKs](intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png)
15+
![Platform Settings - SDKs](intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png)
1616
{% endfigure %}
1717

1818
If there is another JDK than JDK 23 selected, click on the plus button and choose "Download JDK..."
1919

2020
{% figure caption:"Download JDK..." %}
21-
![Plattform Settings - SDKs - plus button - Download JDK...](guidelines-select-download-jdk.png)
21+
![Platform Settings - SDKs - plus button - Download JDK...](guidelines-select-download-jdk.png)
2222
{% endfigure %}
2323

2424
Select JDK version 23 and then Eclipse Temurin.
@@ -46,7 +46,7 @@ Click "OK" to store the changes.
4646
Navigate to **File > Settings... > Build, Execution, Deployment > Build Tools > Gradle** and select the "Project SDK" as the Gradle JVM at the bottom.
4747
If that does not exist, just select JDK 23.
4848

49-
{% figure caption:"Gradle JVM is project SDK (showing "Projekt SDK temurin-23" as example)" %}
49+
{% figure caption:"Gradle JVM is project SDK (showing "Project SDK temurin-23" as example)" %}
5050
![Gradle JVM is project SDK](guidelines-intellij-settings-gradle-gradlejvm-is-projectjvm.png)
5151
{% endfigure %}
5252

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-02-software.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ It is strongly recommended that you have git installed.
3030

3131
## Installed IDE
3232

33-
We highly encourage using [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=jabref), because all other IDEs work less good.
34-
Especially using Visual Studio Code has issues.
33+
We highly encourage using [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=jabref), as it provides the most reliable experience for this project.
34+
Other IDEs may have compatibility issues, particularly Visual Studio Code.
3535

3636
IntelliJ's Community Edition works well.
3737
Most contributors use the Ultimate Edition, because they are students getting that edition for free.

docs/getting-into-the-code/high-level-documentation.md

-48
This file was deleted.

0 commit comments

Comments
 (0)