Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into oo-architecture-2
Browse files Browse the repository at this point in the history
* upstream/main:
  Bump gittools/actions from 1.2.0 to 2.0.0 (JabRef#11529)
  Bump src/main/resources/csl-styles from `fd6cb3e` to `bf2926b` (JabRef#11528)
  Bump org.openrewrite.rewrite from 6.16.3 to 6.16.4 (JabRef#11527)
  Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 (JabRef#11525)
  Bump org.jspecify:jspecify from 0.3.0 to 1.0.0 (JabRef#11523)
  Bump com.github.andygoossens.modernizer from 1.9.2 to 1.9.3 (JabRef#11524)

# Conflicts:
#	src/main/resources/csl-styles
  • Loading branch information
Siedlerchr committed Jul 23, 2024
2 parents 7ae7b8e + fed6bde commit d1731b4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deployment-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ jobs:
submodules: 'true'
show-progress: 'false'
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v1.2.0
uses: gittools/actions/gitversion/setup@v2.0.0
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v1.2.0
uses: gittools/actions/gitversion/execute@v2.0.0
- name: Setup JDK
uses: actions/setup-java@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deployment-jdk-ea.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ jobs:
packages: pigz
version: 1.0
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v1.2.0
uses: gittools/actions/gitversion/setup@v2.0.0
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v1.2.0
uses: gittools/actions/gitversion/execute@v2.0.0

# JDK
- name: 'Set up JDK ${{ matrix.jdk }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ jobs:
packages: pigz
version: 1.0
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v1.2.0
uses: gittools/actions/gitversion/setup@v2.0.0
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v1.2.0
uses: gittools/actions/gitversion/execute@v2.0.0
- name: Setup JDK
uses: actions/setup-java@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.jabref.build.xjc.XjcTask
plugins {
id 'application'

id 'com.github.andygoossens.modernizer' version '1.9.2'
id 'com.github.andygoossens.modernizer' version '1.9.3'

id 'me.champeau.jmh' version '0.7.2'

Expand All @@ -29,7 +29,7 @@ plugins {

id 'idea'

id 'org.openrewrite.rewrite' version '6.16.3'
id 'org.openrewrite.rewrite' version '6.16.4'
}

// Enable following for debugging
Expand Down Expand Up @@ -166,7 +166,7 @@ dependencies {
implementation "org.apache.lucene:lucene-highlighter:$luceneVersion"

implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.11.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.15.0'
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.12.0'
implementation 'commons-logging:commons-logging:1.3.3'
implementation 'com.h2database:h2-mvstore:2.2.224'
Expand Down Expand Up @@ -297,7 +297,7 @@ dependencies {
// implementation 'org.glassfish.jersey.media:jersey-media-json-gson:3.1.1'

// Because of GraalVM quirks, we need to ship that. See https://github.com/jspecify/jspecify/issues/389#issuecomment-1661130973 for details
implementation 'org.jspecify:jspecify:0.3.0'
implementation 'org.jspecify:jspecify:1.0.0'

// parse plist files
implementation 'com.googlecode.plist:dd-plist:1.28'
Expand Down

0 comments on commit d1731b4

Please sign in to comment.