Skip to content

Commit 41d1cef

Browse files
committed
Upped versions.
1 parent e930521 commit 41d1cef

4 files changed

Lines changed: 42 additions & 43 deletions

File tree

.github/workflows/maven.yml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,28 @@ jobs:
1313
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
1414
steps:
1515
- uses: actions/checkout@v2
16-
- uses: actions/setup-java@v2
17-
with:
18-
distribution: 'adopt'
19-
java-version: 8
20-
- uses: s4u/maven-settings-action@v2
21-
with:
22-
servers: '[{"id": "vpro-ossrh", "username": "vpro", "password": "${{secrets.SONATYPE_PASSWORD}}"}]'
23-
- uses: crazy-max/ghaction-import-gpg@v3
16+
- uses: actions/setup-java@v3
2417
with:
18+
distribution: 'temurin'
19+
java-version: 11
20+
server-id: vpro-ossrh
21+
server-username: SONATYPE_USERNAME
22+
server-password: SONATYPE_PASSWORD
2523
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
26-
passphrase: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
27-
- uses: actions/cache@v1
28-
with:
29-
path: ~/.m2/repository
30-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
31-
restore-keys: |
32-
${{ runner.os }}-maven-
24+
gpg-passphrase: GPG_SECRET_KEY_PASSPHRASE
25+
cache: maven
3326
- name: Build with Maven
3427
run: mvn -B -Pdeploy,ossrh -U deploy
28+
env:
29+
SONATYPE_USERNAME: vpro
30+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
31+
GPG_SECRET_KEY_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
3532
#continue-on-error: true
36-
- name: Publish Test Report
37-
uses: scacap/action-surefire-report@v1
38-
if: ${{ success() || failure()}}
3933
- name: Publish to codecov
40-
run: bash <(curl -s https://codecov.io/bash)
34+
uses: codecov/codecov-action@v3
35+
continue-on-error: true
4136
if: github.ref == 'refs/heads/main'
42-
43-
44-
37+
- name: Publish Unit Test Results
38+
uses: EnricoMi/publish-unit-test-result-action@v2.3.0
39+
if: ${{ success() || failure()}}
40+

.github/workflows/pull-request.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ jobs:
1212
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
1313
steps:
1414
- uses: actions/checkout@v2
15-
- uses: actions/setup-java@v2
15+
- uses: actions/setup-java@v3
1616
with:
17-
distribution: 'adopt'
18-
java-version: 8
17+
distribution: 'temurin'
18+
java-version: 11
19+
cache: maven
1920
- name: Build with Maven
2021
run: mvn -B clean test
21-
- name: Publish Test Report
22-
uses: scacap/action-surefire-report@v1
22+
- name: Publish Unit Test Results
23+
uses: EnricoMi/publish-unit-test-result-action@v2.3.0
2324
if: ${{ success() || failure()}}
24-
25+

.github/workflows/release.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@ jobs:
1010
if: startsWith(github.ref, 'refs/heads/REL-')
1111
steps:
1212
- uses: actions/checkout@v2
13-
- uses: actions/setup-java@v2
14-
with:
15-
distribution: 'adopt'
16-
java-version: 8
17-
- name: Create settings.xml
18-
uses: s4u/maven-settings-action@v2
19-
with:
20-
servers: '[{"id": "vpro-ossrh", "username": "vpro", "password": "${{secrets.SONATYPE_PASSWORD}}"}]'
21-
- uses: crazy-max/ghaction-import-gpg@v3
13+
- uses: actions/setup-java@v3
2214
with:
15+
distribution: 'temurin'
16+
java-version: 11
17+
server-id: vpro-ossrh
18+
server-username: SONATYPE_USERNAME
19+
server-password: SONATYPE_PASSWORD
2320
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
24-
passphrase: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
21+
gpg-passphrase: GPG_SECRET_KEY_PASSPHRASE
22+
cache: maven
2523
- uses: oleksiyrudenko/gha-git-credentials@v2.1
2624
with:
2725
global: true
@@ -30,5 +28,9 @@ jobs:
3028
token: '${{ secrets.GITHUB_TOKEN }}'
3129
- name: Release
3230
run: mvn -Pdeploy,ossrh --batch-mode -Darguments=-DskipTests release:prepare release:perform
31+
env:
32+
SONATYPE_USERNAME: vpro
33+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
34+
GPG_SECRET_KEY_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
3335

3436

pom.xml

Lines changed: 5 additions & 5 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.14.1</jackson2.version>
57-
<spring.version>5.3.24</spring.version>
56+
<jackson2.version>2.14.2</jackson2.version>
57+
<spring.version>5.3.25</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>3.0.1</vpro.shared.version>
61+
<vpro.shared.version>3.1.0</vpro.shared.version>
6262
<slf4j.version>1.7.30</slf4j.version>
6363
<lombok.version>1.18.24</lombok.version>
64-
<assertj.version>3.23.1</assertj.version>
65-
<junit.version>5.9.1</junit.version>
64+
<assertj.version>3.24.2</assertj.version>
65+
<junit.version>5.9.2</junit.version>
6666
</properties>
6767

6868
<dependencyManagement>

0 commit comments

Comments
 (0)