Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/maven/org.apache.maven.plugin-too…
Browse files Browse the repository at this point in the history
…ls-maven-plugin-annotations-3.13.0
  • Loading branch information
Kobee1203 authored Sep 15, 2024
2 parents 45ee6ba + 061f972 commit 479e1ee
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: 'Checkout repository on branch: ${{ github.REF }}'
uses: actions/checkout@v3
uses: actions/checkout@v4
env:
GIT_TRACE: 1
GIT_CURL_VERBOSE: 1
Expand All @@ -22,13 +22,13 @@ jobs:
git fetch --prune --unshallow
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11

- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: 'Checkout repository on branch: ${{ github.REF }}'
uses: actions/checkout@v3
uses: actions/checkout@v4
env:
GIT_TRACE: 1
GIT_CURL_VERBOSE: 1
Expand All @@ -22,19 +22,19 @@ jobs:
git fetch --prune --unshallow
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11

- name: Cache SonarCloud packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ jobs:

steps:
- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
- name: List keys
run: gpg -K

- name: 'Checkout repository on branch: ${{ github.REF }}'
uses: actions/checkout@v3
uses: actions/checkout@v4
env:
GIT_TRACE: 1
GIT_CURL_VERBOSE: 1
with:
ref: ${{ github.REF }}

- name: Set up JDK 11 and Maven Central Repository configuration
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
Expand All @@ -31,21 +31,21 @@ jobs:
GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}

- name: 'Checkout repository on branch: ${{ github.REF }}'
uses: actions/checkout@v3
uses: actions/checkout@v4
env:
GIT_TRACE: 1
GIT_CURL_VERBOSE: 1
with:
ref: ${{ github.REF }}

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11

- name: Create Maven Settings
uses: whelk-io/maven-settings-xml-action@v21
uses: whelk-io/maven-settings-xml-action@v22
with:
servers: '[
{
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
<configuration>
<!-- ! currently needed to run integration tests. -->
<systemProperties>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@

<!-- Dependencies -->
<lombok.version>1.18.26</lombok.version>
<logback-classic.version>1.4.7</logback-classic.version>
<logback-classic.version>1.4.12</logback-classic.version>
<jackson.version>2.15.0</jackson.version>
<handlebars-helpers.version>4.3.1</handlebars-helpers.version>
<commons-cli.version>1.5.0</commons-cli.version>

<!-- Test Dependencies -->
<junit-jupiter-engine.version>5.9.2</junit-jupiter-engine.version>
<junit-jupiter-engine.version>5.9.3</junit-jupiter-engine.version>
<assertj-core.version>3.24.2</assertj-core.version>
<mockito-junit-jupiter.version>5.3.1</mockito-junit-jupiter.version>
<equalsverifier.version>3.14.1</equalsverifier.version>
Expand All @@ -76,11 +76,11 @@

<!-- Plugins -->
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-release-plugin.version>3.0.0</maven-release-plugin.version>
<maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
Expand Down

0 comments on commit 479e1ee

Please sign in to comment.