Skip to content

Commit 611a1ac

Browse files
authored
Merge pull request #1456 from gsmet/3.15-backports
3.15 backports
2 parents 1cf0b6e + 8ccb9bb commit 611a1ac

File tree

10 files changed

+17
-19
lines changed

10 files changed

+17
-19
lines changed

.github/workflows/build-pr-development.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ on:
44
pull_request:
55
branches:
66
- development
7-
- "2.2"
8-
- "2.7"
9-
- "2.13"
7+
- "[0-9]+.[0-9]+"
108

119
jobs:
1210
# This is a hack to work around a GitHub API limitation:
@@ -24,7 +22,7 @@ jobs:
2422
run: |
2523
echo -n ${{ github.event.number }} > pull-request-number
2624
- name: Upload pull request number
27-
uses: actions/upload-artifact@v2
25+
uses: actions/upload-artifact@v4
2826
with:
2927
name: pull-request-number-${{ github.event.number }}
3028
path: pull-request-number
@@ -37,15 +35,15 @@ jobs:
3735
matrix:
3836
java: [ 17 ]
3937
steps:
40-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v4
4139
- name: Get Date
4240
id: get-date
4341
run: |
4442
echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
4543
shell: bash
4644
- name: Cache Maven Repository
4745
id: cache-maven
48-
uses: actions/cache@v2
46+
uses: actions/cache@v4
4947
with:
5048
path: ~/.m2/repository
5149
# refresh cache every month to avoid unlimited growth
@@ -58,7 +56,7 @@ jobs:
5856
exit 1
5957
fi
6058
- name: Install JDK ${{ matrix.java }}
61-
uses: actions/setup-java@v2
59+
uses: actions/setup-java@v4
6260
with:
6361
distribution: temurin
6462
java-version: ${{ matrix.java }}
@@ -74,7 +72,7 @@ jobs:
7472
shell: bash
7573
run: rm -rf ~/.m2/repository/org/acme
7674
- name: Upload build reports (if build failed)
77-
uses: actions/upload-artifact@v2
75+
uses: actions/upload-artifact@v4
7876
if: ${{ failure() || cancelled() }}
7977
with:
8078
name: "build-reports-Build - JDK ${{ matrix.java }}"

.github/workflows/native-build-development.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
shell: bash
4848
- name: Cache Maven Repository
4949
id: cache-maven
50-
uses: actions/cache@v2
50+
uses: actions/cache@v4
5151
with:
5252
path: ~/.m2/repository
5353
# refresh cache every month to avoid unlimited growth
5454
key: q2maven-native-${{ steps.get-date.outputs.date }}
5555

5656
- name: Install JDK 17
57-
uses: actions/setup-java@v2
57+
uses: actions/setup-java@v4
5858
with:
5959
distribution: temurin
6060
java-version: 17
@@ -117,7 +117,7 @@ jobs:
117117
needs: [build-with-native]
118118
if: "always() && github.repository == 'quarkusio/quarkus-quickstarts'"
119119
steps:
120-
- uses: actions/checkout@v2
120+
- uses: actions/checkout@v4
121121
with:
122122
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.ref || 'development' }}
123123
- name: Report

amazon-dynamodb-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>17</maven.compiler.source>
1818
<maven.compiler.target>17</maven.compiler.target>
19-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
19+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
2020
<awssdk.testcontainers.version>1.12.57</awssdk.testcontainers.version>
2121
</properties>
2222

amazon-kms-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>17</maven.compiler.source>
1818
<maven.compiler.target>17</maven.compiler.target>
19-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
19+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
2020
</properties>
2121

2222
<dependencyManagement>

amazon-s3-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>17</maven.compiler.source>
1818
<maven.compiler.target>17</maven.compiler.target>
19-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
19+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
2020
</properties>
2121

2222
<dependencyManagement>

amazon-ses-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>17</maven.compiler.source>
1818
<maven.compiler.target>17</maven.compiler.target>
19-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
19+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
2020
</properties>
2121

2222
<dependencyManagement>

amazon-sns-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>17</maven.compiler.source>
1818
<maven.compiler.target>17</maven.compiler.target>
19-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
19+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
2020
</properties>
2121

2222
<dependencyManagement>

amazon-sqs-connector-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<maven.compiler.source>17</maven.compiler.source>
1515
<maven.compiler.target>17</maven.compiler.target>
16-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
16+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
1717
</properties>
1818
<dependencyManagement>
1919
<dependencies>

amazon-sqs-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>17</maven.compiler.source>
1818
<maven.compiler.target>17</maven.compiler.target>
19-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
19+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
2020
</properties>
2121

2222
<dependencyManagement>

amazon-ssm-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>17</maven.compiler.source>
1818
<maven.compiler.target>17</maven.compiler.target>
19-
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
19+
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
2020
</properties>
2121

2222
<dependencyManagement>

0 commit comments

Comments
 (0)