Skip to content

Commit

Permalink
Merge branch 'main' into open-bib-as-default
Browse files Browse the repository at this point in the history
  • Loading branch information
koppor authored Nov 11, 2024
2 parents 15e9101 + 71b238c commit 114f2f4
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
restore-keys: cache-lychee-
- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@v2.0.2
uses: lycheeverse/lychee-action@v2.1.0
with:
fail: true
args: --accept '200,201,202,203,204,403,429,500' --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'
14 changes: 8 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ plugins {

id 'idea'

id 'org.openrewrite.rewrite' version '6.25.1'
id 'org.openrewrite.rewrite' version '6.27.0'

id "org.itsallcode.openfasttrace" version "3.0.1"
}
Expand Down Expand Up @@ -60,6 +60,7 @@ java {
// - .github/workflows/tests*.yml
// - .github/workflows/update-gradle-wrapper.yml
// - docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md
// - build.gradle -> jacoco -> toolVersion (because JaCoCo does not support newest JDK out of the box. Check versions at https://www.jacoco.org/jacoco/trunk/doc/changes.html)
languageVersion = JavaLanguageVersion.of(23)
// See https://docs.gradle.org/current/javadoc/org/gradle/jvm/toolchain/JvmVendorSpec.html for a full list
// vendor = JvmVendorSpec.AMAZON
Expand Down Expand Up @@ -129,6 +130,7 @@ sourceSets {
repositories {
mavenCentral()
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
maven { url 'https://jitpack.io' }
maven { url 'https://oss.sonatype.org/content/groups/public' }

Expand All @@ -150,7 +152,7 @@ javafx {
}

jacoco {
toolVersion = "0.8.10"
toolVersion = "0.8.13-SNAPSHOT"
}

dependencies {
Expand Down Expand Up @@ -183,7 +185,7 @@ dependencies {
implementation 'com.h2database:h2-mvstore:2.3.232'

// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
implementation 'org.bouncycastle:bcprov-jdk18on:1.79'

implementation 'commons-cli:commons-cli:1.9.0'

Expand All @@ -204,7 +206,7 @@ dependencies {
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '7.0.0.202409031743-r'

implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.1'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.18.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.18.1'

implementation 'com.fasterxml:aalto-xml:1.3.3'

Expand Down Expand Up @@ -241,7 +243,7 @@ dependencies {
}
implementation 'org.fxmisc.flowless:flowless:0.7.3'
implementation 'org.fxmisc.richtext:richtextfx:0.11.3'
implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.63.0') {
implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.64.0') {
exclude module: 'javax.inject' // Split package, use only jakarta.inject
exclude module: 'commons-lang3'
exclude group: 'org.apache.commons.validator'
Expand Down Expand Up @@ -393,7 +395,7 @@ dependencies {
// recommended by https://github.com/wiremock/wiremock/issues/2149#issuecomment-1835775954
testImplementation 'org.wiremock:wiremock-standalone:3.3.1'

checkstyle 'com.puppycrawl.tools:checkstyle:10.18.2'
checkstyle 'com.puppycrawl.tools:checkstyle:10.20.1'
// xjc needs the runtime as well for the ant task, otherwise it fails
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,19 @@ This will make these directories "Unregistered roots:", which is fine.
![Directory Mappings having three repositories unregsitered](intellij-directory-mappings-unregistered-roots.png)
{% endfigure %}

## Ensure that committing with other tools work

Open a "git bash".
On Windows, navigate to `C:\git-repositories\JabRef`.
Open the context menu of the file explorer (using the right mouse button), choose "Open Git Bash here".

Execute following command:

```shell
git update-index --assume-unchanged buildres/abbrv.jabref.org src/main/resources/csl-styles src/main/resources/csl-locales
```

{: .tip }
If you do not see the context menu, re-install git following the steps given at [StackOverflow](https://stackoverflow.com/a/50667280/873282).

<!-- markdownlint-disable-file MD033 -->
2 changes: 1 addition & 1 deletion src/main/resources/csl-styles
3 changes: 3 additions & 0 deletions src/main/resources/l10n/JabRef_pt_BR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,7 @@ Error\ opening\ file=Erro ao abrir o arquivo
Error\ opening\ file\ '%0'=Erro ao abrir arquivo '%0'
File\ '%0'\ already\ linked=Arquivo '%0' já vinculado
%0\ entry(s)\ imported=%0 entrada(s) importadas
Error\ while\ fetching\ from\ %0=Erro ao recuperar do %0
Expand Down Expand Up @@ -2644,6 +2645,8 @@ Generate\ summaries\ for\ entries\ in\ the\ group=Gerar resumos para referência
Generating\ summaries\ for\ %0=Gerando resumos para %0
Ingestion\ started\ for\ group\ "%0".=Assimilação iniciada para o grupo "%0".
Summarization\ started\ for\ group\ "%0".=Resumo iniciado para o grupo "%0".
Reset\ templates\ to\ default=Redefinir modelos para padrão
Templates=Modelos
System\ message\ for\ chatting=Mensagem de sistema para bate-papo
User\ message\ for\ chatting=Mensagem de usuário para bate-papo
Completion\ text\ for\ summarization\ of\ a\ chunk=Texto de conclusão para o resumo de um pedaço
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_sv.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Kan inte övervaka filändringar. Stäng filer och processer och starta om. Du kan stöta på fel om du fortsätter med denna session.
Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Det går inte att övervaka filändringar. Stäng filer och processer och starta om. Du kan stöta på fel om du fortsätter med denna session.

%0/%1\ entries=%0/%1 poster

Export\ operation\ finished\ successfully.=Exportoperationen slutfördes framgångsrikt.
Export\ operation\ finished\ successfully.=Exportåtgärden slutfördes.

Reveal\ in\ File\ Explorer=Visa i Filutforskaren
Reveal\ in\ File\ Explorer=Visa i Utforskaren

Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Förkorta tidskriftsnamnen för valda poster (STANDARD förkortning)
Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Förkorta tidskriftsnamnen för markerade poster (STANDARD-förkortning)

Abbreviate\ names=Förkorta namn
Abbreviated\ %0\ journal\ names.=Förkortade %0 tidskriftsnamn.
Expand Down

0 comments on commit 114f2f4

Please sign in to comment.