Skip to content

Commit 6ee9de3

Browse files
authored
Merge branch 'main-1.x' into dependabot/github_actions/main-1.x/codecov/codecov-action-6.0.0
2 parents 7fb9b78 + 0c3f918 commit 6ee9de3

6 files changed

Lines changed: 32 additions & 32 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
java-version: 17
4949

5050
- name: Checkout repository
51-
uses: actions/checkout@v5
51+
uses: actions/checkout@v6
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@v3
55+
uses: github/codeql-action/init@v4
5656
with:
5757
languages: ${{ matrix.language }}
5858
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
6363
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6464
# If this step fails, then you should remove it and run the build manually (see below)
6565
- name: Autobuild
66-
uses: github/codeql-action/autobuild@v3
66+
uses: github/codeql-action/autobuild@v4
6767

6868
# ℹ️ Command-line programs to run using the OS shell.
6969
# 📚 https://git.io/JvXDl
@@ -77,4 +77,4 @@ jobs:
7777
# make release
7878

7979
- name: Perform CodeQL Analysis
80-
uses: github/codeql-action/analyze@v3
80+
uses: github/codeql-action/analyze@v4

.github/workflows/create_release_tag_and_pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
create_release_tag:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 0
1616

@@ -35,7 +35,7 @@ jobs:
3535
mvn -B versions:set versions:commit -DremoveSnapshot
3636
echo "version=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
3737
38-
- uses: stefanzweifel/git-auto-commit-action@v6
38+
- uses: stefanzweifel/git-auto-commit-action@v7
3939
with:
4040
commit_message: "Prepare release (${{ github.actor }}): github-api-${{ steps.release.outputs.version }}"
4141
tagging_message: 'github-api-${{ steps.release.outputs.version }}'
@@ -45,7 +45,7 @@ jobs:
4545
run: |
4646
mvn versions:set versions:commit -DnextSnapshot
4747
48-
- uses: stefanzweifel/git-auto-commit-action@v6
48+
- uses: stefanzweifel/git-auto-commit-action@v7
4949
with:
5050
commit_message: "Prepare for next development iteration"
5151
branch: staging/${{ github.ref_name }}

.github/workflows/maven-build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: true
2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
- name: Set up JDK
3030
uses: actions/setup-java@v5
3131
with:
@@ -36,7 +36,7 @@ jobs:
3636
env:
3737
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
3838
run: mvn -B clean install -DskipTests --file pom.xml
39-
- uses: actions/upload-artifact@v4
39+
- uses: actions/upload-artifact@v7
4040
with:
4141
name: maven-target-directory
4242
path: target/
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
steps:
50-
- uses: actions/checkout@v5
50+
- uses: actions/checkout@v6
5151
- name: Set up JDK
5252
uses: actions/setup-java@v5
5353
with:
@@ -71,7 +71,7 @@ jobs:
7171
os: [ ubuntu, windows ]
7272
java: [ 17, 21 ]
7373
steps:
74-
- uses: actions/checkout@v5
74+
- uses: actions/checkout@v6
7575
- name: Set up JDK
7676
uses: actions/setup-java@v5
7777
with:
@@ -91,7 +91,7 @@ jobs:
9191
run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
9292
- name: Save coverage data
9393
if: matrix.os == 'ubuntu' && matrix.java == '17'
94-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v7
9595
with:
9696
name: maven-test-target-directory
9797
path: target/
@@ -101,8 +101,8 @@ jobs:
101101
needs: test
102102
runs-on: ubuntu-latest
103103
steps:
104-
- uses: actions/checkout@v5
105-
- uses: actions/download-artifact@v5
104+
- uses: actions/checkout@v6
105+
- uses: actions/download-artifact@v8
106106
with:
107107
name: maven-test-target-directory
108108
path: target
@@ -119,13 +119,13 @@ jobs:
119119
needs: build
120120
runs-on: ubuntu-latest
121121
steps:
122-
- uses: actions/checkout@v4
123-
- uses: actions/download-artifact@v4
122+
- uses: actions/checkout@v6
123+
- uses: actions/download-artifact@v8
124124
with:
125125
name: maven-target-directory
126126
path: target
127127
- name: Set up JDK
128-
uses: actions/setup-java@v4
128+
uses: actions/setup-java@v5
129129
with:
130130
java-version: 8
131131
distribution: 'temurin'
@@ -138,8 +138,8 @@ jobs:
138138
needs: build
139139
runs-on: ubuntu-latest
140140
steps:
141-
- uses: actions/checkout@v5
142-
- uses: actions/download-artifact@v5
141+
- uses: actions/checkout@v6
142+
- uses: actions/download-artifact@v8
143143
with:
144144
name: maven-target-directory
145145
path: target

.github/workflows/publish_release_branch.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
- name: Set up Maven Central Repository
1717
uses: actions/setup-java@v5
1818
with:
@@ -25,7 +25,7 @@ jobs:
2525
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
2626
run: mvn -B clean install site -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
2727

28-
- uses: actions/upload-artifact@v4
28+
- uses: actions/upload-artifact@v7
2929
with:
3030
name: maven-release-target-directory
3131
path: target/
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-latest
3636
needs: build
3737
steps:
38-
- uses: actions/checkout@v5
38+
- uses: actions/checkout@v6
3939
- name: Set up Maven Central Repository
4040
uses: actions/setup-java@v5
4141
with:
@@ -61,7 +61,7 @@ jobs:
6161
needs: build
6262
if: ${{ github.ref == 'refs/heads/release/v2.x' }}
6363
steps:
64-
- uses: actions/checkout@v5
64+
- uses: actions/checkout@v6
6565
with:
6666
fetch-depth: 0
6767

@@ -70,7 +70,7 @@ jobs:
7070
run: |
7171
echo "version=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
7272
73-
- uses: actions/download-artifact@v5
73+
- uses: actions/download-artifact@v8
7474
with:
7575
name: maven-release-target-directory
7676
path: target
@@ -82,7 +82,7 @@ jobs:
8282
cp -r ./target/site/* ./
8383
8484
- name: Publish GH Pages
85-
uses: stefanzweifel/git-auto-commit-action@v6
85+
uses: stefanzweifel/git-auto-commit-action@v7
8686
with:
8787
commit_message: "Release (${{ github.actor }}): v${{ steps.release.outputs.version }}"
8888
branch: gh-pages

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Release Drafter
20-
uses: release-drafter/release-drafter@v6
20+
uses: release-drafter/release-drafter@v7
2121
env:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<extension>
6060
<groupId>org.apache.maven.scm</groupId>
6161
<artifactId>maven-scm-provider-gitexe</artifactId>
62-
<version>2.1.0</version>
62+
<version>2.2.1</version>
6363
</extension>
6464
<extension>
6565
<groupId>org.apache.maven.scm</groupId>
@@ -97,7 +97,7 @@
9797
</plugin>
9898
<plugin>
9999
<artifactId>maven-surefire-plugin</artifactId>
100-
<version>3.5.2</version>
100+
<version>3.5.5</version>
101101
<configuration>
102102
<!-- SUREFIRE-1226 workaround -->
103103
<trimStackTrace>false</trimStackTrace>
@@ -111,7 +111,7 @@
111111
<plugin>
112112
<groupId>org.apache.maven.plugins</groupId>
113113
<artifactId>maven-gpg-plugin</artifactId>
114-
<version>3.2.7</version>
114+
<version>3.2.8</version>
115115
</plugin>
116116
<plugin>
117117
<groupId>org.jacoco</groupId>
@@ -273,7 +273,7 @@
273273
<plugin>
274274
<groupId>org.apache.maven.plugins</groupId>
275275
<artifactId>maven-release-plugin</artifactId>
276-
<version>3.1.1</version>
276+
<version>3.3.1</version>
277277
<configuration>
278278
<autoVersionSubmodules>true</autoVersionSubmodules>
279279
<useReleaseProfile>false</useReleaseProfile>
@@ -478,7 +478,7 @@
478478
<dependency>
479479
<groupId>com.fasterxml.jackson</groupId>
480480
<artifactId>jackson-bom</artifactId>
481-
<version>2.20.0</version>
481+
<version>2.21.2</version>
482482
<scope>import</scope>
483483
<type>pom</type>
484484
</dependency>
@@ -563,7 +563,7 @@
563563
<dependency>
564564
<groupId>com.infradna.tool</groupId>
565565
<artifactId>bridge-method-annotation</artifactId>
566-
<version>1.30</version>
566+
<version>1.31</version>
567567
<optional>true</optional>
568568
</dependency>
569569
<!-- for stapler-jetty -->

0 commit comments

Comments
 (0)