Skip to content

Commit

Permalink
Merge pull request #1456 from gsmet/3.15-backports
Browse files Browse the repository at this point in the history
3.15 backports
  • Loading branch information
gsmet authored Sep 24, 2024
2 parents 1cf0b6e + 8ccb9bb commit 611a1ac
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 19 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/build-pr-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ on:
pull_request:
branches:
- development
- "2.2"
- "2.7"
- "2.13"
- "[0-9]+.[0-9]+"

jobs:
# This is a hack to work around a GitHub API limitation:
Expand All @@ -24,7 +22,7 @@ jobs:
run: |
echo -n ${{ github.event.number }} > pull-request-number
- name: Upload pull request number
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: pull-request-number-${{ github.event.number }}
path: pull-request-number
Expand All @@ -37,15 +35,15 @@ jobs:
matrix:
java: [ 17 ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Get Date
id: get-date
run: |
echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
shell: bash
- name: Cache Maven Repository
id: cache-maven
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
# refresh cache every month to avoid unlimited growth
Expand All @@ -58,7 +56,7 @@ jobs:
exit 1
fi
- name: Install JDK ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{ matrix.java }}
Expand All @@ -74,7 +72,7 @@ jobs:
shell: bash
run: rm -rf ~/.m2/repository/org/acme
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Build - JDK ${{ matrix.java }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/native-build-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ jobs:
shell: bash
- name: Cache Maven Repository
id: cache-maven
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
# refresh cache every month to avoid unlimited growth
key: q2maven-native-${{ steps.get-date.outputs.date }}

- name: Install JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
needs: [build-with-native]
if: "always() && github.repository == 'quarkusio/quarkus-quickstarts'"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.ref || 'development' }}
- name: Report
Expand Down
2 changes: 1 addition & 1 deletion amazon-dynamodb-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
<awssdk.testcontainers.version>1.12.57</awssdk.testcontainers.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion amazon-kms-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion amazon-s3-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion amazon-ses-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion amazon-sns-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion amazon-sqs-connector-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion amazon-sqs-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion amazon-ssm-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<quarkus-amazon-services.version>2.16.2</quarkus-amazon-services.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
</properties>

<dependencyManagement>
Expand Down

0 comments on commit 611a1ac

Please sign in to comment.