Skip to content

Commit 7052dcf

Browse files
committed
Just upped some dependencies.
1 parent f6afe14 commit 7052dcf

5 files changed

Lines changed: 32 additions & 33 deletions

File tree

.github/workflows/branch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
if: github.ref == 'refs/heads/main'
99
env:
10-
MAVEN_OPTS: '-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
10+
MAVEN_ARGS: '--no-transfer-progress'
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: oleksiyrudenko/gha-git-credentials@v2.1
12+
- uses: actions/checkout@v6
13+
- uses: oleksiyrudenko/gha-git-credentials@v2-latest
1414
with:
1515
global: true
1616
name: 'github $GITHUB_ACTOR'

.github/workflows/maven.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ jobs:
1212
env:
1313
MAVEN_ARGS: '--no-transfer-progress'
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-java@v4
15+
- uses: actions/checkout@v6
16+
- uses: actions/setup-java@v5
1717
with:
1818
distribution: 'temurin'
19-
java-version: 11
19+
java-version: 17
2020
server-id: central
2121
server-username: CENTRAL_USERNAME
2222
server-password: CENTRAL_PASSWORD
2323
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
2424
cache: maven
2525
- name: Build with Maven
26-
run: mvn -B -Pdeploy,ossrh -U deploy
26+
run: mvn -B -Pdeploy -U deploy
2727
env:
2828
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
2929
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
3030
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
3131
#continue-on-error: true
3232
- name: Publish to codecov
33-
uses: codecov/codecov-action@v4
33+
uses: codecov/codecov-action@v5
3434
continue-on-error: true
3535
if: github.ref == 'refs/heads/main'
3636
- name: Publish Unit Test Results

.github/workflows/pull-request.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ jobs:
99

1010
runs-on: ubuntu-latest
1111
env:
12-
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
12+
MAVEN_ARGS: '--no-transfer-progress'
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: actions/setup-java@v3
14+
- uses: actions/checkout@v6
15+
- uses: actions/setup-java@v5
1616
with:
1717
distribution: 'temurin'
18-
java-version: 11
18+
java-version: 17
1919
cache: maven
2020
- name: Build with Maven
2121
run: mvn -B clean test
2222
- name: Publish Unit Test Results
23-
uses: EnricoMi/publish-unit-test-result-action@v2.3.0
23+
uses: EnricoMi/publish-unit-test-result-action@v2
2424
if: ${{ success() || failure()}}
2525

.github/workflows/release.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,27 @@ jobs:
99
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
1010
if: startsWith(github.ref, 'refs/heads/REL-')
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-java@v3
12+
- uses: actions/checkout@v6
13+
- uses: actions/setup-java@v5
1414
with:
1515
distribution: 'temurin'
16-
java-version: 11
17-
server-id: vpro-ossrh
18-
server-username: SONATYPE_USERNAME
19-
server-password: SONATYPE_PASSWORD
16+
java-version: 17
17+
server-id: central
18+
server-username: CENTRAL_USERNAME
19+
server-password: CENTRAL_PASSWORD
2020
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
21-
gpg-passphrase: GPG_SECRET_KEY_PASSPHRASE
2221
cache: maven
23-
- uses: oleksiyrudenko/gha-git-credentials@v2.1
22+
- uses: oleksiyrudenko/gha-git-credentials@v2-latest
2423
with:
2524
global: true
2625
name: 'github $GITHUB_ACTOR'
2726
email: 'digitaal-techniek@vpro.nl'
2827
token: '${{ secrets.GITHUB_TOKEN }}'
2928
- name: Release
30-
run: mvn -Pdeploy,ossrh --batch-mode -Darguments=-DskipTests release:prepare release:perform
29+
run: mvn -Pdeploy --batch-mode -Darguments=-DskipTests release:prepare release:perform
3130
env:
32-
SONATYPE_USERNAME: vpro
33-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
34-
GPG_SECRET_KEY_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
31+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
32+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
33+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
3534

3635

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@
5353

5454
<properties>
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56-
<jackson2.version>2.19.1</jackson2.version>
57-
<spring.version>6.0.0</spring.version>
56+
<jackson2.version>2.20.1</jackson2.version>
57+
<spring.version>6.2.14</spring.version>
5858
<!-- TODO, drop spring dependency, I don't see the point. This is a straight forward rest-client,
5959
why would we tolerate a spring dependency
6060
-->
61-
<vpro.shared.version>5.10.0</vpro.shared.version>
61+
<vpro.shared.version>5.13.1</vpro.shared.version>
6262
<slf4j.version>2.0.17</slf4j.version>
63-
<lombok.version>1.18.38</lombok.version>
63+
<lombok.version>1.18.42</lombok.version>
6464
<assertj.version>3.24.2</assertj.version>
65-
<junit.version>5.9.2</junit.version>
65+
<junit.version>6.0.1</junit.version>
6666
</properties>
6767

6868
<dependencyManagement>
@@ -161,8 +161,8 @@
161161
<artifactId>maven-compiler-plugin</artifactId>
162162
<version>3.14.0</version>
163163
<configuration>
164-
<source>11</source>
165-
<target>11</target>
164+
<source>17</source>
165+
<target>17</target>
166166
</configuration>
167167
</plugin>
168168
<plugin>
@@ -209,7 +209,7 @@
209209
<plugin>
210210
<groupId>org.sonatype.central</groupId>
211211
<artifactId>central-publishing-maven-plugin</artifactId>
212-
<version>0.8.0</version>
212+
<version>0.9.0</version>
213213
<extensions>true</extensions>
214214
<configuration>
215215
<publishingServerId>central</publishingServerId>

0 commit comments

Comments
 (0)