From 21a467262a75f993630e15997ed03f59d74dbfc7 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Sat, 6 Apr 2024 20:07:57 +0200 Subject: [PATCH 001/149] ci: projectVersion=4.6.0-SNAPSHOT [ci skip] --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 88961ccbd5..42dd8b424d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.5.1-SNAPSHOT +projectVersion=4.6.0-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS From aeeadc62b04a3510bbefc85bde785dee4b5e2a97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:53:24 +0200 Subject: [PATCH 002/149] fix(deps): update dependency io.micronaut:micronaut-core-bom to v4.4.1 (#2106) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 416dfa38e1..fc8872d931 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -micronaut = "4.4.0" +micronaut = "4.4.1" micronaut-docs = "2.0.0" micronaut-test = "4.2.0" groovy = "4.0.15" From 651af0855eb5504a6610431c4245a00b52c4369e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:53:36 +0200 Subject: [PATCH 003/149] fix(deps): update dependency io.micronaut.gradle:micronaut-gradle-plugin to v4.3.6 (#2105) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc8872d931..af1867c899 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,7 +43,7 @@ graal = "23.1.2" kotlin = "1.9.23" # Micronaut -micronaut-gradle-plugin = "4.3.5" +micronaut-gradle-plugin = "4.3.6" [libraries] # Core From cbf895a71e820fe1e64daaedd1b8f33a9e048b46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:53:50 +0200 Subject: [PATCH 004/149] fix(deps): update aws-java-sdk monorepo to v1.12.700 (#2104) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af1867c899..58c2ceebca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.1.0" micronaut-validation = "4.4.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.691' +managed-aws-java-sdk-v1 = '1.12.700' managed-aws-java-sdk-v2 = '2.24.10' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.4' From b557d73554d053d258927889a8ac60c8aaafeff2 Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:54:06 +0200 Subject: [PATCH 005/149] Update common files (#2103) --- gradlew.bat | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f13..25da30dbde 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail From 6dd2a6d1f8f9491f293dc571347c2161b9b010c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:52:49 +0200 Subject: [PATCH 006/149] chore(deps): update gradle/wrapper-validation-action action to v3 (#2128) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/central-sync.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/central-sync.yml b/.github/workflows/central-sync.yml index dd1f3514a0..23b80ba2e4 100644 --- a/.github/workflows/central-sync.yml +++ b/.github/workflows/central-sync.yml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v4 with: ref: v${{ github.event.inputs.release_version }} - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/wrapper-validation-action@v3 - name: Set up JDK uses: actions/setup-java@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a4bd1cb3c..065ee56205 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 with: token: ${{ secrets.GH_TOKEN }} - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/wrapper-validation-action@v3 - name: Set up JDK uses: actions/setup-java@v4 with: From 2d2ed362fea64c0f221ef2aa94f462a8264d95f5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:53:06 +0200 Subject: [PATCH 007/149] fix(deps): update dependency io.micronaut.views:micronaut-views-bom to v5.4.0 (#2127) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 58c2ceebca..b529e0ec1a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ micronaut-security = "4.6.9" micronaut-serde = "2.8.2" micronaut-servlet = "4.6.0" micronaut-test-resources="2.4.0" -micronaut-views = "5.1.0" +micronaut-views = "5.4.0" micronaut-validation = "4.4.0" managed-alexa-ask-sdk = "2.86.0" From 7470e59f51bcca089f7071eddc2cba306e37dd16 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:53:52 +0200 Subject: [PATCH 008/149] fix(deps): update dependency io.micronaut.testresources:micronaut-test-resources-bom to v2.5.2 (#2126) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sergio del Amo --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b529e0ec1a..5c0566d18b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ micronaut-reactor = "3.2.1" micronaut-security = "4.6.9" micronaut-serde = "2.8.2" micronaut-servlet = "4.6.0" -micronaut-test-resources="2.4.0" +micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" micronaut-validation = "4.4.0" From 8c826d51ef8a899618f09b45c1085b470955acbe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:54:06 +0200 Subject: [PATCH 009/149] fix(deps): update dependency io.micronaut.security:micronaut-security-bom to v4.8.0 (#2122) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c0566d18b..16ffec58dd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ micronaut-logging = "1.2.2" micronaut-mongodb = "5.2.0" micronaut-reactor = "3.2.1" -micronaut-security = "4.6.9" +micronaut-security = "4.8.0" micronaut-serde = "2.8.2" micronaut-servlet = "4.6.0" micronaut-test-resources="2.5.2" From d422945952036441b39165a7ddcd04c6e4f23f59 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:54:20 +0200 Subject: [PATCH 010/149] fix(deps): update dependency io.micronaut.reactor:micronaut-reactor-bom to v3.3.0 (#2120) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 16ffec58dd..7b884be90c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ micronaut-discovery = "4.2.0" micronaut-groovy = "4.2.0" micronaut-logging = "1.2.2" micronaut-mongodb = "5.2.0" -micronaut-reactor = "3.2.1" +micronaut-reactor = "3.3.0" micronaut-security = "4.8.0" micronaut-serde = "2.8.2" From a392f36ed82ff5f270dd72fe02d286d38479c699 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:56:36 +0200 Subject: [PATCH 011/149] fix(deps): update dependency io.micronaut.mongodb:micronaut-mongo-bom to v5.3.0 (#2119) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7b884be90c..c4557762fb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ logback-json-classic = '0.1.5' micronaut-discovery = "4.2.0" micronaut-groovy = "4.2.0" micronaut-logging = "1.2.2" -micronaut-mongodb = "5.2.0" +micronaut-mongodb = "5.3.0" micronaut-reactor = "3.3.0" micronaut-security = "4.8.0" From 35e7c9098a5b744d26c578ee1cb853414f09c648 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:56:51 +0200 Subject: [PATCH 012/149] chore(deps): update plugin io.micronaut.build.shared.settings to v6.7.1 (#2115) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index cbba64335e..b8075ace2c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "6.7.0" + id("io.micronaut.build.shared.settings") version "6.7.1" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 6c6cc5514f1f9aa414e441e1049f7e54023df615 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:57:23 +0200 Subject: [PATCH 013/149] fix(deps): update dependency io.micronaut.groovy:micronaut-groovy-bom to v4.3.0 (#2118) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c4557762fb..5f5c697eb5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ jetty = '11.0.20' logback-json-classic = '0.1.5' micronaut-discovery = "4.2.0" -micronaut-groovy = "4.2.0" +micronaut-groovy = "4.3.0" micronaut-logging = "1.2.2" micronaut-mongodb = "5.3.0" micronaut-reactor = "3.3.0" From 36935fb882bde6d82f3d989c8585baa0d23b6bef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:59:19 +0200 Subject: [PATCH 014/149] fix(deps): update dependency io.micronaut.discovery:micronaut-discovery-client-bom to v4.3.0 (#2117) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5f5c697eb5..aa2151886d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ fileupload = '0.0.6' jetty = '11.0.20' logback-json-classic = '0.1.5' -micronaut-discovery = "4.2.0" +micronaut-discovery = "4.3.0" micronaut-groovy = "4.3.0" micronaut-logging = "1.2.2" micronaut-mongodb = "5.3.0" From e71b2884c4c7673b8d0a4f04e114b4cdf4b990f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:59:45 +0200 Subject: [PATCH 015/149] fix(deps): update dependency com.amazonaws:aws-lambda-java-events to v3.11.5 (#2108) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa2151886d..8cd0dd63c3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.700' managed-aws-java-sdk-v2 = '2.24.10' managed-aws-lambda = '1.2.3' -managed-aws-lambda-events = '3.11.4' +managed-aws-lambda-events = '3.11.5' managed-aws-lambda-java-serialization = '1.1.5' aws-lambda-java-runtime-interface-client = '2.5.0' From c381f56c28cb62c847a70dc31587110f4c9f3f09 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:00:10 +0200 Subject: [PATCH 016/149] fix(deps): update aws-java-sdk monorepo to v1.12.733 (#2107) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8cd0dd63c3..7a1d782cb8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.4.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.700' +managed-aws-java-sdk-v1 = '1.12.733' managed-aws-java-sdk-v2 = '2.24.10' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.5' From 18bd8d94d157acf2696b284410c83d42513b9659 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:00:27 +0200 Subject: [PATCH 017/149] chore(deps): update gradle/gradle-build-action action to v3.3.2 (#2113) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index cffd16db98..78142de204 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -52,7 +52,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: "🔧 Setup Gradle" - uses: gradle/gradle-build-action@v3.1.0 + uses: gradle/gradle-build-action@v3.3.2 - name: "❓ Optional setup step" run: | From 06c6bd304e3f0cb8c7a6189fcdce3bcf04c9945a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:00:46 +0200 Subject: [PATCH 018/149] fix(deps): update dependency org.slf4j:jcl-over-slf4j to v2.0.13 (#2112) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a1d782cb8..c5684b5a10 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ aws-lambda-java-runtime-interface-client = '2.5.0' managed-aws-serverless-core = '1.9.3' micronaut-starter = "3.9.2" -slf4j = "2.0.12" +slf4j = "2.0.13" servlet-api = "2.5" javapoet = "1.13.0" From 851ec84d1535fcaad2b8bce1ac59c3dd23aea261 Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Fri, 31 May 2024 11:05:47 +0200 Subject: [PATCH 019/149] Update common files (#2111) From 3184322e65ea5b8d2b80b91e0df4fac00d97072d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:06:06 +0200 Subject: [PATCH 020/149] fix(deps): update kotlin monorepo to v1.9.24 (#2125) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c5684b5a10..781a522c7e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,7 +40,7 @@ javapoet = "1.13.0" # The following version should probably # be defined in Micronaut Graal but it's not shipped with a BOM yet graal = "23.1.2" -kotlin = "1.9.23" +kotlin = "1.9.24" # Micronaut micronaut-gradle-plugin = "4.3.6" From d0da12781b92215b318dde715e0b5e807b6d8197 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:25:37 +0200 Subject: [PATCH 021/149] fix(deps): update dependency io.micronaut:micronaut-core-bom to v4.5.0 (#2110) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 781a522c7e..92d4e0fa0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -micronaut = "4.4.1" +micronaut = "4.5.0" micronaut-docs = "2.0.0" micronaut-test = "4.2.0" groovy = "4.0.15" From 410c8c11401a8e0ba4b65c52da9bf3229c1b910d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:25:47 +0200 Subject: [PATCH 022/149] fix(deps): update dependency io.micronaut.serde:micronaut-serde-bom to v2.10.0 (#2123) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 92d4e0fa0b..a31a135d30 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ micronaut-mongodb = "5.3.0" micronaut-reactor = "3.3.0" micronaut-security = "4.8.0" -micronaut-serde = "2.8.2" +micronaut-serde = "2.10.0" micronaut-servlet = "4.6.0" micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" From dbc4d4357aa8bd26a2d0e4a51e8be88e5a18775b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:26:20 +0200 Subject: [PATCH 023/149] fix(deps): update dependency io.micronaut.servlet:micronaut-servlet-bom to v4.8.0 (#2124) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sergio del Amo --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a31a135d30..9bad2a7f2a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ micronaut-reactor = "3.3.0" micronaut-security = "4.8.0" micronaut-serde = "2.10.0" -micronaut-servlet = "4.6.0" +micronaut-servlet = "4.8.0" micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" micronaut-validation = "4.4.0" From 3c9a559598fdd099fd8fb5576d84e545e3745ee3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:26:32 +0200 Subject: [PATCH 024/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.25.63 (#2114) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9bad2a7f2a..ccd1fff34e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.4.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.733' -managed-aws-java-sdk-v2 = '2.24.10' +managed-aws-java-sdk-v2 = '2.25.63' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.5' managed-aws-lambda-java-serialization = '1.1.5' From 7b646000bbd36905474d30572537a65bd9fefacb Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Mon, 3 Jun 2024 14:15:20 +0200 Subject: [PATCH 025/149] Upgrade dependencies and fix build (#2131) * fix(deps): update dependency io.micronaut:micronaut-core-bom to v4.5.0 * bump dependencies / checkstyle --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: yawkat Co-authored-by: Graeme Rocher --- .../aws/sdk/v2/client/NettyClientSpec.groovy | 2 +- ...efaultServletToAwsProxyRequestAdapter.java | 21 ++++++++------- .../aws/proxy/ApiGatewayServletRequest.java | 27 ++++++++++++++++--- ...ApplicationLoadBalancerServletRequest.java | 4 +-- .../ApiGatewayProxyServletRequest.java | 5 ++-- .../APIGatewayV2HTTPEventServletRequest.java | 3 +-- .../client/aws/LocalFunctionInvokeSpec.groovy | 3 +++ gradle/libs.versions.toml | 16 +++++------ 8 files changed, 51 insertions(+), 30 deletions(-) diff --git a/aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/client/NettyClientSpec.groovy b/aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/client/NettyClientSpec.groovy index c4077d7902..06b39673e0 100644 --- a/aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/client/NettyClientSpec.groovy +++ b/aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/client/NettyClientSpec.groovy @@ -19,7 +19,7 @@ class NettyClientSpec extends ApplicationContextSpecification { then: client.configuration().maxConnections() == 123 - client.pools.proxyConfiguration == null + client.pools.proxyConfiguration } } diff --git a/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/DefaultServletToAwsProxyRequestAdapter.java b/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/DefaultServletToAwsProxyRequestAdapter.java index 7776007258..b8a7744881 100644 --- a/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/DefaultServletToAwsProxyRequestAdapter.java +++ b/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/DefaultServletToAwsProxyRequestAdapter.java @@ -48,6 +48,7 @@ public class DefaultServletToAwsProxyRequestAdapter implements ServletToAwsProxy public APIGatewayV2HTTPEvent createAwsProxyRequest(@NonNull HttpServletRequest request) { final boolean isBase64Encoded = true; return new APIGatewayV2HTTPEvent() { + private String body; @Override public Map getHeaders() { @@ -116,18 +117,20 @@ public boolean getIsBase64Encoded() { @Override public String getBody() { - HttpMethod httpMethod = HttpMethod.parse(request.getMethod()); - if (HttpMethod.permitsRequestBody(httpMethod)) { - try (InputStream requestBody = request.getInputStream()) { - byte[] data = requestBody.readAllBytes(); - if (isBase64Encoded) { - return Base64.getEncoder().encodeToString(data); + if (body == null) { + HttpMethod httpMethod = HttpMethod.parse(request.getMethod()); + if (HttpMethod.permitsRequestBody(httpMethod)) { + try (InputStream requestBody = request.getInputStream()) { + byte[] data = requestBody.readAllBytes(); + if (isBase64Encoded) { + body = Base64.getEncoder().encodeToString(data); + } + } catch (IOException e) { + // ignore } - } catch (IOException e) { - // ignore } } - return null; + return body; } }; } diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java index 4c47d9ebe5..8df0fa64a6 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java @@ -24,6 +24,7 @@ import io.micronaut.core.execution.ExecutionFlow; import io.micronaut.core.io.buffer.ByteBuffer; import io.micronaut.core.type.Argument; +import io.micronaut.core.util.ArrayUtils; import io.micronaut.core.util.CollectionUtils; import io.micronaut.core.util.StringUtils; import io.micronaut.core.util.SupplierUtil; @@ -34,6 +35,8 @@ import io.micronaut.http.MutableHttpHeaders; import io.micronaut.http.MutableHttpParameters; import io.micronaut.http.MutableHttpRequest; +import io.micronaut.http.ServerHttpRequest; +import io.micronaut.http.body.ByteBody; import io.micronaut.http.cookie.Cookie; import io.micronaut.http.cookie.Cookies; import io.micronaut.http.uri.UriBuilder; @@ -43,6 +46,7 @@ import io.micronaut.servlet.http.ServletHttpRequest; import io.micronaut.servlet.http.ParsedBodyHolder; import io.micronaut.servlet.http.ByteArrayByteBuffer; +import io.micronaut.servlet.http.body.AvailableByteArrayBody; import org.slf4j.Logger; import java.io.BufferedReader; @@ -71,7 +75,7 @@ */ @Internal @SuppressWarnings("java:S119") // More descriptive generics are better here -public abstract class ApiGatewayServletRequest implements MutableServletHttpRequest, ServletExchange, FullHttpRequest, ParsedBodyHolder { +public abstract class ApiGatewayServletRequest implements MutableServletHttpRequest, ServletExchange, FullHttpRequest, ParsedBodyHolder, ServerHttpRequest { private static final Set> RAW_BODY_TYPES = CollectionUtils.setOf(String.class, byte[].class, ByteBuffer.class, InputStream.class); private static final String SLASH = "/"; @@ -108,7 +112,16 @@ protected ApiGatewayServletRequest( }); } - public abstract byte[] getBodyBytes() throws IOException; + @Override + public @NonNull ByteBody byteBody() { + try { + return new AvailableByteArrayBody(getBodyBytes()); + } catch (EmptyBodyException e) { + return new AvailableByteArrayBody(ArrayUtils.EMPTY_BYTE_ARRAY); + } + } + + public abstract byte[] getBodyBytes() throws EmptyBodyException; /** * Given a path and the query params from the event, build a URI. @@ -300,10 +313,10 @@ public void setParsedBody(T body) { * @return body bytes * @throws IOException if the body is empty */ - protected byte[] getBodyBytes(@NonNull Supplier bodySupplier, @NonNull BooleanSupplier base64EncodedSupplier) throws IOException { + protected byte[] getBodyBytes(@NonNull Supplier bodySupplier, @NonNull BooleanSupplier base64EncodedSupplier) throws EmptyBodyException { String requestBody = bodySupplier.get(); if (StringUtils.isEmpty(requestBody)) { - throw new IOException("Empty Body"); + throw new EmptyBodyException(); } return base64EncodedSupplier.getAsBoolean() ? Base64.getDecoder().decode(requestBody) : requestBody.getBytes(getCharacterEncoding()); @@ -358,4 +371,10 @@ protected MutableHttpParameters getParameters(@NonNull Supplier> singleHeaders, @NonNull Supplier>> multiValueHeaders) { return new CaseInsensitiveMutableHttpHeaders(MapCollapseUtils.collapse(multiValueHeaders.get(), singleHeaders.get()), conversionService); } + + public static final class EmptyBodyException extends IOException { + public EmptyBodyException() { + super("Empty body"); + } + } } diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletRequest.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletRequest.java index f665f9b5aa..2d16aa432f 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletRequest.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletRequest.java @@ -28,8 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - /** * Implementation of {@link ServletHttpRequest} for Application Load Balancer events. * @@ -66,7 +64,7 @@ public ApplicationLoadBalancerServletRequest( } @Override - public byte[] getBodyBytes() throws IOException { + public byte[] getBodyBytes() throws EmptyBodyException { return getBodyBytes(requestEvent::getBody, requestEvent::getIsBase64Encoded); } diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletRequest.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletRequest.java index a7e278f05e..c159ceee81 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletRequest.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletRequest.java @@ -31,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.util.Base64; import java.util.List; import java.util.Map; @@ -72,10 +71,10 @@ public ApiGatewayProxyServletRequest( } @Override - public byte[] getBodyBytes() throws IOException { + public byte[] getBodyBytes() throws EmptyBodyException { String body = requestEvent.getBody(); if (StringUtils.isEmpty(body)) { - throw new IOException("Empty Body"); + throw new EmptyBodyException(); } Boolean isBase64Encoded = requestEvent.getIsBase64Encoded(); return Boolean.TRUE.equals(isBase64Encoded) ? Base64.getDecoder().decode(body) : body.getBytes(getCharacterEncoding()); diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPEventServletRequest.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPEventServletRequest.java index 1f9c947d4f..ea5078f020 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPEventServletRequest.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPEventServletRequest.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.util.Collections; /** @@ -67,7 +66,7 @@ public APIGatewayV2HTTPEventServletRequest( } @Override - public byte[] getBodyBytes() throws IOException { + public byte[] getBodyBytes() throws EmptyBodyException { return getBodyBytes(requestEvent::getBody, requestEvent::getIsBase64Encoded); } diff --git a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy index e1939521de..4b2afe05e1 100644 --- a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy +++ b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy @@ -26,6 +26,7 @@ import io.micronaut.runtime.server.EmbeddedServer //tag::rxImport[] import org.reactivestreams.Publisher import reactor.core.publisher.Mono +import spock.lang.Ignore //end::rxImport[] import spock.lang.Specification @@ -37,6 +38,7 @@ import spock.lang.Specification class LocalFunctionInvokeSpec extends Specification { //tag::invokeLocalFunction[] + @Ignore void "test invoking a local function"() { given: EmbeddedServer server = ApplicationContext.run(EmbeddedServer) @@ -54,6 +56,7 @@ class LocalFunctionInvokeSpec extends Specification { //end::invokeLocalFunction[] //tag::invokeRxLocalFunction[] + @Ignore void "test invoking a local function - rx"() { given: EmbeddedServer server = ApplicationContext.run(EmbeddedServer) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ccd1fff34e..3a23998ed6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,20 +12,20 @@ logback-json-classic = '0.1.5' micronaut-discovery = "4.3.0" micronaut-groovy = "4.3.0" -micronaut-logging = "1.2.2" +micronaut-logging = "1.3.0" micronaut-mongodb = "5.3.0" micronaut-reactor = "3.3.0" -micronaut-security = "4.8.0" -micronaut-serde = "2.10.0" -micronaut-servlet = "4.8.0" +micronaut-security = "4.9.0" +micronaut-serde = "2.10.1" +micronaut-servlet = "4.9.0" micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" -micronaut-validation = "4.4.0" +micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.733' -managed-aws-java-sdk-v2 = '2.25.63' +managed-aws-java-sdk-v1 = '1.12.734' +managed-aws-java-sdk-v2 = '2.25.64' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.5' managed-aws-lambda-java-serialization = '1.1.5' @@ -43,7 +43,7 @@ graal = "23.1.2" kotlin = "1.9.24" # Micronaut -micronaut-gradle-plugin = "4.3.6" +micronaut-gradle-plugin = "4.4.0" [libraries] # Core From a9d007c46ce1facff47d6dc4905db38490d0198d Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Mon, 3 Jun 2024 14:15:53 +0200 Subject: [PATCH 026/149] [aws] Update common files for branch 4.6.x (#2132) * Update common files * Update renovate.json --------- Co-authored-by: Graeme Rocher --- .github/renovate.json | 10 +++++++++- .github/workflows/release.yml | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index ed525891b5..09c2a59831 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -12,7 +12,15 @@ "packageRules": [ { "matchPackagePatterns": ["actions.*"], - "dependencyDashboardApproval": true + "dependencyDashboardApproval": true, + "matchUpdateTypes": ["patch"], + "matchCurrentVersion": "!/^0/", + "automerge": true + }, + { + "matchUpdateTypes": ["patch"], + "matchCurrentVersion": "!/^0/", + "automerge": true } ] } diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 065ee56205..5afb151f4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,7 +134,7 @@ jobs: actions: read # To read the workflow path. id-token: write # To sign the provenance. contents: write # To add assets to a release. - uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.10.0 + uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.0.0 with: base64-subjects: "${{ needs.provenance-subject.outputs.artifacts-sha256 }}" upload-assets: true # Upload to a new release. From b7b565430de887e9123433fce7b5d6584059d64a Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Mon, 3 Jun 2024 18:48:03 +0000 Subject: [PATCH 027/149] [skip ci] Release v4.6.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 42dd8b424d..d78f795155 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.6.0-SNAPSHOT +projectVersion=4.6.0 projectGroup=io.micronaut.aws title=Micronaut AWS From 1d7fafeca0178baa1b7dabf89d03c55a067f2023 Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Mon, 3 Jun 2024 18:56:16 +0000 Subject: [PATCH 028/149] chore: Bump version to 4.6.1-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d78f795155..6a4c9e6e0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.6.0 +projectVersion=4.6.1-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS From 9d35b235e2c3fb18c4346cd6013bb4ac5e0e3a25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 08:40:09 +0200 Subject: [PATCH 029/149] fix(deps): update dependency io.micronaut.servlet:micronaut-servlet-bom to v4.9.1 (#2135) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3a23998ed6..d33face384 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ micronaut-reactor = "3.3.0" micronaut-security = "4.9.0" micronaut-serde = "2.10.1" -micronaut-servlet = "4.9.0" +micronaut-servlet = "4.9.1" micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" micronaut-validation = "4.6.0" From 275840748d46cb2384950713e1502f75353c62a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 08:40:23 +0200 Subject: [PATCH 030/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.25.66 (#2134) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d33face384..d33a1e31e0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.734' -managed-aws-java-sdk-v2 = '2.25.64' +managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.5' managed-aws-lambda-java-serialization = '1.1.5' From f8801016f329b8e687c556a1c1662d0d21445d32 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 7 Jun 2024 11:35:31 +0200 Subject: [PATCH 031/149] unignore local function invoker (#2136) --- .../function/client/aws/LocalFunctionInvokeSpec.groovy | 3 --- 1 file changed, 3 deletions(-) diff --git a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy index 4b2afe05e1..e1939521de 100644 --- a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy +++ b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy @@ -26,7 +26,6 @@ import io.micronaut.runtime.server.EmbeddedServer //tag::rxImport[] import org.reactivestreams.Publisher import reactor.core.publisher.Mono -import spock.lang.Ignore //end::rxImport[] import spock.lang.Specification @@ -38,7 +37,6 @@ import spock.lang.Specification class LocalFunctionInvokeSpec extends Specification { //tag::invokeLocalFunction[] - @Ignore void "test invoking a local function"() { given: EmbeddedServer server = ApplicationContext.run(EmbeddedServer) @@ -56,7 +54,6 @@ class LocalFunctionInvokeSpec extends Specification { //end::invokeLocalFunction[] //tag::invokeRxLocalFunction[] - @Ignore void "test invoking a local function - rx"() { given: EmbeddedServer server = ApplicationContext.run(EmbeddedServer) From cfedf7e9fb73429f6e2ed9bbb99eebfc4fd13ace Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:35:44 +0200 Subject: [PATCH 032/149] fix(deps): update aws-java-sdk monorepo to v1.12.738 (#2133) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d33a1e31e0..c8b6e2c7f9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.734' +managed-aws-java-sdk-v1 = '1.12.738' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.5' From 4e6c9fa0e1b76d64ed3d711c3e91fb5a25caa09c Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Sat, 8 Jun 2024 20:06:11 +0200 Subject: [PATCH 033/149] Update common files (#2138) --- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 10 ++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 78142de204..33a347c608 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -78,7 +78,7 @@ jobs: - name: "📜 Upload binary compatibility check results" if: matrix.java == '17' - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: binary-compatibility-reports path: "**/build/reports/binary-compatibility-*.html" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5afb151f4e..5a18844dd3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,13 +66,13 @@ jobs: # Store the hash in a file, which is uploaded as a workflow artifact. sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256 - name: Upload build artifacts - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: gradle-build-outputs path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/* retention-days: 5 - name: Upload artifacts-sha256 - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: artifacts-sha256 path: artifacts-sha256 @@ -115,7 +115,7 @@ jobs: artifacts-sha256: ${{ steps.set-hash.outputs.artifacts-sha256 }} steps: - name: Download artifacts-sha256 - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: artifacts-sha256 # The SLSA provenance generator expects the hash digest of artifacts to be passed as a job @@ -148,9 +148,7 @@ jobs: - name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Download artifacts - # Important: update actions/download-artifact to v4 only when generator_generic_slsa3.yml is also compatible. - # See https://github.com/slsa-framework/slsa-github-generator/issues/3068 - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: gradle-build-outputs path: build/repo diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a4f..a4413138c9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4269..b740cf1339 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From 539b70271613ae4d8a35f6680ea81e539d865f66 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 10:18:31 +0000 Subject: [PATCH 034/149] fix(deps): update aws-java-sdk monorepo to v1.12.744 (#2139) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8b6e2c7f9..a75f01934d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.738' +managed-aws-java-sdk-v1 = '1.12.744' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.5' From 75dc142b4c77bed8edd675c9a0550e93766788a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 12:33:05 +0000 Subject: [PATCH 035/149] fix(deps): update dependency com.amazonaws:aws-lambda-java-events to v3.11.6 (#2142) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a75f01934d..23cbe95f10 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.744' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' -managed-aws-lambda-events = '3.11.5' +managed-aws-lambda-events = '3.11.6' managed-aws-lambda-java-serialization = '1.1.5' aws-lambda-java-runtime-interface-client = '2.5.0' From cc6fa54657c5ba508a1d26d7974291d6d59091f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:24:26 +0000 Subject: [PATCH 036/149] fix(deps): update dependency org.eclipse.jetty:jetty-server to v11.0.21 (#2137) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 23cbe95f10..d791d6973f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ spock = "2.3-groovy-4.0" bouncycastle = '1.70' fileupload = '0.0.6' -jetty = '11.0.20' +jetty = '11.0.21' logback-json-classic = '0.1.5' micronaut-discovery = "4.3.0" From 8887ce684bd87db0584abafaee9fe500fb914930 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 19:36:46 +0000 Subject: [PATCH 037/149] fix(deps): update dependency org.graalvm.sdk:graal-sdk to v23.1.3 (#2109) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d791d6973f..3efb994de5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,7 @@ javapoet = "1.13.0" # The following version should probably # be defined in Micronaut Graal but it's not shipped with a BOM yet -graal = "23.1.2" +graal = "23.1.3" kotlin = "1.9.24" # Micronaut From e398145ec19f7f4a4377e45caa37bfc58c155ea4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 02:43:54 +0000 Subject: [PATCH 038/149] fix(deps): update aws-java-sdk monorepo to v1.12.745 (#2144) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3efb994de5..755eec8a2c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.744' +managed-aws-java-sdk-v1 = '1.12.745' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From 22b9ab8a96fff7af21e9d9de72896604dc81a01b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:25:56 +0000 Subject: [PATCH 039/149] chore(deps): update graalvm/setup-graalvm action to v1.2.2 (#2146) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 33a347c608..96d628b6a2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: fetch-depth: 0 - name: "🔧 Setup GraalVM CE" - uses: graalvm/setup-graalvm@v1.2.1 + uses: graalvm/setup-graalvm@v1.2.2 with: distribution: 'graalvm' java-version: ${{ matrix.java }} From bb4c8bc291c30adfc70de328362bf14c9039cc0b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 21:30:27 +0000 Subject: [PATCH 040/149] fix(deps): update aws-java-sdk monorepo to v1.12.747 (#2149) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 755eec8a2c..34f4dc8553 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.745' +managed-aws-java-sdk-v1 = '1.12.747' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From d41e0c667003dbf067f215aad0b90dfd477c2ecb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 22:23:07 +0000 Subject: [PATCH 041/149] fix(deps): update aws-java-sdk monorepo to v1.12.748 (#2151) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34f4dc8553..b5fa35d2af 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.747' +managed-aws-java-sdk-v1 = '1.12.748' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From 20334f38027a71730d6f3904c13bbbb8d90411ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2024 21:34:32 +0000 Subject: [PATCH 042/149] fix(deps): update dependency io.micronaut.serde:micronaut-serde-bom to v2.10.2 (#2152) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b5fa35d2af..165abe5263 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ micronaut-mongodb = "5.3.0" micronaut-reactor = "3.3.0" micronaut-security = "4.9.0" -micronaut-serde = "2.10.1" +micronaut-serde = "2.10.2" micronaut-servlet = "4.9.1" micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" From 83a8c02470fe7a0dff423b06b86982b4a00537e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 01:37:26 +0000 Subject: [PATCH 043/149] fix(deps): update aws-java-sdk monorepo to v1.12.750 (#2156) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 165abe5263..3815aa6fd5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.748' +managed-aws-java-sdk-v1 = '1.12.750' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From a4ea33694799656b7735a5d4e629e468b26e8513 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:25:03 +0000 Subject: [PATCH 044/149] fix(deps): update dependency io.micronaut.servlet:micronaut-servlet-bom to v4.9.2 (#2158) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3815aa6fd5..bc322921e5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ micronaut-reactor = "3.3.0" micronaut-security = "4.9.0" micronaut-serde = "2.10.2" -micronaut-servlet = "4.9.1" +micronaut-servlet = "4.9.2" micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" micronaut-validation = "4.6.0" From af69f86658e57725a12f9bb232355d80eef6275f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 03:55:58 +0000 Subject: [PATCH 045/149] fix(deps): update aws-java-sdk monorepo to v1.12.753 (#2157) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bc322921e5..6644de888b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.750' +managed-aws-java-sdk-v1 = '1.12.753' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From b3cee46ab8812e52e01329d96c5763bab0c1bea6 Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:18:44 +0200 Subject: [PATCH 046/149] Update common files (#2147) --- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 96d628b6a2..d91a8e4fec 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -52,7 +52,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: "🔧 Setup Gradle" - uses: gradle/gradle-build-action@v3.3.2 + uses: gradle/gradle-build-action@v3.4.2 - name: "❓ Optional setup step" run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a18844dd3..f234f585bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,7 +146,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Download artifacts uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: From 684124e9e543135ef1e48d1e9b01c3f91f8952cf Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Mon, 1 Jul 2024 10:00:22 +0200 Subject: [PATCH 047/149] ci: projectVersion 4.7.0-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6a4c9e6e0f..6cba5d1c4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.6.1-SNAPSHOT +projectVersion=4.7.0-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS From f114865fff30159c70430ebfee3676f215528aae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:01:17 +0200 Subject: [PATCH 048/149] chore(deps): update plugin io.micronaut.build.shared.settings to v7 (#2153) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index b8075ace2c..e08e704a51 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "6.7.1" + id("io.micronaut.build.shared.settings") version "7.1.3" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 1539b1582cf4042fb4b8caef868b3d9a87d4908e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:01:35 +0200 Subject: [PATCH 049/149] fix(deps): update dependency io.micronaut.reactor:micronaut-reactor-bom to v3.4.0 (#2150) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6644de888b..f0b7ada894 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ micronaut-discovery = "4.3.0" micronaut-groovy = "4.3.0" micronaut-logging = "1.3.0" micronaut-mongodb = "5.3.0" -micronaut-reactor = "3.3.0" +micronaut-reactor = "3.4.0" micronaut-security = "4.9.0" micronaut-serde = "2.10.2" From 8943feca1b1bf0826cfe0660d50eab9b484f2e42 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:01:55 +0200 Subject: [PATCH 050/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.26.12 (#2140) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6644de888b..344a777a34 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.753' -managed-aws-java-sdk-v2 = '2.25.66' +managed-aws-java-sdk-v2 = '2.26.12' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' managed-aws-lambda-java-serialization = '1.1.5' From 28c0d9a097228bd788554e0484d0c0cf2b9848b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 00:18:07 +0000 Subject: [PATCH 051/149] fix(deps): update dependency com.amazonaws:aws-lambda-java-runtime-interface-client to v2.5.1 (#2159) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f0b7ada894..5fa52660c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' managed-aws-lambda-java-serialization = '1.1.5' -aws-lambda-java-runtime-interface-client = '2.5.0' +aws-lambda-java-runtime-interface-client = '2.5.1' managed-aws-serverless-core = '1.9.3' micronaut-starter = "3.9.2" From ae11a4d7610c29eab00208c13ba12a5c79cee841 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 02:22:26 +0000 Subject: [PATCH 052/149] chore(deps): update plugin io.micronaut.build.shared.settings to v7.1.4 (#2160) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index e08e704a51..ff4fd2b791 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "7.1.3" + id("io.micronaut.build.shared.settings") version "7.1.4" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 1c74b0f3e084c3ea3145c4307a26598ee666fbde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 01:03:01 +0000 Subject: [PATCH 053/149] fix(deps): update aws-java-sdk monorepo (#2162) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5fa52660c8..1aa46c57f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.753' +managed-aws-java-sdk-v1 = '1.12.757' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From b79562c8dcfaa4e1419e73f59cbf2fc0482349c5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2024 01:10:54 +0000 Subject: [PATCH 054/149] fix(deps): update dependency org.eclipse.jetty:jetty-server to v11.0.22 (#2163) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1aa46c57f7..b5b0bd2642 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ spock = "2.3-groovy-4.0" bouncycastle = '1.70' fileupload = '0.0.6' -jetty = '11.0.21' +jetty = '11.0.22' logback-json-classic = '0.1.5' micronaut-discovery = "4.3.0" From 0386f5974043097302cb105e3289a8cc8a60a67c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 21:42:13 +0000 Subject: [PATCH 055/149] fix(deps): update aws-java-sdk monorepo to v1.12.759 (#2167) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b5b0bd2642..41f07669cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.757' +managed-aws-java-sdk-v1 = '1.12.759' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From da795e6b5c36e993823cb3e524a31ebe27defcf5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 01:42:58 +0000 Subject: [PATCH 056/149] fix(deps): update dependency io.micronaut.validation:micronaut-validation-bom to v4.6.1 (#2168) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41f07669cd..8013e17b5d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ micronaut-serde = "2.10.2" micronaut-servlet = "4.9.2" micronaut-test-resources="2.5.2" micronaut-views = "5.4.0" -micronaut-validation = "4.6.0" +micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.759' From 382a6f81e35bf8900c3de9b52a0266a2fa49b8b8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2024 01:45:11 +0000 Subject: [PATCH 057/149] fix(deps): update aws-java-sdk monorepo to v1.12.761 (#2169) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8013e17b5d..7cfd80bb55 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.759' +managed-aws-java-sdk-v1 = '1.12.761' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From 5a8f4ecad85e039d955aa942540556a7b18c842a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 23:02:20 +0000 Subject: [PATCH 058/149] fix(deps): update dependency io.micronaut.testresources:micronaut-test-resources-bom to v2.5.3 (#2174) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7cfd80bb55..ce6f7db41b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ micronaut-reactor = "3.4.0" micronaut-security = "4.9.0" micronaut-serde = "2.10.2" micronaut-servlet = "4.9.2" -micronaut-test-resources="2.5.2" +micronaut-test-resources="2.5.3" micronaut-views = "5.4.0" micronaut-validation = "4.6.1" From 58c868f59efeac1553e963031e27f8a72bc031cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 01:02:37 +0000 Subject: [PATCH 059/149] fix(deps): update aws-java-sdk monorepo to v1.12.762 (#2176) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce6f7db41b..f429f6b613 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.761' +managed-aws-java-sdk-v1 = '1.12.762' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From a12260f3bc8875d3aacb890c3af1d4a2177d8e19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 23:51:56 +0000 Subject: [PATCH 060/149] fix(deps): update dependency io.micronaut.reactor:micronaut-reactor-bom to v3.4.1 (#2178) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f429f6b613..a343f9b4c7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ micronaut-discovery = "4.3.0" micronaut-groovy = "4.3.0" micronaut-logging = "1.3.0" micronaut-mongodb = "5.3.0" -micronaut-reactor = "3.4.0" +micronaut-reactor = "3.4.1" micronaut-security = "4.9.0" micronaut-serde = "2.10.2" From a4e0bcd613e496a4680123c310099e398ca13ef2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 00:42:08 +0000 Subject: [PATCH 061/149] fix(deps): update aws-java-sdk monorepo to v1.12.763 (#2179) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a343f9b4c7..c08ee85a98 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.762' +managed-aws-java-sdk-v1 = '1.12.763' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From 13f568c52057a269c6d86c7fc3ad67a3421a5671 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:58:18 +0000 Subject: [PATCH 062/149] fix(deps): update dependency io.micronaut.security:micronaut-security-bom to v4.9.1 (#2180) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c08ee85a98..b45781eed6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ micronaut-logging = "1.3.0" micronaut-mongodb = "5.3.0" micronaut-reactor = "3.4.1" -micronaut-security = "4.9.0" +micronaut-security = "4.9.1" micronaut-serde = "2.10.2" micronaut-servlet = "4.9.2" micronaut-test-resources="2.5.3" From e27c06f3a1f7ebe4f40937ca432c535968a4731c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 02:32:34 +0000 Subject: [PATCH 063/149] fix(deps): update dependency io.micronaut.testresources:micronaut-test-resources-bom to v2.5.4 (#2181) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b45781eed6..3fd2ba15d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ micronaut-reactor = "3.4.1" micronaut-security = "4.9.1" micronaut-serde = "2.10.2" micronaut-servlet = "4.9.2" -micronaut-test-resources="2.5.3" +micronaut-test-resources="2.5.4" micronaut-views = "5.4.0" micronaut-validation = "4.6.1" From 3b2755663cc68d68cf6ffc15de1c2386d00bd700 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:19:25 +0000 Subject: [PATCH 064/149] fix(deps): update dependency io.micronaut.gradle:micronaut-gradle-plugin to v4.4.2 (#2177) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3fd2ba15d3..7fc6d5f0f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,7 +43,7 @@ graal = "23.1.3" kotlin = "1.9.24" # Micronaut -micronaut-gradle-plugin = "4.4.0" +micronaut-gradle-plugin = "4.4.2" [libraries] # Core From 15f584c214848958a4937f0df383f27253384770 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 01:12:41 +0000 Subject: [PATCH 065/149] fix(deps): update aws-java-sdk monorepo to v1.12.767 (#2182) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7fc6d5f0f6..e193883f39 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.0" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.763' +managed-aws-java-sdk-v1 = '1.12.767' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From 5629fb4e5464aad65612854dbbc7ab885e880ce5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 00:52:32 +0000 Subject: [PATCH 066/149] fix(deps): update dependency io.micronaut.views:micronaut-views-bom to v5.4.1 (#2183) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e193883f39..e8d507ba23 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ micronaut-security = "4.9.1" micronaut-serde = "2.10.2" micronaut-servlet = "4.9.2" micronaut-test-resources="2.5.4" -micronaut-views = "5.4.0" +micronaut-views = "5.4.1" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" From 93f99d1e72468dba134122db357722667b7545e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 01:11:22 +0000 Subject: [PATCH 067/149] fix(deps): update dependency org.graalvm.sdk:graal-sdk to v23.1.4 (#2184) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e8d507ba23..63871f9f68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,7 @@ javapoet = "1.13.0" # The following version should probably # be defined in Micronaut Graal but it's not shipped with a BOM yet -graal = "23.1.3" +graal = "23.1.4" kotlin = "1.9.24" # Micronaut From 0bc5c67dc6b6a58e5219ae3b333196730b2a7a7c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 21:06:26 +0000 Subject: [PATCH 068/149] fix(deps): update kotlin monorepo to v1.9.25 (#2185) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 63871f9f68..bbfcec52cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,7 +40,7 @@ javapoet = "1.13.0" # The following version should probably # be defined in Micronaut Graal but it's not shipped with a BOM yet graal = "23.1.4" -kotlin = "1.9.24" +kotlin = "1.9.25" # Micronaut micronaut-gradle-plugin = "4.4.2" From 305532dc1d4b00ebcc4184510a5da9fe8c37b647 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 02:55:45 +0000 Subject: [PATCH 069/149] chore(deps): update graalvm/setup-graalvm action to v1.2.3 (#2187) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d91a8e4fec..ee7484ca69 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: fetch-depth: 0 - name: "🔧 Setup GraalVM CE" - uses: graalvm/setup-graalvm@v1.2.2 + uses: graalvm/setup-graalvm@v1.2.3 with: distribution: 'graalvm' java-version: ${{ matrix.java }} From 890292a61093ce3cb87f6af52a3d3a0ccc9a6259 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 01:38:52 +0000 Subject: [PATCH 070/149] fix(deps): update dependency io.micronaut.views:micronaut-views-bom to v5.4.4 (#2188) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bbfcec52cd..534e9a79ab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ micronaut-security = "4.9.1" micronaut-serde = "2.10.2" micronaut-servlet = "4.9.2" micronaut-test-resources="2.5.4" -micronaut-views = "5.4.1" +micronaut-views = "5.4.4" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" From 4c3f424e1c50ed64d62a72e4907e6be7d5ad3271 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:54:11 +0000 Subject: [PATCH 071/149] fix(deps): update aws-java-sdk monorepo to v1.12.768 (#2189) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 534e9a79ab..9ca59318a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.767' +managed-aws-java-sdk-v1 = '1.12.768' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From 304ab4e3943a5a74e2ca4de6f3525a00937bcd64 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 01:01:51 +0000 Subject: [PATCH 072/149] fix(deps): update dependency io.micronaut.servlet:micronaut-servlet-bom to v4.9.3 (#2190) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9ca59318a5..9fcbcdf124 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ micronaut-reactor = "3.4.1" micronaut-security = "4.9.1" micronaut-serde = "2.10.2" -micronaut-servlet = "4.9.2" +micronaut-servlet = "4.9.3" micronaut-test-resources="2.5.4" micronaut-views = "5.4.4" micronaut-validation = "4.6.1" From 53e73e68d4c081f3dc0ae426bc5407339ca96a95 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 21:35:45 +0000 Subject: [PATCH 073/149] fix(deps): update dependency org.slf4j:jcl-over-slf4j to v2.0.16 (#2191) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9fcbcdf124..5d5bf755d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ aws-lambda-java-runtime-interface-client = '2.5.1' managed-aws-serverless-core = '1.9.3' micronaut-starter = "3.9.2" -slf4j = "2.0.13" +slf4j = "2.0.16" servlet-api = "2.5" javapoet = "1.13.0" From 3aaad85b248c65f47f0b455cc1dbef1717863f2b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 00:08:22 +0000 Subject: [PATCH 074/149] fix(deps): update aws-java-sdk monorepo to v1.12.769 (#2192) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5d5bf755d9..a51c27a95c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.6.1" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.768' +managed-aws-java-sdk-v1 = '1.12.769' managed-aws-java-sdk-v2 = '2.25.66' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' From 2cc89c05959cad4a29cb1419f760abe3942588aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:26:45 +0200 Subject: [PATCH 075/149] chore(deps): update plugin io.micronaut.build.shared.settings to v7.2.0 (#2193) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index ff4fd2b791..05e234f503 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "7.1.4" + id("io.micronaut.build.shared.settings") version "7.2.0" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 69bd228d6effb3424548bb309368502c3882c07d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:26:58 +0200 Subject: [PATCH 076/149] chore(deps): update gradle/gradle-build-action action to v3.5.0 (#2186) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ee7484ca69..9442b65563 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -52,7 +52,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: "🔧 Setup Gradle" - uses: gradle/gradle-build-action@v3.4.2 + uses: gradle/gradle-build-action@v3.5.0 - name: "❓ Optional setup step" run: | From 8ef4428c502b3c53af9a2419211d497ad41770d0 Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:27:14 +0200 Subject: [PATCH 077/149] Update common files (#2175) --- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 10 +++++----- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 5 ++++- gradlew.bat | 2 ++ 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9442b65563..be653308d2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -78,7 +78,7 @@ jobs: - name: "📜 Upload binary compatibility check results" if: matrix.java == '17' - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 with: name: binary-compatibility-reports path: "**/build/reports/binary-compatibility-*.html" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f234f585bd..f4bfd84acb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,13 +66,13 @@ jobs: # Store the hash in a file, which is uploaded as a workflow artifact. sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256 - name: Upload build artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 with: name: gradle-build-outputs path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/* retention-days: 5 - name: Upload artifacts-sha256 - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 with: name: artifacts-sha256 path: artifacts-sha256 @@ -115,7 +115,7 @@ jobs: artifacts-sha256: ${{ steps.set-hash.outputs.artifacts-sha256 }} steps: - name: Download artifacts-sha256 - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: name: artifacts-sha256 # The SLSA provenance generator expects the hash digest of artifacts to be passed as a job @@ -148,7 +148,7 @@ jobs: - name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Download artifacts - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: name: gradle-build-outputs path: build/repo @@ -160,6 +160,6 @@ jobs: - name: Upload assets # Upload the artifacts to the existing release. Note that the SLSA provenance will # attest to each artifact file and not the aggregated ZIP file. - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15 + uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8 with: files: artifacts.zip diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 zcmY+pRa6|n(lttO3GVLh?(Xh3xVuAe26uONcL=V5;I6?T_zdn2`Oi5I_gl9gx~lft zRjVKRp?B~8Wyrx5$mS3|py!Njy{0Wt4i%@s8v88pK z6fPNA45)|*9+*w5kcg$o)}2g}%JfXe6l9ig4T8ia3Hlw#3f^fAKW63%<~GZJd-0YA z9YjleCs~#Y?V+`#nr+49hhsr$K$k!lg}AZDw@>2j=f7t~5IW6#K|lAX7|^N}lJ)I!km`nrwx> z))1Es16__aXGVzQM0EC8xH+O!nqTFBg9Ci{NwRK*CP<6s`Gq(~#lqb(zOlh6ZDBK* zr$|NDj^s6VanrKa+QC;5>twePaexqRI%RO~OY075y?NN90I|f^(P# zF=b>fZ73b5JzD`#GC3lTQ_B3lMeBWgQUGYnFw*HQC}^z{$6G4j(n4y-pRxPT(d2Wgb%vCH(?+t&Pj z)QM`zc`U`+<~D+9E{4Uj2kc#*6eZMU$4Oj6QMfA^K!rbl`iBix=2sPrs7j@aqIrE zTaZJ2M09>rp$mgyUZ!r2$UK{+DGqgl`n;*qFF~M(r#eh`T{MO?2&j?xgr8FU$u3-` zhRDc_I23LL4)K&xg$^&l-W=!Jp-P(_Ie07q>Je;QLxi8LaEc%;WIacJD_T69egF?7 z;I_Sg_!+qrur8$Hq4grigaiVF>U7uWJ@Hkd&%kmFnQN-P^fq0gB1|uRt!U#X;DnlV zo?yHWTw7g5B;#xxY`adhi4yZn@f(7-Xa(J6S=#d@&rlFw!qfvholE>MEb|VWn^g}G zMSrK&zQ^vDId&ojL!{%{o7?s{7;{+u%L{|tar(gp?Uxq3p?xAysB>0E$eG#$tvkk9 z2Q2gEP17{U6@UD*v({5MP-CTZfvWMItVjb4c;i~WLq&{?Q1(koX&vt7+$z}10{^Id z{KDjGi0JpD7@;~odF__0m|p;5rIrHidOP9^mwKe#-&JX-X@acc)06G{LO1Wu)#gvZ za~y9(fhA%UwkDOVU1LBJ`0ROE z4&)dJKK%mG@+CIm?+wt9f~@xIMr8}UH*K1j| z0pppo{7gv3v{URwxVMeg>Ps!L5IKxm zjac2egjgb0vH5i75$s|sY_RYec#>faqJk|AGgV;v=^%BM(^p{p;(^SVt-88G9f!q; z>p}9E4^f0=01S2pQBE4}9YqE%TV)*hlU^8k9{&=K76+*Ax^r=AkBb%OCP^P2nm0Ri z;D-|Zk?gGeU<12ti2CnPVNA(Pb)02+r|&yTWW-OJO7 zNLb0pps6aN?A~NJp5kj{{IOlf!5KWMleV@-hYLift)D>-7K+tgs=7Ake}oBnIy-y1 z(Hn@Hjw=_(x>dO5ysQsrnE%A*bk0K<-j{1Yqz@#n#jOL^AzCr#wR|WYzqk6i7v)Lf zkXdKxzuu20aP{Tbg$(+9&oh7cd(Uoqqf<#ujb$q4sZ~gxFbQfS zS)kNklyL*{2AELgjZ(LBu*>S(oH5AaJ;YiB@;l@=O%F6B?oanzoYRM^fQ9-<~^=3$H0g^JPMLQo@SZ@QuNvy)tyJ)LSj`+()#fy?{aV4Yg^7dlQ7AQM^3GLCR2dAFR zJjtfKiVqF`l-H_fz0HD|9g>)pOxn}k!vdZ=DO!7Sikm{Z%P6BrRkBS6W?ZB5W&7rT z@uYpf@M@a!z7H&o@-yrcCL^Ff3e7p3T`R9p?@o-acXmbTSa0>ZANzCSgovsd%;i$| zVus`not!oL#(W`L-!9w0jdaECaG4hk{V7IOs676ZquZH~0TX5hDq|)x z6T497l|E?f4)LA>j=S8}b$0LS=I4h|hUFJYJODT8Li@#6kF$k0)@*l{RnM1HQ%?VT ze-Pqlc!~t(oumVC*?5fwR;P6u{tHaZ~*LlD;B)4f? z?lpWfa2P@)g57flVl83Ej%P`2)gGyaPjhvD(%i~{`2b>#3!+y&` z!2nuwHMFA-zUY}f1^0B8<`N)Gr=A4TS@b1qykmd0Pq{?r)+1^^+D(=xasb^Tf!oK9 zBLL+*p6M_#ufgLzgq1zcSwZsZnQWFLC3`Yxdg-2=*tT`J9nrfYt)RF)YryBf8_gW{ zvKbB+oZLehfT)S#<|y1)E0hW^?+AnqPXq9Hu;v3dsMGdr{SVyF63;K<8VcgI#~}1i zLYSBL0K;RTT(;>2x=*!1Di9w0mwr;`CN}kM65|Ay{~z}_^JKOsRaN<~#9O^iiW<5P zYN7r~HV!#Nz~IZU`P>1Xe%4f~K}KcF#X&5kO*G}-)74S*tQ8CietdPcA1Yl;S=Mr# z`#MYY!{s^uo=jn7;k6O%(}fN+*0cWMpt~#n9DR<3NyU?+3D^AgI}S)Cu-Tljg`VY} zX1=fq$?8$DtOeGxE6f8lbS_6Q3C4+LDTO$}_IpM$Xv<|QSC%+Oll^q$y`7o@jD{dp zNDl|&X)r7wETa-#h*d`KXntxI(Y{vLha{$0i7@G8xx^m=c<{lJ9?p-i!^W{%j7-oo z0W^SzZ^(Wkyz*We{lEn%Yhu-ycUOHtrRiVJL4~&S91*D0MrLu}Q>v-Mc?GcWfpyz% zX|UvcN@krFO#@v|CtYM}g|=L3%aMo$E5<@CM%c*;?u>LOTz00@+dt1{yg1y=$h+{|D17U}$*^fE^H&8b431EUE z<9tv0V_#%#&1N#j7AKCj!tTK@J%oFW*ESW<(#Gl#Xs%v<@AitI?s92nLzm<)w3Wkkom1f$gcdUi%g_*jofy&}N#luL<$GVIe{iQkQ)sIHVy zBgItnPBFamrv6Kb{eE($Q(f`ZPeW!Hm%Y@F*OF1sKB{Yy|C>WEv_mfvv-N-jh)B-5 z4a!1WcT@9a+hGaBrc~sz=>G?Q!*Zp^JFRUvBMyNR1;`)j$RhH$6gEyVKhd$&K-CFT zXaWC-Y=fyOnqT84iMn9o5oLEOI(_3fk!W^8-74|q1QhQ|CmT0i=b;6Z3u?E{p7V{? z;f#Q-33!L+4&QQcZ~GAqu$NS{M;u%`+#9=7^Oa5PKvCCCWNG_~l(CidS!+xr-*gg{ z$UQ`_1tLT_9jB=Hckkwu>G{s0b0F4bnR7GibmHo?>TR&<3?D;5Fb#gd8*wYa$$~ar z7epl1qM)L{kwiNjQk}?)CFpNTd?0wAOUZ|gC{Ub|c-7h~+Rm(JbdoRe!RNVBQi!M8 z+~U6E2X&KSA*T6KJvsqwqZl#1&==Dm(#b^&VAKQ>7ygv*Fyr;)q9*^F@dCTg2g!w~ z%hg)UXAUyIpIbLXJv1nZX+a_C)BOH2hUim|>=JHCRf(!dtTidb&*~I!JrfRe+PO>w z@ox$G2a3i9d_N9J=|2$y2m-P&#PTNwe!oLBZFs;z|F5kXvBDn<)WwE0E3$ow=zg3R zK(9;sf0t;VEV3@gAg7jRtnj%-6O@!Hvg*;XcUAw}!=2*aErvB(eQIm(-UGmq^J=XN zTqJo$Y|WKo^HlBF3BXJrA#}7ZLg=r*w`I*~Ix`o&2k8^(0mt8Rp=A>F`&gehhp@Jy z^e^#B2!~$LvNCKugg)8)-G%&THdk~kfextilegP9?#C#()F59U$&eo(h|5>ceo*Em z{PEE79T$YP|Kr7K`WBHbtQwyxFkCl6xX&+oUf90B5xoi3_5KHHCyEE*oPbOQkfMz& z6^hT8_NXd2iWk{q9IKae1{_7hMPH8I7_BMtVOM4 z6jm?E0QJOn$qrgsJ`9w##GB9?G})-GXSQo6(tYS(Q0-Ct$co?Zzl0?NHsDRron?;_ zZZgQg)%XW>P?8_&zoGuF(>Och2kEJXsu1_X&~w87x!b z>~h!a>e7{`p@+#hXF88wI*JeWRZ;J4ev4<}HWf|Z;(7$E!S5l9wzBHFe>^I{2`a;a)QnAwa2xv1e(bq$<}!8o^ofGvYpk7dBR+`*%iE;hUY5 zaHF}OjGO9r*{%lmcK^uFiTHgoUD`^9Nx@~;Bg!V* zuuJ&ti{DQiq7RyJAR94wem{}cPK1J(Yxnn_{=>?USqz-~&QXRStS^s-7TksZ$AEI! z#og36s3JGtGU{CnDHRFtipFqvrE*gw7_K@NN0h+ItTq@4fqN!HeQU1y7*X?9+IfZT4Vxebpt z%#VzgdDK~-&+=Z*#>=n#XUhNvBZp3=Cr41jMqwJkHLf3L7Vm~V#GgJ(Jpii~PmJ#s zA7Ft!{xD@z>9DUb4JbiUBdNEcU4BO$651iN*mp*f)HbRRM`Cx5cR?5IfEcU{IZWwf zz(M6CDv)>xa3x}K6%tP^i15P1&&DOLK=k~+jNR$UK3frSl+|PjSC-dBItvD~LL! z>_g(YYdO4k(5EbPOw+v+;G7~jYm>F@Ai|o`gs%F)F8tDz$dl7Q%aCe|v|$UkAul_R zNlA-beBX^IJU?kgS`E$it7nF4DaI!SJAGq)2P&Few(-|tp z?K+%D3e4{pfkayrcbm0ftu6Ol2ZzdKM+4i!hNP3NRL`EvvZJ3yvNr2MV%igZ4kj``Qrdb_OI$7jWP z;l0DYf&0(-*QcP5zrP`HVznW+SbH63Qx$7_9~NjRNg7eKqI!UJ=XH`g^=t8GiFTu( z?2L{JKEu%jJx&XjNzU(*!ZNmL1@RlJA0G$2_LrAb_7lmjil(GSlSM zwTes`m+3R;3#N~Xg#9owh3ycXV8@ZlaY_16kpPFA={721b~URO4HD3sp%fmkZM}k) zZB0#)kP=RkNB~R-MCk8aljG_bagt4vIb~8)BV%(b8_;)&Kf9GX+%O_cNG|(D$!3&D zL(I8}*LqN5NntipFlN13=`D>6!{D@CFMBH0kW3=HccJV+xW~|$qeFR5i-2{X+iWMu zI2$gepQ)H_B%ip_BlWOQ*|pErXs|4ir{IHccgaIJ84irE{?+$KDABXr&f`jB^V-c% z$$u`uU1YB^{<+UN2cNg#7&0bz@yF?5>j|;)5&IV3wIQp58X#OE-M^$HdyvL|Um5t? zhZlAG!Mz%XkUe3t471JM*Yur}o30vzu6RN7gJyNcf!IItsDO730mcJ*O!~V``y5=3 zNJGp34DZ}wd1H6V`Uuy%es>BiO_aE-S8jzir#$& zyk)@2a5tP$@g%jW^b^JGdo)X@Q%sE`^lDQmY9m%uDFpPX`w9%=yQ+nneMm#OaXcD` z9}{tn5A2b2z9783vL2_jSao?uxJhWJoq%47*RafM4o0@gY(p)F>qT4^XM5GLzV#6j zC+HoGhAne7o_w{WUo(B++z7lU3Y0k1rYv9|TSv0vR-Du(5=VakbbelgZTeDn+a_Wv zq_j-^+Qz1WAl;Zg>ahX|CERbX1V%B!hTKN?M}fGoA07M(WU&NfT&TmN`P@56U2 z^)vLDs|Ln~0iTtn-?KTeQl@T&bskJFuTUS!m+$CS9vnd}8(UMO|Kv6TCfGN9NUu&4 zL{)GTxPq>fwsJ~aU=4Qhuq8*RzDsP(LZh$BHezq&9gK$IS<|DYbm})$QTGCS6T;Dr zEkLct!b+#<1r9OKG@P!f1wm8>=Nz!7OzJm!g<+`?N3;YaA3(P@EL=(sTaRMDD!c8=-XN^4BXp(eVkj$NmEMYPP>YJ4bJ3yUud z<3BeJAJ$6z^TuywnfH5lv#$lgwraNw{IV=tIznPH1DT`v-5yS=!)J<}xxl}uZf9azA2A97Haf!;<3y01hlw?dWNEv@TLi1s-mO4vmIT%O_42nS z$VRWrs9NngqRRkWAnWkn%`Rw@?wH|)7XL`EL5EZu$qyJW31&CB^T_)qwIv!{;E_6 zo-9XAryQRlk-O0>o#-SZO>|6OYq;}<*>Wu1AsVRiXY4f8qb;+sItv3AyS!4Ry+q}) zA!pAB|BmC;=RIOk^^vlsEH(!Q!7_1FK~ZB2err*o!+b(r=m1b?$6d!%zmN+69LXnT z&gRmM+n_R-F@sT*IYv0_mGPvur!u`iWbQO7SqiGFLeY&yga zf`lM&B74FA2C?N@8_z652fjhBEoDUKbP8hL{0{HAF%qDo7)o3=3rg#6)T7%%5^wl% z9R0*S*<~>nzYOdQk2l`9h#t+gJy_xujw6xjV(8S<_DbVg61&pT%Hi42l%D73G?adn znB%UdNM0p}lEF-P2%TAMam2zpQev71e>a$$%i+r~b+D9G9pF|oY_*(-u*89oKsXLY+UIbqq)MQ%(GYS{(*n_S_*RN$*~`zUtab%0aKwhx znc)Yo?{xq1sJCgQD)TeTci1ucvbez9q=A72H(-SB18Kl&6^vHV8^i!p@>iF!DIw17 z+8Q)TNisB7>pwyww4y)yJx*wX6SJO78eLBC-ar1+k$Z9fy;wBD|3kzI{<+l*>PSY^ z_?nLOZaeWbU@C3hfK?X;Di*8CHCPkx2qco6(ZyJdqSzp^TJ_5Lpa0UP{Gy+!b0Lr% z@xYxSjUKoY6L#>$qx~KD$-0=|OF7zhVP~ntMgEALYPIfhj@+ z!;JJ7te>CcovruwHsJH6Lta$nm|%^C@=V-rmhU{+I~0(|XHQ9jt@L7pb{gx#{4r!) zg($FyFTslcgu(~6lYr$nW?)%*l#VJ=R-jxK(x=t1bWlu(nL66T#qj%3aZ@uVhy}Co zDU_q61DD5FqqJ*#c|(M5tV)XBN?Ac^12*q)VN4yKPJ|#==S_`_QD9|0ls!`2)SwuHDRA_OfXQDq3%qW&MZB}Z!=k-9xqev8jHz(H z{^D@cIB~QiK>~wa)A&^Ll^Wi6QgCzU;iv-BHsLBs zH7=jN%|>0S`SjP%M&AF1PNVDp_FZ?2Bm@7`DC&v(pYrw!!yD#4 z6+<=HS0Ln6MhoKxF<%~H`y20{vf#pxh=;j{zY381gvAFekgG|>G1zo8$&az{V=;JR zy_puF4$L$?EMhT?;TpQoR*j16ll`#AS4e96C}yp_aGKkBe?1H|k_;gG-~Xorc<;lI zkB}fB{$c-D2mGA&{rm<*@F5)c3X+6??g~XoEwuzSuch0D@W~P5(2I8v8F$c2$Vw51 zP#YLSBDqtWW^EYBl^QYHF+MA7am6f4DOhwnJM=W9$uvMOsZ%_~?)2C#wb?CkI$7{K zEi)=#|5pFvg^){zK5kpBLjB2kZ+$ZB|L=W|aNwyyb(gC2l7bcpx{E-H@)q6@D6N^xh`{1E%ItF2$eeB_SjI@b2WgTpS1thwg&n`jiIzw^TtXUyB{00($GIq>vbj|}bav}}Q_~wp3>k8!E@hVC;OMUTu|= zAy#vXH*GrUHu7^cNZWe1>y;2(51js9wbu+R3Aa*(wzH9+X0dIsf&gc_x|_LP z>~CF^?(~U}+l~ehe|i>?4eo!xkq&Lk+RR-1duNP#o~>@1x)s&i&u zRaYL@+D&_M|JLI6fHbEr_`U;HgPTh#E3?sB)A$*gqyBgg*ql|a-m*TX5rACbWKCE6 zdeQ`v8m6>g^ugv`p|HY^#1QZrGGUj0^HVDc@{?Q0yhalbBEV{+|HzC^-{&e{5K%z9 z6Bxtnfu1!@Mp+Q&*&~;FOg&*Vm<@4b;{FG0-!UUXX!|)1w}op!B_|7_s~d(+=9Gba zKp8`LaB4D(H=cGcspJ_TjYaOwMb=sGn^gtUVhK!UI~2KKYEE-NC}F>+BEY7IVvy%KRvm00tg!Q`y=er}wpEetX}K@;}(}{s9AzV#q2@ zBy7}->|N?13POrs`;U?(qAG(I$~Gt+Rgw%aNZ_0fs_utVvRJT-7z4!@x36v@=NBX=IqkK{#Kg0w48de@?#Yb4M(Svj5=T+<ONr8-oh7l?Cji@+erqur zFhZ=9|Lk=$`c}v4u`)-!!UI=!9Jo@h&7p4RlS#u! zZ7-prn75JkV?VjptX;@$#`U`{vB!=Z?V`T*FBF>J?vsML7e6@2GbUteMFfX-TUu{2 zLNIG*;dV)8GV8gAgEf#)X3A>p3^CRka1v?~8x^anBhQ=L=LsOl=&pcOYHo98m##ye z34MtGCDK!`ptl?taGMr5q{!zVc? zG00e){TV?`YA9eB;(lA3lXI?RrB4BYQGk?vOmTIUJED=(`_*gtn2DB-t4WW54as*W zb2kD-lWX>lb$+W!VFakki>B^Vc+u$?NLF>)!U%b@Y}gYJ>m2H=^x0=nsE0TF^Yu0h ztgH8-o1%+jCk(+&`|)tTfEVHq0cMeFa{Uz)X$;fCq%Y=SOWML6bYfeP8j5hktL`KK z(18`XrUn&WN9PtFxh&dX`y~YBsmdhi7Kw%tKzM%^VEhdD<_XkulW-x=JN6OPbFI4@ zzDDRN+f=@{0h*MswwOqG6gJ?{NuHx(y-|FUGsxyZ*x0~$MW(eY>vqq4Fh#t7uzw=- zKB?|!0N~!h^AMdLa)oR!Ca#HZ9&Zf)ghuO<^RN)4twRlygHnQG(BE{cDc5E}OF4;xss6gYyV~EcJvJkX)xNWb=@yw!uq0v-sf^rvkp-;?DPWK@*SEw|V;IH=7 zfQqEV_>DjOPT~8X*J|H8=&RnzK4~S7ML~nLX^%s-Vqc^aWy7N$y57qciZGcqy#=zU zs8hcHiI=D$+RB{|62{ohCTiaML6FI4Uhzo5D{Jik@poCs0w7F)*w}F4r0sJ~#u-72 z5bK=ANt=M$Dh5NKnxGsg9NRR?WD-x|FhTwBjd zD<-K>44DB~i%frJOfnzh1R>PRY34kw!6~p3M$JLaD1r@`=h)~Ngks-(gdXh^Q?BTP zZ^Zj5w1AwtuR2$~E7s9iZdF}z%pv1em^V2rM{1tLUY@-+Sc0(9jA|iZWml1;v13=U zHf?y@#mb--7z6$ue>`qjhE~brk$AY-RG90~5wcBbDReXR2)pKg{L>;H(DI`U!MLNQ zY9rFJP@ZQ}jlcMh%WSCo%vf+nd0Gmd*F%KMIe>slCUh)8Ma|;M_I+v#;|ueg9oLg; zq2HtZX%&#F7vdpNlkX?}(C7dGC^y#NB#m4%69RzTNrk%4ol~hSI%>2r6B|*ZkW(*P z;u#s;+faHo{tfy+1L^RzWDi*^JR0iY(zJDB36y_QJ+|E-2x+cY z!V8uLNktH~q>WQZuY!Ap66WP|E!0PA1jK~)^8oJVGbspJs6QL!!-5Qm7 zHYI|_`Actg?vDzdg5{86w@GS$G6ANzff7->6i5pB$T4O}`fZ_;{217Om0gN5zTr12 z5mW{hCzCE-QubjxN$TAE-XgI-8dTY@OZmq`y+y_>dk*(qXF0{nam|q@~i}Utp*k{yurq(DW54hkDT4bbg z=_etM?Nf5W^o-HEu9_?&xEqPg^P^mTxLH8n%u$!mWvFG|{&)jtnU&6|5-`~eaNz0%D1BDo`{ zS1N5(KW5v^2eLdd_%`uaRndF@h0Uo6=M|8?b~KbOLZk{HXEnGmtgZXf2inI*1r%n! zQ3&%RI4r{f&dwW~HwH0Ked9b!k6{>_19H z_Ai>5IChDMY(FfMyG%;30?SQ{iV9KyGru62+Y)~qSQ91}b~}w<&*}R&1c#$O`H@~c z5)2S_eXx}M#N{MuGeQS9@#UJB@;W_j50b}jIhxMPloEFQZdvwxiU^RYycTzgK)-vl3LT&$L8~@68$C8~5_U{cR$E#w*x65(qw&eoL@>%ZHvj zWnEMlSh*(o&oy|J7eJ5OD`ssy%F?*Vp?`Cq;FShyl{ZoKCG5g{y}>usznni#8ki(i zO{w@n{iAj1_ooX@+s*!uW60WcH~*bNOT6z%0jVML5};wVrQp~`Uss_{cO2oud_nNA8^B$?07fJ6?iI)Q zuo9G)O-z)DqstrBqf>B%S05hf-wep0@$BFHKSrkZ{za3D)yVzRz)2{wf8(Wp+xyAM z$rtyx$gi3A=V~V!`Q3;BM0$>*VVtxEM|xDL^gew7ydy3Q6YzD&THRz*q33Ms_D;M- zbCx1Ft#UNB)V3bf`~{ImI72OTp^|bF8?G8#FRj+Biy8ET5#rA3sd|0FR@U(LAJ%w8 zS1%n8Z=Amhw)92rIsof=YVWF4jw&F*j1LG@-`+cR0-~2LqXRH8(Ccne{y#MCPncF64U`0uO zWmi$dlii~1D0rLR{qc|_2M!C$t8^=G7xQY)9!#Y331A|>N)EhmyVdLWL9I3YLJ`7? zZmpqUJB>Ni9oiL)^1IK1UoMyhWE{$9M2M6Xi zPKk7GpMsA6vjZbU7~i+u|J6Nk|Ci!Y3UMUT2|`M;JsNQACdJ%ooo9Yt{?A+0hMpxi znEa~~sxC>rKrU6bd=WRb;%wsH>A#j4{({&1GYSNR57Gama(3)2A;SM>qop}l>Jk2* zn1+C$fIxuwzg3mCU#SOqb-wOCb6mBcYlA5+mt<&_J~sBxc(GQtBFINUO~Mr7<-uu($>P HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c9..9355b41557 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1339..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30dbde..9d21a21834 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## From 8bffe0db8db72c7d0ef1e3b1a1b4dc820edf3536 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:29:09 +0200 Subject: [PATCH 078/149] core 4.6.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9ca71c1b75..096d801a6f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -micronaut = "4.5.0" +micronaut = "4.6.1" micronaut-docs = "2.0.0" micronaut-test = "4.2.0" groovy = "4.0.15" From 26ac6be5cec40e7c247815e6af0e0e657ae7f43e Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:29:21 +0200 Subject: [PATCH 079/149] test 4.5.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 096d801a6f..6ee001a070 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] micronaut = "4.6.1" micronaut-docs = "2.0.0" -micronaut-test = "4.2.0" +micronaut-test = "4.5.0" groovy = "4.0.15" spock = "2.3-groovy-4.0" From ea44ce6dbbf1daf47ce8ee8ff9d752a3c04d268f Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:29:30 +0200 Subject: [PATCH 080/149] discovery 4.4.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6ee001a070..d4c737b127 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ fileupload = '0.0.6' jetty = '11.0.22' logback-json-classic = '0.1.5' -micronaut-discovery = "4.3.0" +micronaut-discovery = "4.4.0" micronaut-groovy = "4.3.0" micronaut-logging = "1.3.0" micronaut-mongodb = "5.3.0" From 79a2c63ecd5adb1f59384dda42595e10c9adb3b9 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:29:39 +0200 Subject: [PATCH 081/149] logging 1.4.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d4c737b127..3c550356a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ logback-json-classic = '0.1.5' micronaut-discovery = "4.4.0" micronaut-groovy = "4.3.0" -micronaut-logging = "1.3.0" +micronaut-logging = "1.4.0" micronaut-mongodb = "5.3.0" micronaut-reactor = "3.4.1" From ddfbe2e4f80f7b50e3beb19d2178a0af528a22fa Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:29:48 +0200 Subject: [PATCH 082/149] reactor 3.5.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c550356a1..2caccfa162 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ micronaut-discovery = "4.4.0" micronaut-groovy = "4.3.0" micronaut-logging = "1.4.0" micronaut-mongodb = "5.3.0" -micronaut-reactor = "3.4.1" +micronaut-reactor = "3.5.0" micronaut-security = "4.9.1" micronaut-serde = "2.10.2" From 709a5047332d88f4b03fad718b429ed730a4827a Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:29:59 +0200 Subject: [PATCH 083/149] serde 2.11.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2caccfa162..33dea4428e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,8 +17,8 @@ micronaut-mongodb = "5.3.0" micronaut-reactor = "3.5.0" micronaut-security = "4.9.1" -micronaut-serde = "2.10.2" micronaut-servlet = "4.9.3" +micronaut-serde = "2.11.0" micronaut-test-resources="2.5.4" micronaut-views = "5.4.4" micronaut-validation = "4.6.1" From f747b91d964d0ee67d0e0cb5ffe1c0a73981a82e Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:30:12 +0200 Subject: [PATCH 084/149] servlet 4.10.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33dea4428e..89fe683d06 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,8 +17,8 @@ micronaut-mongodb = "5.3.0" micronaut-reactor = "3.5.0" micronaut-security = "4.9.1" -micronaut-servlet = "4.9.3" micronaut-serde = "2.11.0" +micronaut-servlet = "4.10.0" micronaut-test-resources="2.5.4" micronaut-views = "5.4.4" micronaut-validation = "4.6.1" From e5340956d64fcd97410a41cf333e0c4c061d9442 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:30:22 +0200 Subject: [PATCH 085/149] validation 4.7.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 89fe683d06..07a2db4e9d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ micronaut-serde = "2.11.0" micronaut-servlet = "4.10.0" micronaut-test-resources="2.5.4" micronaut-views = "5.4.4" -micronaut-validation = "4.6.1" +micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.769' From 4f8e05aa839ca72005bb9c60dd2839a3ef097f0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:31:16 +0200 Subject: [PATCH 086/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.8 (#2164) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sergio del Amo --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 07a2db4e9d..bee4816f1d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.769' -managed-aws-java-sdk-v2 = '2.26.12' +managed-aws-java-sdk-v2 = '2.27.8' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.11.6' managed-aws-lambda-java-serialization = '1.1.5' From b3f85ce1de9c6f88debe75daf12a35af3cbafc3e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:31:31 +0200 Subject: [PATCH 087/149] fix(deps): update dependency com.amazonaws:aws-lambda-java-events to v3.13.0 (#2171) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bee4816f1d..78dff112c6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.769' managed-aws-java-sdk-v2 = '2.27.8' managed-aws-lambda = '1.2.3' -managed-aws-lambda-events = '3.11.6' +managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' aws-lambda-java-runtime-interface-client = '2.5.1' From 67aa0edeb2f6a78c63479748b7a3c6fc409c6ec4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:32:10 +0200 Subject: [PATCH 088/149] fix(deps): update dependency com.amazonaws:aws-lambda-java-runtime-interface-client to v2.6.0 (#2194) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sergio del Amo --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 78dff112c6..986be1587a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ managed-aws-java-sdk-v2 = '2.27.8' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' -aws-lambda-java-runtime-interface-client = '2.5.1' +aws-lambda-java-runtime-interface-client = '2.6.0' managed-aws-serverless-core = '1.9.3' micronaut-starter = "3.9.2" From 1b783fa6b6e50fb71b48f28ee8c59b49e2d0e4fa Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 12:37:18 +0200 Subject: [PATCH 089/149] Remove all --initialize-at-runtime flags that references bean definition classes --- .../native-image.properties | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 aws-sdk-v2/src/main/resources/META-INF/native-image/io.micronaut.aws/micronaut-aws-sdk-v2/native-image.properties diff --git a/aws-sdk-v2/src/main/resources/META-INF/native-image/io.micronaut.aws/micronaut-aws-sdk-v2/native-image.properties b/aws-sdk-v2/src/main/resources/META-INF/native-image/io.micronaut.aws/micronaut-aws-sdk-v2/native-image.properties deleted file mode 100644 index 2e6c5ea998..0000000000 --- a/aws-sdk-v2/src/main/resources/META-INF/native-image/io.micronaut.aws/micronaut-aws-sdk-v2/native-image.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright 2017-2021 original authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -Args = --initialize-at-run-time=io.micronaut.aws.sdk.v2.service.secretsmanager.$SecretsManagerClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.servicediscovery.$ServiceDiscoveryAsyncClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.servicediscovery.$ServiceDiscoveryAsyncClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.servicediscovery.$ServiceDiscoveryAsyncClientFactory$Definition,io.micronaut.aws.sdk.v2.service.ses.$SesClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.servicediscovery.$ServiceDiscoveryAsyncClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.servicediscovery.$ServiceDiscoveryAsyncClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.ses.$SesClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.ses.$SesClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.ses.$SesClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.ses.$SesClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.sns.$SnsClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.sns.$SnsClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.sns.$SnsClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.sqs.$SqsClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.sqs.$SqsClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.sns.$SnsClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.ssm.$SsmClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.ssm.$SsmClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.ssm.$SsmClientFactory$Definition,io.micronaut.aws.sdk.v2.service.sns.$SnsClientFactory$Definition,io.micronaut.aws.sdk.v2.service.dynamodb.$DynamoDbClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.dynamodb.$DynamoDbClientFactory$Definition,io.micronaut.aws.sdk.v2.service.secretsmanager.$SecretsManagerClientFactory$Definition,io.micronaut.aws.sdk.v2.service.secretsmanager.$SecretsManagerClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.ses.$SesClientFactory$Definition,io.micronaut.aws.sdk.v2.service.sqs.$SqsClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.sqs.$SqsClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.ssm.$SsmClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.ssm.$SsmClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.dynamodb.$DynamoDbClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.dynamodb.$DynamoDbClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.dynamodb.$DynamoDbClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.secretsmanager.$SecretsManagerClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.secretsmanager.$SecretsManagerClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.sqs.$SqsClientFactory$Definition,io.micronaut.aws.sdk.v2.service.s3.$S3ClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.s3.$S3ClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.s3.$S3ClientFactory$Definition,io.micronaut.aws.sdk.v2.service.s3.$S3ClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.s3.$S3ClientFactory$SyncClient1$Definition,io.micronaut.aws.sdk.v2.service.s3.$S3ClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.gatewaymanagement.$ApiGatewayManagementApiClientFactory$AsyncBuilder2$Definition,io.micronaut.aws.sdk.v2.service.gatewaymanagement.$ApiGatewayManagementApiClientFactory$AsyncClient3$Definition,io.micronaut.aws.sdk.v2.service.gatewaymanagement.$ApiGatewayManagementApiClientFactory$Definition,io.micronaut.aws.sdk.v2.service.gatewaymanagement.$ApiGatewayManagementApiClientFactory$SyncBuilder0$Definition,io.micronaut.aws.sdk.v2.service.gatewaymanagement.$ApiGatewayManagementApiClientFactory$SyncClient1$Definition From 1afd031a2a1c0dad8f90cf63cb0d156f44a8fac9 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 13:11:15 +0200 Subject: [PATCH 090/149] =?UTF-8?q?fix:=20don=E2=80=99t=20capture=20IOExce?= =?UTF-8?q?ption?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/aws/proxy/test/AwsApiProxyTestServer.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/AwsApiProxyTestServer.java b/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/AwsApiProxyTestServer.java index 7861ee7c9f..ae682c222b 100644 --- a/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/AwsApiProxyTestServer.java +++ b/function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/AwsApiProxyTestServer.java @@ -191,13 +191,7 @@ ApplicationContext getApplicationContext() { @Override public void destroy() { super.destroy(); - try { - this.lambdaHandler.close(); - } catch (IOException e) { - if (LOG.isErrorEnabled()) { - LOG.error("could not close Handler", e); - } - } + this.lambdaHandler.close(); } public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException { From ef85318f3b8e88bb5186083f953e90dda9d7bd46 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 13:20:32 +0200 Subject: [PATCH 091/149] tck: ignore ResponseStatusTest NoBodyResponseTest --- .../tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java | 2 ++ .../tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java | 2 ++ .../tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java | 2 ++ .../lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java | 1 + 4 files changed, 7 insertions(+) diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java index 30aaa93401..e285408def 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java @@ -16,6 +16,8 @@ "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", + "io.micronaut.http.server.tck.tests.NoBodyResponseTest", + "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest" }) @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy Application Load Balancer Event") diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java index 19a38ad4a0..2699c7ae5a 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java @@ -16,6 +16,8 @@ "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", + "io.micronaut.http.server.tck.tests.NoBodyResponseTest", + "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest" }) @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v1 Event model") diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java index 7241526e94..336d9a95ed 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java @@ -16,6 +16,8 @@ "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", + "io.micronaut.http.server.tck.tests.NoBodyResponseTest", + "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest" }) @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v2 Event model") diff --git a/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java index 805e205716..dbcb034341 100644 --- a/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java @@ -11,6 +11,7 @@ "io.micronaut.http.server.tck.lambda.tests" }) @ExcludeClassNamePatterns({ + "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest", "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.LocalErrorReadingBodyTest", // Binding body different type (e.g. a String in error handler) From d1df556d08c19ee1e67d8e7ce0753d1972bfc121 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Tue, 20 Aug 2024 13:39:31 +0200 Subject: [PATCH 092/149] ignore flaky tests --- .../function/client/aws/LocalFunctionInvokeSpec.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy index e1939521de..94a9dfc291 100644 --- a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy +++ b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy @@ -26,6 +26,7 @@ import io.micronaut.runtime.server.EmbeddedServer //tag::rxImport[] import org.reactivestreams.Publisher import reactor.core.publisher.Mono +import spock.lang.Ignore //end::rxImport[] import spock.lang.Specification @@ -34,6 +35,7 @@ import spock.lang.Specification * @author graemerocher * @since 1.0 */ +@Ignore("it is flaky https://ge.micronaut.io/scans/tests?tests.container=io.micronaut.function.client.aws.LocalFunctionInvokeSpec") class LocalFunctionInvokeSpec extends Specification { //tag::invokeLocalFunction[] From b1389bb2b6b127a1442baceb728892f60f1d64ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Duarte?= Date: Tue, 20 Aug 2024 15:02:59 +0100 Subject: [PATCH 093/149] Add Support for AWS Lambda Function SDK V2 (#2130) --- aws-sdk-v2/build.gradle.kts | 2 + .../service/lambda/LambdaClientFactory.java | 94 +++++++ .../sdk/v2/service/lambda/package-info.java | 28 ++ .../sdk/v2/service/LambdaClientSpec.groovy | 20 ++ function-client-aws-v2/build.gradle.kts | 28 ++ .../aws/v2/AwsInvokeRequestDefinition.java | 103 ++++++++ .../aws/v2/AwsLambdaFunctionExecutor.java | 155 +++++++++++ .../function/client/aws/v2/package-info.java | 22 ++ .../v2/AwsInvokeRequestDefinitionSpec.groovy | 32 +++ .../function/client/aws/v2/ComplexType.java | 33 +++ .../client/aws/v2/TestFunctionClient.java | 12 + .../aws/v2/TestFunctionClientRequest.java | 43 +++ .../aws/v2/TestFunctionClientResponse.java | 49 ++++ .../aws/v2/TestFunctionReactiveClient.java | 12 + .../client/aws/v2/TestFunctionSpec.groovy | 245 ++++++++++++++++++ .../resources/application-test.properties | 2 + .../src/test/resources/lambda/index.js | 17 ++ .../src/test/resources/logback.xml | 15 ++ function-client-aws/build.gradle.kts | 2 + .../client/aws/AwsLambdaInvokeSpec.groovy | 6 +- .../aws/LocalFunctionInvokeJavaSpec.java | 85 ------ .../aws/LocalFunctionInvokeJavaTest.java | 46 ++++ .../function/client/aws/MathClient.java | 14 + .../client/aws/ReactiveMathClient.java | 15 ++ .../micronaut/function/client/aws/Suma.java | 27 ++ gradle/libs.versions.toml | 7 + settings.gradle.kts | 4 + .../guide/lambda/lambdafunctionclient.adoc | 26 +- src/main/docs/guide/sdkv2/lambdaClient.adoc | 15 ++ src/main/docs/guide/toc.yml | 1 + .../build.gradle.kts | 23 ++ .../client/aws/AnalyticsClientSpec.groovy | 30 +++ .../client/aws/atnamed/AnalyticsClient.groovy | 9 + .../aws/methodnamed/AnalyticsClient.groovy | 8 + .../src/test/resources/application.properties | 1 + .../src/test/resources/logback.xml | 15 ++ .../build.gradle.kts | 32 +++ .../docs/function/aws/AnalyticsClientTest.kt | 25 ++ .../client/aws/atnamed/AnalyticsClient.kt | 10 + .../client/aws/methodnamed/AnalyticsClient.kt | 8 + .../src/test/resources/application.properties | 1 + .../src/test/resources/logback.xml | 15 ++ .../build.gradle.kts | 9 + .../function/aws/AnalyticsClientTest.java | 32 +++ .../client/aws/atnamed/AnalyticsClient.java | 10 + .../aws/methodnamed/AnalyticsClient.java | 8 + .../src/test/resources/application.yml | 8 + .../src/test/resources/logback.xml | 15 ++ test-suite-groovy/build.gradle.kts | 2 +- .../client/aws/AnalyticsClientSpec.groovy | 7 +- test-suite-kotlin/build.gradle.kts | 2 +- .../docs/function/aws/AnalyticsClientTest.kt | 6 +- test-suite/build.gradle.kts | 2 +- .../function/aws/AnalyticsClientTest.java | 6 +- .../src/test/resources/application.properties | 1 + 55 files changed, 1340 insertions(+), 105 deletions(-) create mode 100644 aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/LambdaClientFactory.java create mode 100644 aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/package-info.java create mode 100644 aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/service/LambdaClientSpec.groovy create mode 100644 function-client-aws-v2/build.gradle.kts create mode 100644 function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinition.java create mode 100644 function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsLambdaFunctionExecutor.java create mode 100644 function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/package-info.java create mode 100644 function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinitionSpec.groovy create mode 100644 function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/ComplexType.java create mode 100644 function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClient.java create mode 100644 function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientRequest.java create mode 100644 function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientResponse.java create mode 100644 function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionReactiveClient.java create mode 100644 function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionSpec.groovy create mode 100644 function-client-aws-v2/src/test/resources/application-test.properties create mode 100644 function-client-aws-v2/src/test/resources/lambda/index.js create mode 100644 function-client-aws-v2/src/test/resources/logback.xml delete mode 100644 function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeJavaSpec.java create mode 100644 function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java create mode 100644 function-client-aws/src/test/java/io/micronaut/function/client/aws/MathClient.java create mode 100644 function-client-aws/src/test/java/io/micronaut/function/client/aws/ReactiveMathClient.java create mode 100644 function-client-aws/src/test/java/io/micronaut/function/client/aws/Suma.java create mode 100644 src/main/docs/guide/sdkv2/lambdaClient.adoc create mode 100644 test-suite-function-client-aws-groovy/build.gradle.kts create mode 100644 test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy create mode 100644 test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.groovy create mode 100644 test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.groovy create mode 100644 test-suite-function-client-aws-groovy/src/test/resources/application.properties create mode 100644 test-suite-function-client-aws-groovy/src/test/resources/logback.xml create mode 100644 test-suite-function-client-aws-kotlin/build.gradle.kts create mode 100644 test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt create mode 100644 test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.kt create mode 100644 test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.kt create mode 100644 test-suite-function-client-aws-kotlin/src/test/resources/application.properties create mode 100644 test-suite-function-client-aws-kotlin/src/test/resources/logback.xml create mode 100644 test-suite-function-client-aws/build.gradle.kts create mode 100644 test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java create mode 100644 test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.java create mode 100644 test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.java create mode 100644 test-suite-function-client-aws/src/test/resources/application.yml create mode 100644 test-suite-function-client-aws/src/test/resources/logback.xml create mode 100644 test-suite/src/test/resources/application.properties diff --git a/aws-sdk-v2/build.gradle.kts b/aws-sdk-v2/build.gradle.kts index 7ea6a13001..aacc958d98 100644 --- a/aws-sdk-v2/build.gradle.kts +++ b/aws-sdk-v2/build.gradle.kts @@ -24,6 +24,7 @@ dependencies { compileOnly(libs.awssdk.secretsmanager) compileOnly(libs.awssdk.servicediscovery) compileOnly(libs.awssdk.cloudwatchlogs) + compileOnly(libs.awssdk.lambda) // Tests testAnnotationProcessor(mn.micronaut.inject.java) @@ -41,6 +42,7 @@ dependencies { testImplementation(libs.awssdk.sqs) testImplementation(libs.awssdk.ssm) testImplementation(libs.awssdk.rekognition) + testImplementation(libs.awssdk.lambda) testRuntimeOnly(libs.jcl.over.slf4j) testRuntimeOnly(mn.snakeyaml) diff --git a/aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/LambdaClientFactory.java b/aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/LambdaClientFactory.java new file mode 100644 index 0000000000..864ccce541 --- /dev/null +++ b/aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/LambdaClientFactory.java @@ -0,0 +1,94 @@ +/* + * Copyright 2017-2024 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.aws.sdk.v2.service.lambda; + +import io.micronaut.aws.sdk.v2.service.AWSServiceConfiguration; +import io.micronaut.aws.sdk.v2.service.AwsClientFactory; +import io.micronaut.aws.ua.UserAgentProvider; +import io.micronaut.context.annotation.Bean; +import io.micronaut.context.annotation.Factory; +import io.micronaut.context.annotation.Requires; +import io.micronaut.core.annotation.Nullable; +import jakarta.inject.Named; +import jakarta.inject.Singleton; +import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain; +import software.amazon.awssdk.http.SdkHttpClient; +import software.amazon.awssdk.http.async.SdkAsyncHttpClient; +import software.amazon.awssdk.regions.providers.AwsRegionProviderChain; +import software.amazon.awssdk.services.lambda.LambdaAsyncClient; +import software.amazon.awssdk.services.lambda.LambdaAsyncClientBuilder; +import software.amazon.awssdk.services.lambda.LambdaClient; +import software.amazon.awssdk.services.lambda.LambdaClientBuilder; + +/** + * Factory that creates {@link LambdaClient} and {@link LambdaAsyncClient}. + * @since 4.7.0 + */ +@Factory +class LambdaClientFactory extends AwsClientFactory { + /** + * Constructor. + * + * @param credentialsProvider The credentials provider + * @param regionProvider The region provider + * @param userAgentProvider User-Agent Provider + * @param awsServiceConfiguration AWS Service Configuration + */ + protected LambdaClientFactory(AwsCredentialsProviderChain credentialsProvider, + AwsRegionProviderChain regionProvider, + @Nullable UserAgentProvider userAgentProvider, + @Nullable @Named(LambdaClient.SERVICE_NAME) AWSServiceConfiguration awsServiceConfiguration) { + super(credentialsProvider, regionProvider, userAgentProvider, awsServiceConfiguration); + } + + @Override + protected LambdaClientBuilder createSyncBuilder() { + return LambdaClient.builder(); + } + + @Override + protected LambdaAsyncClientBuilder createAsyncBuilder() { + return LambdaAsyncClient.builder(); + } + + @Override + @Singleton + public LambdaClientBuilder syncBuilder(SdkHttpClient httpClient) { + return super.syncBuilder(httpClient); + } + + @Override + @Bean(preDestroy = "close") + @Singleton + public LambdaClient syncClient(LambdaClientBuilder builder) { + return super.syncClient(builder); + } + + @Override + @Singleton + @Requires(beans = SdkAsyncHttpClient.class) + public LambdaAsyncClientBuilder asyncBuilder(SdkAsyncHttpClient httpClient) { + return super.asyncBuilder(httpClient); + } + + @Override + @Bean(preDestroy = "close") + @Singleton + @Requires(beans = SdkAsyncHttpClient.class) + public LambdaAsyncClient asyncClient(LambdaAsyncClientBuilder builder) { + return super.asyncClient(builder); + } +} diff --git a/aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/package-info.java b/aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/package-info.java new file mode 100644 index 0000000000..5115d73a68 --- /dev/null +++ b/aws-sdk-v2/src/main/java/io/micronaut/aws/sdk/v2/service/lambda/package-info.java @@ -0,0 +1,28 @@ +/* + * Copyright 2017-2024 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * Lambda client factory. + * @author Luis Duarte + * @since 4.7.0 + */ +@Requires(classes = {LambdaClient.class, LambdaAsyncClient.class}) +@Configuration +package io.micronaut.aws.sdk.v2.service.lambda; + +import io.micronaut.context.annotation.Configuration; +import io.micronaut.context.annotation.Requires; +import software.amazon.awssdk.services.lambda.LambdaAsyncClient; +import software.amazon.awssdk.services.lambda.LambdaClient; diff --git a/aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/service/LambdaClientSpec.groovy b/aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/service/LambdaClientSpec.groovy new file mode 100644 index 0000000000..7966a9c683 --- /dev/null +++ b/aws-sdk-v2/src/test/groovy/io/micronaut/aws/sdk/v2/service/LambdaClientSpec.groovy @@ -0,0 +1,20 @@ +package io.micronaut.aws.sdk.v2.service + +import software.amazon.awssdk.services.lambda.LambdaAsyncClient +import software.amazon.awssdk.services.lambda.LambdaClient + +class LambdaClientSpec extends ServiceClientSpec { + @Override + protected String serviceName() { + return LambdaClient.SERVICE_NAME + } + + @Override + protected LambdaClient getClient() { + applicationContext.getBean(LambdaClient) + } + + protected LambdaAsyncClient getAsyncClient() { + applicationContext.getBean(LambdaAsyncClient) + } +} diff --git a/function-client-aws-v2/build.gradle.kts b/function-client-aws-v2/build.gradle.kts new file mode 100644 index 0000000000..def348e4c6 --- /dev/null +++ b/function-client-aws-v2/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + id("io.micronaut.build.internal.aws-module") +} + +dependencies { + api(projects.micronautAwsSdkV2) + implementation(libs.awssdk.lambda) + implementation(mn.reactor) + api(mn.micronaut.function.client) + testAnnotationProcessor(mn.micronaut.inject.java) + testImplementation(mn.micronaut.inject.java) + testImplementation(mnSerde.micronaut.serde.api) + testImplementation(mn.micronaut.http.server.netty) + testImplementation(mn.micronaut.function.web) + testImplementation(mnGroovy.micronaut.function.groovy) + testImplementation(mnGroovy.micronaut.runtime.groovy) + testImplementation(platform(mnTestResources.boms.testcontainers)) + testImplementation(libs.testcontainers) + testImplementation(libs.testcontainers.localstack) + testImplementation(libs.testcontainers.spock) + testImplementation(libs.awssdk.iam) +} +micronautBuild { + // new module, so no binary check + binaryCompatibility { + enabled.set(false) + } +} diff --git a/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinition.java b/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinition.java new file mode 100644 index 0000000000..82b70fceb1 --- /dev/null +++ b/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinition.java @@ -0,0 +1,103 @@ +/* + * Copyright 2017-2020 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.function.client.aws.v2; + +import io.micronaut.context.annotation.EachProperty; +import io.micronaut.context.annotation.Parameter; +import io.micronaut.function.client.FunctionDefinition; + +/** + * Builds an {@link AwsInvokeRequestDefinition} for each definition under {@code aws.lambda.functions}. + * + * @since 4.7.0 + */ +@EachProperty(AwsInvokeRequestDefinition.AWS_LAMBDA_FUNCTIONS) +public class AwsInvokeRequestDefinition implements FunctionDefinition { + /** + * Configuration prefix. + */ + public static final String AWS_LAMBDA_FUNCTIONS = "aws.lambda.functions"; + + private final String name; + + private String functionName; + + private String qualifier; + + private String clientContext; + + /** + * Constructor. + * + * @param name configured name from a property + */ + public AwsInvokeRequestDefinition(@Parameter String name) { + this.name = name; + } + + @Override + public String getName() { + return this.name; + } + + /** + * + * @return The name or ARN of the Lambda function, version, or alias. + */ + public String getFunctionName() { + return functionName; + } + + /** + * + * @param functionName The name or ARN of the Lambda function, version, or alias. + */ + public void setFunctionName(String functionName) { + this.functionName = functionName; + } + + /** + * + * @return Specify a version or alias to invoke a published version of the function. + */ + public String getQualifier() { + return qualifier; + } + + /** + * {@see software.amazon.awssdk.services.lambda.model.InvokeRequest#clientContext}. + * @return Up to 3,583 bytes of base64-encoded data about the invoking client to pass to the function in the context object. + */ + public String getClientContext() { + return clientContext; + } + + /** + * {@see software.amazon.awssdk.services.lambda.model.InvokeRequest#qualifier}. + * @param qualifier Specify a version or alias to invoke a published version of the function. + */ + public void setQualifier(String qualifier) { + this.qualifier = qualifier; + } + + /** + * + * @param clientContext Up to 3,583 bytes of base64-encoded data about the invoking client to pass to the function in the context object. + */ + public void setClientContext(String clientContext) { + this.clientContext = clientContext; + } +} diff --git a/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsLambdaFunctionExecutor.java b/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsLambdaFunctionExecutor.java new file mode 100644 index 0000000000..9c3ce5b247 --- /dev/null +++ b/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/AwsLambdaFunctionExecutor.java @@ -0,0 +1,155 @@ +/* + * Copyright 2017-2020 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.function.client.aws.v2; + +import io.micronaut.context.annotation.Requires; +import io.micronaut.core.annotation.Internal; +import io.micronaut.core.async.publisher.Publishers; +import io.micronaut.core.convert.ConversionService; +import io.micronaut.core.io.buffer.ByteBufferFactory; +import io.micronaut.core.type.Argument; +import io.micronaut.function.client.FunctionDefinition; +import io.micronaut.function.client.FunctionInvoker; +import io.micronaut.function.client.FunctionInvokerChooser; +import io.micronaut.function.client.exceptions.FunctionExecutionException; +import io.micronaut.json.codec.JsonMediaTypeCodec; +import io.micronaut.scheduling.TaskExecutors; +import jakarta.inject.Named; +import jakarta.inject.Singleton; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Schedulers; +import software.amazon.awssdk.core.SdkBytes; +import software.amazon.awssdk.services.lambda.LambdaAsyncClient; +import software.amazon.awssdk.services.lambda.LambdaClient; +import software.amazon.awssdk.services.lambda.model.InvokeRequest; +import software.amazon.awssdk.services.lambda.model.InvokeResponse; + +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.concurrent.ExecutorService; + +/** + * A {@link FunctionInvoker} for invoking functions on AWS. + * + * @param input type + * @param output type + * @author graemerocher + * @since 1.0 + */ +@Requires(beans = LambdaAsyncClient.class) +@Singleton +@Internal +public class AwsLambdaFunctionExecutor implements FunctionInvoker, FunctionInvokerChooser { + + private static final int STATUS_CODE_ERROR = 300; + private final LambdaClient syncClient; + private final LambdaAsyncClient asyncClient; + private final ByteBufferFactory byteBufferFactory; + private final JsonMediaTypeCodec mediaTypeCodec; + private final ExecutorService executor; + private final ConversionService conversionService; + + /** + * Constructor. + * + * @param syncClient Lambda Sync Client + * @param asyncClient Lambda Async Client + * @param byteBufferFactory byteBufferFactory + * @param mediaTypeCodec JsonMediaTypeCodec + * @param executor blocking executor + * @param conversionService ConversionService + */ + protected AwsLambdaFunctionExecutor( + LambdaClient syncClient, + LambdaAsyncClient asyncClient, + ByteBufferFactory byteBufferFactory, + JsonMediaTypeCodec mediaTypeCodec, + @Named(TaskExecutors.BLOCKING) ExecutorService executor, + ConversionService conversionService) { + this.syncClient = syncClient; + this.asyncClient = asyncClient; + this.byteBufferFactory = byteBufferFactory; + this.mediaTypeCodec = mediaTypeCodec; + this.executor = executor; + this.conversionService = conversionService; + } + + @Override + public O invoke(FunctionDefinition definition, I input, Argument outputType) { + if (!(definition instanceof AwsInvokeRequestDefinition)) { + throw new IllegalArgumentException("Function definition must be a AWSInvokeRequestDefinition"); + } + + boolean isReactiveType = Publishers.isConvertibleToPublisher(outputType.getType()); + SdkBytes sdkBytes = encodeInput(input); + AwsInvokeRequestDefinition awsInvokeRequestDefinition = (AwsInvokeRequestDefinition) definition; + InvokeRequest invokeRequest = createInvokeRequest(awsInvokeRequestDefinition, sdkBytes); + + if (isReactiveType) { + Mono invokeFlowable = Mono.fromFuture(asyncClient.invoke(invokeRequest)) + .map(invokeResult -> + decodeResult(definition, (Argument) outputType.getFirstTypeVariable().orElse(Argument.OBJECT_ARGUMENT), invokeResult)) + .onErrorResume(throwable -> Mono.error(new FunctionExecutionException("Error executing AWS Lambda [" + definition.getName() + "]: " + throwable.getMessage(), throwable))) + .subscribeOn(Schedulers.fromExecutor(executor)); + return conversionService.convert(invokeFlowable, outputType).orElseThrow(() -> new IllegalArgumentException("Unsupported Reactive type: " + outputType)); + + } else { + InvokeResponse invokeResult = syncClient.invoke(invokeRequest); + try { + return (O) decodeResult(definition, outputType, invokeResult); + } catch (Exception e) { + throw new FunctionExecutionException("Error executing AWS Lambda [" + definition.getName() + "]: " + e.getMessage(), e); + } + } + } + + private InvokeRequest createInvokeRequest(AwsInvokeRequestDefinition awsInvokeRequestDefinition, + SdkBytes sdkBytes) { + return InvokeRequest.builder() + .functionName(awsInvokeRequestDefinition.getFunctionName()) + .qualifier(awsInvokeRequestDefinition.getQualifier()) + .clientContext(awsInvokeRequestDefinition.getClientContext()) + .payload(sdkBytes) + .build(); + } + + private Object decodeResult(FunctionDefinition definition, Argument outputType, InvokeResponse invokeResult) { + Integer statusCode = invokeResult.statusCode(); + if (statusCode >= STATUS_CODE_ERROR) { + throw new FunctionExecutionException("Error executing AWS Lambda [" + definition.getName() + "]: " + invokeResult.functionError()); + } + io.micronaut.core.io.buffer.ByteBuffer byteBuffer = byteBufferFactory.copiedBuffer(invokeResult.payload().asByteArray()); + + return mediaTypeCodec.decode(outputType, byteBuffer); + } + + private SdkBytes encodeInput(I input) { + if (input != null) { + ByteBuffer nioBuffer = mediaTypeCodec.encode(input, byteBufferFactory).asNioBuffer(); + return SdkBytes.fromByteBuffer(nioBuffer); + } + return null; + } + + @SuppressWarnings("unchecked") + @Override + public Optional> choose(FunctionDefinition definition) { + if (definition instanceof AwsInvokeRequestDefinition) { + return Optional.of((FunctionInvoker) this); + } + return Optional.empty(); + } +} diff --git a/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/package-info.java b/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/package-info.java new file mode 100644 index 0000000000..25270c3b6e --- /dev/null +++ b/function-client-aws-v2/src/main/java/io/micronaut/function/client/aws/v2/package-info.java @@ -0,0 +1,22 @@ +/* + * Copyright 2017-2024 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * AWS Lambda Function Client related classes. + * + * @since 4.7.0 + */ +package io.micronaut.function.client.aws.v2; + diff --git a/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinitionSpec.groovy b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinitionSpec.groovy new file mode 100644 index 0000000000..463cc03a70 --- /dev/null +++ b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/AwsInvokeRequestDefinitionSpec.groovy @@ -0,0 +1,32 @@ +package io.micronaut.function.client.aws.v2 + +import io.micronaut.context.annotation.Property +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import jakarta.inject.Inject +import spock.lang.Specification + +@Property(name = "aws.lambda.functions.foo.function-name", value = "x-function-name") +@Property(name = "aws.lambda.functions.foo.qualifier", value = "x-qualifier") +@Property(name = "aws.lambda.functions.foo.client-context", value = "x-client-context") +@Property(name = "aws.lambda.functions.bar.function-name", value = "z-function-name") +@Property(name = "aws.lambda.functions.bar.qualifier", value = "z-qualifier") +@Property(name = "aws.lambda.functions.bar.client-context", value = "z-client-context") +@MicronautTest +class AwsInvokeRequestDefinitionSpec extends Specification { + + @Inject + List awsInvokeRequestDefinitions + + void "test aws invoke request"() { + expect: + awsInvokeRequestDefinitions.find { it.name == 'foo' }.name == 'foo' + awsInvokeRequestDefinitions.find { it.name == 'foo' }.functionName == "x-function-name" + awsInvokeRequestDefinitions.find { it.name == 'foo' }.qualifier == "x-qualifier" + awsInvokeRequestDefinitions.find { it.name == 'foo' }.clientContext == "x-client-context" + + awsInvokeRequestDefinitions.find { it.name == 'bar' }.name == 'bar' + awsInvokeRequestDefinitions.find { it.name == 'bar' }.functionName == "z-function-name" + awsInvokeRequestDefinitions.find { it.name == 'bar' }.qualifier == "z-qualifier" + awsInvokeRequestDefinitions.find { it.name == 'bar' }.clientContext == "z-client-context" + } +} diff --git a/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/ComplexType.java b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/ComplexType.java new file mode 100644 index 0000000000..27b8f5dc1f --- /dev/null +++ b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/ComplexType.java @@ -0,0 +1,33 @@ +package io.micronaut.function.client.aws.v2; + +import io.micronaut.serde.annotation.Serdeable; + +@Serdeable +public class ComplexType { + private int aNumber; + private String aString; + + public ComplexType() { + } + + public ComplexType(int aNumber, String aString) { + this.aNumber = aNumber; + this.aString = aString; + } + + public int getaNumber() { + return aNumber; + } + + public void setaNumber(int aNumber) { + this.aNumber = aNumber; + } + + public String getaString() { + return aString; + } + + public void setaString(String aString) { + this.aString = aString; + } +} diff --git a/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClient.java b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClient.java new file mode 100644 index 0000000000..a2e5bde7a9 --- /dev/null +++ b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClient.java @@ -0,0 +1,12 @@ +package io.micronaut.function.client.aws.v2; + +import io.micronaut.function.client.FunctionClient; +import io.micronaut.http.annotation.Body; +import jakarta.inject.Named; + +@FunctionClient +public interface TestFunctionClient { + + @Named("test-function") + TestFunctionClientResponse invokeFunction(@Body TestFunctionClientRequest request); +} diff --git a/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientRequest.java b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientRequest.java new file mode 100644 index 0000000000..0e8fc403f4 --- /dev/null +++ b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientRequest.java @@ -0,0 +1,43 @@ +package io.micronaut.function.client.aws.v2; + +import io.micronaut.serde.annotation.Serdeable; + +@Serdeable +public class TestFunctionClientRequest { + private int aNumber; + private String aString; + private ComplexType aObject; + + public TestFunctionClientRequest() { + } + + public TestFunctionClientRequest(int aNumber, String aString, ComplexType aObject) { + this.aNumber = aNumber; + this.aString = aString; + this.aObject = aObject; + } + + public int getaNumber() { + return aNumber; + } + + public void setaNumber(int aNumber) { + this.aNumber = aNumber; + } + + public String getaString() { + return aString; + } + + public void setaString(String aString) { + this.aString = aString; + } + + public ComplexType getaObject() { + return aObject; + } + + public void setaObject(ComplexType aObject) { + this.aObject = aObject; + } +} diff --git a/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientResponse.java b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientResponse.java new file mode 100644 index 0000000000..2319714358 --- /dev/null +++ b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionClientResponse.java @@ -0,0 +1,49 @@ +package io.micronaut.function.client.aws.v2; + +import io.micronaut.serde.annotation.Serdeable; + +import java.util.List; + +@Serdeable +public class TestFunctionClientResponse { + private int aNumber; + private String aString; + private ComplexType aObject; + private List anArray; + + public TestFunctionClientResponse() { + + } + + public int getaNumber() { + return aNumber; + } + + public void setaNumber(int aNumber) { + this.aNumber = aNumber; + } + + public String getaString() { + return aString; + } + + public void setaString(String aString) { + this.aString = aString; + } + + public ComplexType getaObject() { + return aObject; + } + + public void setaObject(ComplexType aObject) { + this.aObject = aObject; + } + + public List getAnArray() { + return anArray; + } + + public void setAnArray(List anArray) { + this.anArray = anArray; + } +} diff --git a/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionReactiveClient.java b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionReactiveClient.java new file mode 100644 index 0000000000..d61afb647b --- /dev/null +++ b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionReactiveClient.java @@ -0,0 +1,12 @@ +package io.micronaut.function.client.aws.v2; + +import io.micronaut.function.client.FunctionClient; +import io.micronaut.http.annotation.Body; +import jakarta.inject.Named; +import org.reactivestreams.Publisher; + +@FunctionClient +public interface TestFunctionReactiveClient { + @Named("test-function-reactive") + Publisher invokeFunctionReactive(@Body TestFunctionClientRequest request); +} diff --git a/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionSpec.groovy b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionSpec.groovy new file mode 100644 index 0000000000..03f8a4465d --- /dev/null +++ b/function-client-aws-v2/src/test/groovy/io/micronaut/function/client/aws/v2/TestFunctionSpec.groovy @@ -0,0 +1,245 @@ +package io.micronaut.function.client.aws.v2 + +import io.micronaut.core.io.ResourceLoader +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import io.micronaut.test.support.TestPropertyProvider +import jakarta.inject.Inject +import org.testcontainers.containers.localstack.LocalStackContainer +import org.testcontainers.spock.Testcontainers +import org.testcontainers.utility.DockerImageName +import reactor.core.publisher.Mono +import software.amazon.awssdk.auth.credentials.AwsBasicCredentials +import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain +import software.amazon.awssdk.core.SdkBytes +import software.amazon.awssdk.regions.Region +import software.amazon.awssdk.services.iam.IamClient +import software.amazon.awssdk.services.iam.model.AttachRolePolicyRequest +import software.amazon.awssdk.services.iam.model.CreatePolicyRequest +import software.amazon.awssdk.services.iam.model.CreateRoleRequest +import software.amazon.awssdk.services.iam.model.GetPolicyRequest +import software.amazon.awssdk.services.iam.model.GetRoleRequest +import software.amazon.awssdk.services.iam.model.Role +import software.amazon.awssdk.services.iam.waiters.IamWaiter +import software.amazon.awssdk.services.lambda.LambdaClient +import software.amazon.awssdk.services.lambda.model.Architecture +import software.amazon.awssdk.services.lambda.model.CreateFunctionRequest +import software.amazon.awssdk.services.lambda.model.DeleteFunctionRequest +import software.amazon.awssdk.services.lambda.model.FunctionCode +import software.amazon.awssdk.services.lambda.model.GetFunctionConfigurationRequest +import software.amazon.awssdk.services.lambda.model.Runtime +import software.amazon.awssdk.services.lambda.model.GetFunctionRequest +import software.amazon.awssdk.services.lambda.model.LambdaRequest +import spock.lang.Shared +import spock.lang.Specification + +import java.nio.file.Files +import java.nio.file.Path +import java.util.zip.ZipEntry +import java.util.zip.ZipOutputStream + +import static org.testcontainers.containers.localstack.LocalStackContainer.Service.IAM +import static org.testcontainers.containers.localstack.LocalStackContainer.Service.LAMBDA + +@Testcontainers +@MicronautTest +class TestFunctionSpec extends Specification implements TestPropertyProvider { + + private static final String FUNCTION_NAME = "TEST_FUNCTION_NAME" + + @Shared + private LocalStackContainer localStackContainer = new LocalStackContainer(DockerImageName + .parse("localstack/localstack:3.4.0")) + .withServices(IAM, LAMBDA) + + @Inject + @Shared + LambdaClient lambdaClient + + @Inject + @Shared + ResourceLoader resourceLoader + + @Override + Map getProperties() { + Map.of( + "aws.access-key-id", localStackContainer.getAccessKey(), + "aws.secret-key", localStackContainer.getSecretKey(), + "aws.region", localStackContainer.getRegion(), + "aws.services.lambda.endpoint-override", localStackContainer.getEndpointOverride(LAMBDA).toString() + ) as Map + } + + @Inject + TestFunctionClient functionClient + + @Inject + TestFunctionReactiveClient testFunctionReactiveClient + + def setupSpec() { + try { + lambdaClient.getFunction(GetFunctionRequest.builder() + .functionName(FUNCTION_NAME) + .build()) + } catch(Exception e) { + // Create if not exists + byte[] bytes = lambdaBytes(resourceLoader) + LambdaRequest lambdaRequest = createFunctionRequest(bytes) + if (lambdaRequest instanceof CreateFunctionRequest) { + def waiter = lambdaClient.waiter() + + def function = lambdaClient.createFunction((CreateFunctionRequest) lambdaRequest) + waiter.waitUntilFunctionExists(GetFunctionRequest.builder() + .functionName(function.functionName()) + .build()) + GetFunctionConfigurationRequest getFunctionConfigurationRequest = + GetFunctionConfigurationRequest.builder().functionName(function.functionName()).build() + waiter.waitUntilFunctionActive(getFunctionConfigurationRequest) + } + } + } + + def "can invoke a JS Lambda function with the an @FunctionClient"() { + given: + Integer aNumber = 1 + String aString = "someString" + + when: + TestFunctionClientResponse result = functionClient + .invokeFunction(new TestFunctionClientRequest(aNumber, aString, new ComplexType(aNumber, aString))) + + then: + result.aNumber == aNumber + result.aString == aString + result.aObject + result.aObject.aNumber == aNumber + result.aObject.aString == aString + result.anArray.size() == 1 + result.anArray[0].aNumber == aNumber + result.anArray[0].aString == aString + } + + def "can invoke a JS Lambda function with the an @FunctionClient wtih reactive types"() { + given: + Integer aNumber = 1 + String aString = "someString" + when: + TestFunctionClientResponse result = Mono.from(testFunctionReactiveClient.invokeFunctionReactive(new TestFunctionClientRequest(aNumber, aString, new ComplexType(aNumber, aString)))).block() + + then: + result.aNumber == aNumber + result.aString == aString + result.aObject + result.aObject.aNumber == aNumber + result.aObject.aString == aString + result.anArray.size() == 1 + result.anArray[0].aNumber == aNumber + result.anArray[0].aString == aString + } + + private byte[] lambdaBytes(ResourceLoader resourceLoader) { + try (InputStream inputStream = resourceLoader.getResourceAsStream("classpath:lambda/index.js").orElseThrow()) { + byte[] fileBytes = inputStream.readAllBytes() + Path tempFile = Files.createTempFile(FUNCTION_NAME, ".zip"); + try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(tempFile))) { + ZipEntry zipEntry = new ZipEntry("index.js") + zos.putNextEntry(zipEntry) + zos.write(fileBytes) + zos.closeEntry() + } + return Files.readAllBytes(tempFile); + } + } + + private Role getLambdaRole() { + def iamClient = IamClient.builder() + .region(Region.of(localStackContainer.getRegion())) + .credentialsProvider(AwsCredentialsProviderChain.of( + () -> AwsBasicCredentials.create(localStackContainer.getAccessKey(), localStackContainer.getSecretKey()) + )) + .endpointOverride(localStackContainer.getEndpointOverride(IAM)) + .build() + def roleName = "lambda-role"; + try { + return iamClient.getRole(GetRoleRequest.builder() + .roleName(roleName) + .build()).role(); + } catch (final Exception e) { + // Create if not exists + IamWaiter iamWaiter = iamClient.waiter(); + + CreatePolicyRequest request = CreatePolicyRequest.builder() + .policyName("lambda-invoke-policy") + .policyDocument(""" + { + "Version": "2012-10-17", + "Statement": [ + { + "Sid": "LambdaInvoke", + "Effect": "Allow", + "Action": [ + "lambda:InvokeFunction" + ], + "Resource": "*" + } + ] + } + """.stripIndent()) + .build(); + + def policy = iamClient.createPolicy(request) + iamWaiter.waitUntilPolicyExists(GetPolicyRequest.builder() + .policyArn(policy.policy().arn()) + .build()); + + def role = iamClient.createRole(CreateRoleRequest.builder() + .roleName(roleName) + .path("/") + .assumeRolePolicyDocument(""" + { + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + }, + "Action": "sts:AssumeRole" + } + ] + } + """.stripIndent()) + .build()) + + iamWaiter.waitUntilRoleExists(GetRoleRequest.builder() + .roleName(role.role().roleName()) + .build()) + + iamClient.attachRolePolicy(AttachRolePolicyRequest.builder() + .roleName(role.role().roleName()) + .policyArn(policy.policy().arn()) + .build()) + + return role.role(); + } + } + + private LambdaRequest createFunctionRequest(byte[] arr) { + def role = getLambdaRole() + CreateFunctionRequest.builder() + .functionName(FUNCTION_NAME) + .role(role.arn()) + .code(FunctionCode.builder() + .zipFile(SdkBytes.fromByteArray(arr)) + .build()) + .runtime(Runtime.NODEJS18_X) + .architectures(Architecture.X86_64) + .handler("index.handler") + .build() + } + + private LambdaRequest deleteFunctionRequest() { + DeleteFunctionRequest.builder() + .functionName(FUNCTION_NAME) + .build() + } +} diff --git a/function-client-aws-v2/src/test/resources/application-test.properties b/function-client-aws-v2/src/test/resources/application-test.properties new file mode 100644 index 0000000000..cdaf3278ec --- /dev/null +++ b/function-client-aws-v2/src/test/resources/application-test.properties @@ -0,0 +1,2 @@ +aws.lambda.functions.test-function.function-name=TEST_FUNCTION_NAME +aws.lambda.functions.test-function-reactive.function-name=TEST_FUNCTION_NAME diff --git a/function-client-aws-v2/src/test/resources/lambda/index.js b/function-client-aws-v2/src/test/resources/lambda/index.js new file mode 100644 index 0000000000..a9c8b20423 --- /dev/null +++ b/function-client-aws-v2/src/test/resources/lambda/index.js @@ -0,0 +1,17 @@ +exports.handler = async (event, context) => { + if (!event.aNumber || !event.aString || !event.aObject || !event.aObject.aNumber || !event.aObject.aString) { + throw new Error('Invalid Input'); + } + + const arr = []; + arr.push(event.aObject); + + const response = { + aNumber: event.aNumber, + aString: event.aString, + aObject: event.aObject, + anArray: arr, + }; + + return response +}; diff --git a/function-client-aws-v2/src/test/resources/logback.xml b/function-client-aws-v2/src/test/resources/logback.xml new file mode 100644 index 0000000000..80dcc40c8d --- /dev/null +++ b/function-client-aws-v2/src/test/resources/logback.xml @@ -0,0 +1,15 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/function-client-aws/build.gradle.kts b/function-client-aws/build.gradle.kts index 244c91d7e2..8f332dc738 100644 --- a/function-client-aws/build.gradle.kts +++ b/function-client-aws/build.gradle.kts @@ -14,4 +14,6 @@ dependencies { testImplementation(mn.micronaut.function.web) testImplementation(mnGroovy.micronaut.function.groovy) testImplementation(mnGroovy.micronaut.runtime.groovy) + testImplementation(mnTest.micronaut.test.junit5) + testRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy index f3c7112f6c..3e4ad30705 100644 --- a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy +++ b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy @@ -73,7 +73,7 @@ class AwsLambdaInvokeSpec extends Specification { void "test setup lambda config"() { given: ApplicationContext applicationContext = ApplicationContext.run( - 'aws.lambda.functions.test.functionName':'micronaut-function', + 'aws.lambda.functions.test.function-name':'micronaut-function', 'aws.lambda.functions.test.qualifier':'something', 'aws.lambda.region':'us-east-1' ) @@ -94,7 +94,7 @@ class AwsLambdaInvokeSpec extends Specification { void "test invoke function"() { given: ApplicationContext applicationContext = ApplicationContext.run( - 'aws.lambda.functions.test.functionName':'micronaut-function', + 'aws.lambda.functions.test.function-name':'micronaut-function', 'aws.lambda.region':'us-east-1' ) @@ -123,7 +123,7 @@ class AwsLambdaInvokeSpec extends Specification { void "test invoke client with @FunctionClient"() { given: ApplicationContext applicationContext = ApplicationContext.run( - 'aws.lambda.functions.test.functionName':'micronaut-function', + 'aws.lambda.functions.test.function-name':'micronaut-function', 'aws.lambda.region':'us-east-1' ) diff --git a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeJavaSpec.java b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeJavaSpec.java deleted file mode 100644 index 7e3dbb7bcc..0000000000 --- a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeJavaSpec.java +++ /dev/null @@ -1,85 +0,0 @@ -package io.micronaut.function.client.aws; - -//tag::import[] -import io.micronaut.context.ApplicationContext; -import io.micronaut.function.client.FunctionClient; -import jakarta.inject.Named; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -//end::rxImport[] -//end::import[] - -import io.micronaut.runtime.server.EmbeddedServer; -import org.reactivestreams.Publisher; -import reactor.core.publisher.Mono; -//tag::rxImport[] - -public class LocalFunctionInvokeJavaSpec { - - //tag::invokeLocalFunction[] - @Test - public void testInvokingALocalFunction() { - Sum sum = new Sum(); - sum.setA(5); - sum.setB(10); - - EmbeddedServer server = ApplicationContext.run(EmbeddedServer.class); - MathClient mathClient = server.getApplicationContext().getBean(MathClient.class); - - assertEquals(Long.valueOf(Integer.MAX_VALUE), mathClient.max()); - assertEquals(2, mathClient.rnd(1.6f)); - assertEquals(15, mathClient.sum(sum)); - - } - //end::invokeLocalFunction[] - - //tag::invokeRxLocalFunction[] - @Test - public void testInvokingALocalFunctionRX() { - Sum sum = new Sum(); - sum.setA(5); - sum.setB(10); - - EmbeddedServer server = ApplicationContext.run(EmbeddedServer.class); - ReactiveMathClient mathClient = server.getApplicationContext().getBean(ReactiveMathClient.class); - - assertEquals(Long.valueOf(Integer.MAX_VALUE), mathClient.max().block()); - assertEquals(2, mathClient.rnd(1.6f).block().longValue()); - assertEquals(15, mathClient.sum(sum).block().longValue()); - - } - //end::invokeRxLocalFunction[] - - //tag::beginFunctionClient[] - @FunctionClient - interface MathClient { - //end::beginFunctionClient[] - - //tag::functionMax[] - Long max(); //<1> - //end::functionMax[] - - //tag::functionRnd[] - @Named("round") - int rnd(float value); - //end::functionRnd[] - - long sum(Sum sum); - //tag::endFunctionClient[] - } - //end::endFunctionClient[] - - - //tag::rxFunctionClient[] - @FunctionClient - interface ReactiveMathClient { - Mono max(); - - @Named("round") - Mono rnd(float value); - - Mono sum(Sum sum); - } - //end::rxFunctionClient[] -} diff --git a/function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java b/function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java new file mode 100644 index 0000000000..6d927c824a --- /dev/null +++ b/function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java @@ -0,0 +1,46 @@ +package io.micronaut.function.client.aws; + +import io.micronaut.context.ApplicationContext; +import static org.junit.Assert.assertEquals; +import io.micronaut.runtime.server.EmbeddedServer; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import spock.lang.Ignore; + +class LocalFunctionInvokeJavaTest { + + @Disabled("it is flaky https://ge.micronaut.io/scans/tests?tests.container=io.micronaut.function.client.aws.LocalFunctionInvokeSpec") + @Test + void testInvokingALocalFunction() { + Suma sum = new Suma(); + sum.setA(5); + sum.setB(10); + + EmbeddedServer server = ApplicationContext.run(EmbeddedServer.class); + MathClient mathClient = server.getApplicationContext().getBean(MathClient.class); + + assertEquals(Long.valueOf(Integer.MAX_VALUE), mathClient.max()); + assertEquals(2, mathClient.rnd(1.6f)); + assertEquals(15, mathClient.sum(sum)); + + server.close(); + } + + @Disabled("it is flaky https://ge.micronaut.io/scans/tests?tests.container=io.micronaut.function.client.aws.LocalFunctionInvokeSpec") + @Test + void testInvokingALocalFunctionRX() { + Suma sum = new Suma(); + sum.setA(5); + sum.setB(10); + + EmbeddedServer server = ApplicationContext.run(EmbeddedServer.class); + ReactiveMathClient mathClient = server.getApplicationContext().getBean(ReactiveMathClient.class); + + assertEquals(Long.valueOf(Integer.MAX_VALUE), Mono.from(mathClient.max()).block()); + assertEquals(2, Mono.from(mathClient.rnd(1.6f)).block().longValue()); + assertEquals(15, Mono.from(mathClient.sum(sum)).block().longValue()); + + server.close(); + } +} diff --git a/function-client-aws/src/test/java/io/micronaut/function/client/aws/MathClient.java b/function-client-aws/src/test/java/io/micronaut/function/client/aws/MathClient.java new file mode 100644 index 0000000000..5a29aca59c --- /dev/null +++ b/function-client-aws/src/test/java/io/micronaut/function/client/aws/MathClient.java @@ -0,0 +1,14 @@ +package io.micronaut.function.client.aws; + +import io.micronaut.function.client.FunctionClient; +import jakarta.inject.Named; + +@FunctionClient +interface MathClient { + Long max(); + + @Named("round") + int rnd(float value); + + long sum(Suma sum); +} diff --git a/function-client-aws/src/test/java/io/micronaut/function/client/aws/ReactiveMathClient.java b/function-client-aws/src/test/java/io/micronaut/function/client/aws/ReactiveMathClient.java new file mode 100644 index 0000000000..890b3260e7 --- /dev/null +++ b/function-client-aws/src/test/java/io/micronaut/function/client/aws/ReactiveMathClient.java @@ -0,0 +1,15 @@ +package io.micronaut.function.client.aws; + +import io.micronaut.function.client.FunctionClient; +import jakarta.inject.Named; +import org.reactivestreams.Publisher; + +@FunctionClient +interface ReactiveMathClient { + Publisher max(); + + @Named("round") + Publisher rnd(float value); + + Publisher sum(Suma sum); +} diff --git a/function-client-aws/src/test/java/io/micronaut/function/client/aws/Suma.java b/function-client-aws/src/test/java/io/micronaut/function/client/aws/Suma.java new file mode 100644 index 0000000000..d8cb82cac2 --- /dev/null +++ b/function-client-aws/src/test/java/io/micronaut/function/client/aws/Suma.java @@ -0,0 +1,27 @@ +package io.micronaut.function.client.aws; + +/** + * @author graemerocher + * @since 1.0 + */ +public class Suma { + + private int a; + private Integer b; + + public int getA() { + return a; + } + + public void setA(int a) { + this.a = a; + } + + public Integer getB() { + return b; + } + + public void setB(Integer b) { + this.b = b; + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 986be1587a..de45e5dbab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -69,6 +69,7 @@ awssdk-apache-client = { module = 'software.amazon.awssdk:apache-client' } awssdk-apigatewaymanagementapi = { module = 'software.amazon.awssdk:apigatewaymanagementapi' } awssdk-cloudwatchlogs = { module = 'software.amazon.awssdk:cloudwatchlogs'} awssdk-dynamodb = { module = 'software.amazon.awssdk:dynamodb' } +awssdk-lambda = { module = 'software.amazon.awssdk:lambda' } awssdk-netty-nio-client = { module = 'software.amazon.awssdk:netty-nio-client' } awssdk-rekognition = { module = 'software.amazon.awssdk:rekognition' } awssdk-s3 = { module = 'software.amazon.awssdk:s3' } @@ -78,6 +79,7 @@ awssdk-ses = { module = 'software.amazon.awssdk:ses' } awssdk-sns = { module = 'software.amazon.awssdk:sns' } awssdk-sqs = { module = 'software.amazon.awssdk:sqs' } awssdk-ssm = { module = 'software.amazon.awssdk:ssm' } +awssdk-iam = { module = 'software.amazon.awssdk:iam' } awssdk-url-connection-client = { module = 'software.amazon.awssdk:url-connection-client' } kotlin-stdlib-jdk8 = { module = 'org.jetbrains.kotlin:kotlin-stdlib-jdk8', version.ref = 'kotlin' } @@ -118,3 +120,8 @@ servlet-api = { module = 'javax.servlet:servlet-api', version.ref = 'servlet-api gradle-micronaut = { module = "io.micronaut.gradle:micronaut-gradle-plugin", version.ref = "micronaut-gradle-plugin" } gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } + +testcontainers = { module = "org.testcontainers:testcontainers" } +testcontainers-localstack = { module = "org.testcontainers:localstack" } +testcontainers-junit = { module = "org.testcontainers:junit-jupiter" } +testcontainers-spock = { module = "org.testcontainers:spock" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 05e234f503..8fbdda62c8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,17 +37,21 @@ include("function-aws-api-proxy-test") include("function-aws-custom-runtime") include("function-aws-test") include("function-client-aws") +include("function-client-aws-v2") +include("test-suite-function-client-aws") include("test-suite") include("test-suite-aws-sdk-v2") include("test-suite-graal") include("test-suite-graal-logging") include("test-suite-groovy") +include("test-suite-function-client-aws-groovy") include("test-suite-http-server-tck-function-aws-api-gateway-proxy-alb") include("test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1") include("test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2") include("test-suite-http-server-tck-function-aws-api-proxy-test") include("test-suite-kotlin") +include("test-suite-function-client-aws-kotlin") include("test-suite-s3") configure { diff --git a/src/main/docs/guide/lambda/lambdafunctionclient.adoc b/src/main/docs/guide/lambda/lambdafunctionclient.adoc index 3f4cf86828..65b63f0af5 100644 --- a/src/main/docs/guide/lambda/lambdafunctionclient.adoc +++ b/src/main/docs/guide/lambda/lambdafunctionclient.adoc @@ -1,11 +1,19 @@ Micronaut AWS provides support for invoking AWS Lambda functions within a Micronaut application context. -To use the features described in this section, you will need to have the `micronaut-function-client-aws` dependency on your classpath. -dependency:micronaut-function-client-aws[groupId="io.micronaut.aws"] +=== AWS SDK V2 + +To use the features described in this section, you will need to have the following dependency on your classpath: + +dependency:micronaut-function-client-aws-v2[groupId="io.micronaut.aws"] + +NOTE: To invoke a function Micronaut configures a `LambdaAsyncClient` and `LambdaClient`. You can configure them by registering a https://docs.micronaut.io/latest/api/io/micronaut/context/event/BeanCreatedEventListener.html[BeanCreatedEventListener] for `software.amazon.awssdk.services.lambda.LambdaAsyncClient` or `software.amazon.awssdk.services.lambda.LambdaAsyncClientBuilder` You can define multiple named functions under the `aws.lambda.functions` configuration. -Each is configured by `AWSInvokeRequestDefinition` that allows setting any property on the underlying `com.amazonaws.services.lambda.model.InvokeRequest`. +Each is configured by `AwsInvokeRequestDefinition` that allows setting any property on the underlying `software.amazon.awssdk.services.lambda.model.InvokeRequest`. + + +=== Example For example, you invoke a function named `AwsLambdaFunctionName`, in the AWS Lambda console, with the following configuration: @@ -24,6 +32,16 @@ Alternatively, you can remove the `@Named` annotation and match the method name snippet::io.micronaut.docs.function.client.aws.methodnamed.AnalyticsClient[tags="clazz"] -To configure credentials for invoking the function you can either define a `~/.aws/credentials` file or use the application configuration file. Micronaut registers a api:configurations.aws.EnvironmentAWSCredentialsProvider[] that resolves AWS credentials from the Micronaut Environment. + +=== AWS SDK V1 + +To use AWS SDK v1 add the following dependency instead: + +dependency:micronaut-function-client-aws[groupId="io.micronaut.aws"] NOTE: To invoke a function Micronaut configures a `AWSLambdaAsyncClient` using api:function.client.aws.AWSLambdaConfiguration[] that allows configuring any of the properties of the `AWSLambdaAsyncClientBuilder` class. + +You can define multiple named functions under the `aws.lambda.functions` configuration. +Each is configured by `AWSInvokeRequestDefinition` that allows setting any property on the underlying `com.amazonaws.services.lambda.model.InvokeRequest`. + +To configure credentials for invoking the function you can either define a `~/.aws/credentials` file or use the application configuration file. Micronaut registers a api:configurations.aws.EnvironmentAWSCredentialsProvider[] that resolves AWS credentials from the Micronaut Environment. diff --git a/src/main/docs/guide/sdkv2/lambdaClient.adoc b/src/main/docs/guide/sdkv2/lambdaClient.adoc new file mode 100644 index 0000000000..495de2782e --- /dev/null +++ b/src/main/docs/guide/sdkv2/lambdaClient.adoc @@ -0,0 +1,15 @@ +To use a Lambda client, add the following dependency: + +dependency:lambda[groupId="software.amazon.awssdk"] + +Then, the following beans will be created: + +* `software.amazon.awssdk.services.lambda.LambdaClientBuilder` +* `software.amazon.awssdk.services.lambda.LambdaClient`. + +And: + +* `software.amazon.awssdk.services.lambda.LambdaAsyncClientBuilder` +* `software.amazon.awssdk.services.lambda.LambdaAsyncClient`. + +The HTTP client, credentials and region will be configured as per described in the <>. diff --git a/src/main/docs/guide/toc.yml b/src/main/docs/guide/toc.yml index a9789fe4e4..f9edf387a0 100644 --- a/src/main/docs/guide/toc.yml +++ b/src/main/docs/guide/toc.yml @@ -28,6 +28,7 @@ sdkv2: s3: S3 dynamodb: Dynamo DB ses: SES + lambdaClient: Lambda Client sns: SNS sqs: SQS ssm: SSM diff --git a/test-suite-function-client-aws-groovy/build.gradle.kts b/test-suite-function-client-aws-groovy/build.gradle.kts new file mode 100644 index 0000000000..ef95a4b33e --- /dev/null +++ b/test-suite-function-client-aws-groovy/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + id("groovy") + id("java-library") + id("io.micronaut.build.internal.aws-tests") +} + +dependencies { + testCompileOnly(mn.micronaut.inject.groovy) + testImplementation(mnTest.micronaut.test.spock) + testImplementation(platform(mn.micronaut.core.bom)) + testImplementation(projects.micronautFunctionClientAws) +} + +tasks { + named("test", Test::class) { + useJUnitPlatform() + } +} + +java { + sourceCompatibility = JavaVersion.toVersion("17") + targetCompatibility = JavaVersion.toVersion("17") +} diff --git a/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy b/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy new file mode 100644 index 0000000000..00770b9725 --- /dev/null +++ b/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy @@ -0,0 +1,30 @@ +package io.micronaut.docs.function.client.aws + +import io.micronaut.context.ApplicationContext +import io.micronaut.function.client.FunctionDefinition +import io.micronaut.function.client.aws.AWSInvokeRequestDefinition +import io.micronaut.test.extensions.spock.annotation.MicronautTest +import spock.lang.Specification +import jakarta.inject.Inject + +@MicronautTest(startApplication = false) +class AnalyticsClientSpec extends Specification { + @Inject + ApplicationContext applicationContext + + void "test setup function definitions"() { + given: + Collection definitions = applicationContext.getBeansOfType(FunctionDefinition) + + expect: + definitions.size() == 1 + definitions.first() instanceof AWSInvokeRequestDefinition + + when: + AWSInvokeRequestDefinition invokeRequestDefinition = (AWSInvokeRequestDefinition) definitions.first() + + then: + invokeRequestDefinition.name == 'analytics' + invokeRequestDefinition.invokeRequest.functionName == 'AwsLambdaFunctionName' + } +} diff --git a/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.groovy b/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.groovy new file mode 100644 index 0000000000..f49d482ab8 --- /dev/null +++ b/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.groovy @@ -0,0 +1,9 @@ +package io.micronaut.docs.function.client.aws.atnamed + +import io.micronaut.function.client.FunctionClient +import jakarta.inject.Named +@FunctionClient +interface AnalyticsClient { + @Named('analytics') + String visit(String productId); +} diff --git a/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.groovy b/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.groovy new file mode 100644 index 0000000000..6dfdf74d6c --- /dev/null +++ b/test-suite-function-client-aws-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.groovy @@ -0,0 +1,8 @@ +package io.micronaut.docs.function.client.aws.methodnamed + +import io.micronaut.function.client.FunctionClient + +@FunctionClient +interface AnalyticsClient { + String analytics(String productId) +} diff --git a/test-suite-function-client-aws-groovy/src/test/resources/application.properties b/test-suite-function-client-aws-groovy/src/test/resources/application.properties new file mode 100644 index 0000000000..73c92aa9d4 --- /dev/null +++ b/test-suite-function-client-aws-groovy/src/test/resources/application.properties @@ -0,0 +1 @@ +aws.lambda.functions.analytics.function-name=AwsLambdaFunctionName \ No newline at end of file diff --git a/test-suite-function-client-aws-groovy/src/test/resources/logback.xml b/test-suite-function-client-aws-groovy/src/test/resources/logback.xml new file mode 100644 index 0000000000..80dcc40c8d --- /dev/null +++ b/test-suite-function-client-aws-groovy/src/test/resources/logback.xml @@ -0,0 +1,15 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/test-suite-function-client-aws-kotlin/build.gradle.kts b/test-suite-function-client-aws-kotlin/build.gradle.kts new file mode 100644 index 0000000000..c423ba56a2 --- /dev/null +++ b/test-suite-function-client-aws-kotlin/build.gradle.kts @@ -0,0 +1,32 @@ +plugins { + id("org.jetbrains.kotlin.jvm") + id("org.jetbrains.kotlin.kapt") + id("io.micronaut.build.internal.aws-tests") +} + +val micronautVersion: String by project + +dependencies { + kaptTest(mn.micronaut.inject.java) + testAnnotationProcessor(platform(mn.micronaut.core.bom)) + testImplementation(libs.junit.jupiter.api) + testImplementation(mnTest.micronaut.test.junit5) + testRuntimeOnly(libs.junit.jupiter.engine) + testImplementation(projects.micronautFunctionAws) + testImplementation(libs.kotlin.stdlib.jdk8) + testImplementation(projects.micronautFunctionClientAws) + testRuntimeOnly(mn.snakeyaml) +} + +tasks { + named("test", Test::class) { + useJUnitPlatform() + } +} + +kotlin { + jvmToolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } + +} diff --git a/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt b/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt new file mode 100644 index 0000000000..1539ed0c88 --- /dev/null +++ b/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt @@ -0,0 +1,25 @@ +package io.micronaut.docs.function.aws + +import io.micronaut.context.ApplicationContext +import io.micronaut.function.client.FunctionDefinition +import io.micronaut.function.client.aws.AWSInvokeRequestDefinition +import io.micronaut.test.extensions.junit5.annotation.MicronautTest +import jakarta.inject.Inject +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Test + +@MicronautTest(startApplication = false) +internal class AnalyticsClientTest { + @Inject + lateinit var applicationContext: ApplicationContext + @Test + fun testSetupFunctionDefinitions() { + val definitions = applicationContext.getBeansOfType(FunctionDefinition::class.java) + Assertions.assertEquals(1, definitions.size) + Assertions.assertTrue(definitions.stream().findFirst().isPresent) + Assertions.assertTrue(definitions.stream().findFirst().get() is AWSInvokeRequestDefinition) + val invokeRequestDefinition = definitions.stream().findFirst().get() as AWSInvokeRequestDefinition + Assertions.assertEquals("analytics", invokeRequestDefinition.name) + //Assertions.assertEquals("AwsLambdaFunctionName", invokeRequestDefinition.invokeRequest.functionName) + } +} \ No newline at end of file diff --git a/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.kt b/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.kt new file mode 100644 index 0000000000..f4ad54bfb1 --- /dev/null +++ b/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.kt @@ -0,0 +1,10 @@ +package io.micronaut.docs.function.client.aws.atnamed + +import io.micronaut.function.client.FunctionClient +import jakarta.inject.Named + +@FunctionClient +internal interface AnalyticsClient { + @Named("analytics") + fun visit(productId: String): String +} diff --git a/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.kt b/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.kt new file mode 100644 index 0000000000..27efa775e2 --- /dev/null +++ b/test-suite-function-client-aws-kotlin/src/test/kotlin/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.kt @@ -0,0 +1,8 @@ +package io.micronaut.docs.function.client.aws.methodnamed + +import io.micronaut.function.client.FunctionClient + +@FunctionClient +internal interface AnalyticsClient { + fun analytics(productId: String): String +} diff --git a/test-suite-function-client-aws-kotlin/src/test/resources/application.properties b/test-suite-function-client-aws-kotlin/src/test/resources/application.properties new file mode 100644 index 0000000000..73c92aa9d4 --- /dev/null +++ b/test-suite-function-client-aws-kotlin/src/test/resources/application.properties @@ -0,0 +1 @@ +aws.lambda.functions.analytics.function-name=AwsLambdaFunctionName \ No newline at end of file diff --git a/test-suite-function-client-aws-kotlin/src/test/resources/logback.xml b/test-suite-function-client-aws-kotlin/src/test/resources/logback.xml new file mode 100644 index 0000000000..80dcc40c8d --- /dev/null +++ b/test-suite-function-client-aws-kotlin/src/test/resources/logback.xml @@ -0,0 +1,15 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/test-suite-function-client-aws/build.gradle.kts b/test-suite-function-client-aws/build.gradle.kts new file mode 100644 index 0000000000..49070ce16b --- /dev/null +++ b/test-suite-function-client-aws/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + id("java-library") + id("io.micronaut.build.internal.aws-tests-java") + id("io.micronaut.build.internal.common") +} +dependencies { + testImplementation(projects.micronautFunctionClientAws) +} + diff --git a/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java b/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java new file mode 100644 index 0000000000..60be703853 --- /dev/null +++ b/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java @@ -0,0 +1,32 @@ +package io.micronaut.docs.function.aws; + +import io.micronaut.context.ApplicationContext; +import io.micronaut.function.client.FunctionDefinition; +import io.micronaut.function.client.aws.AWSInvokeRequestDefinition; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import jakarta.inject.Inject; +import org.junit.jupiter.api.Test; + +import java.util.Collection; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@MicronautTest(startApplication = false) +class AnalyticsClientTest { + @Inject + ApplicationContext applicationContext; + + @Test + void testSetupFunctionDefinitions() { + Collection definitions = applicationContext.getBeansOfType(FunctionDefinition.class); + + assertEquals(1, definitions.size()); + assertTrue(definitions.stream().findFirst().isPresent()); + assertTrue(definitions.stream().findFirst().get() instanceof AWSInvokeRequestDefinition); + + AWSInvokeRequestDefinition invokeRequestDefinition = (AWSInvokeRequestDefinition) definitions.stream().findFirst().get(); + + assertEquals("analytics", invokeRequestDefinition.getName()); + } +} diff --git a/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.java b/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.java new file mode 100644 index 0000000000..0547f2dc2d --- /dev/null +++ b/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/atnamed/AnalyticsClient.java @@ -0,0 +1,10 @@ +package io.micronaut.docs.function.client.aws.atnamed; + +import io.micronaut.function.client.FunctionClient; +import jakarta.inject.Named; +@FunctionClient +public interface AnalyticsClient { + + @Named("analytics") // <1> + String visit(String productId); +} diff --git a/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.java b/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.java new file mode 100644 index 0000000000..613d1c6e8a --- /dev/null +++ b/test-suite-function-client-aws/src/test/java/io/micronaut/docs/function/client/aws/methodnamed/AnalyticsClient.java @@ -0,0 +1,8 @@ +package io.micronaut.docs.function.client.aws.methodnamed; + +import io.micronaut.function.client.FunctionClient; + +@FunctionClient +public interface AnalyticsClient { + String analytics(String productId); +} diff --git a/test-suite-function-client-aws/src/test/resources/application.yml b/test-suite-function-client-aws/src/test/resources/application.yml new file mode 100644 index 0000000000..85c4f2e020 --- /dev/null +++ b/test-suite-function-client-aws/src/test/resources/application.yml @@ -0,0 +1,8 @@ +#tag::config[] +--- +aws: + lambda: + functions: + analytics: + function-name: 'AwsLambdaFunctionName' +#end::config[] \ No newline at end of file diff --git a/test-suite-function-client-aws/src/test/resources/logback.xml b/test-suite-function-client-aws/src/test/resources/logback.xml new file mode 100644 index 0000000000..80dcc40c8d --- /dev/null +++ b/test-suite-function-client-aws/src/test/resources/logback.xml @@ -0,0 +1,15 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/test-suite-groovy/build.gradle.kts b/test-suite-groovy/build.gradle.kts index 5d263f217b..5d496ab412 100644 --- a/test-suite-groovy/build.gradle.kts +++ b/test-suite-groovy/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { testImplementation(mnTest.micronaut.test.spock) testImplementation(platform(mn.micronaut.core.bom)) testImplementation(projects.micronautFunctionAws) - testImplementation(projects.micronautFunctionClientAws) + testImplementation(projects.micronautFunctionClientAwsV2) testRuntimeOnly(mn.snakeyaml) } diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy index 00770b9725..efedeaa7cd 100644 --- a/test-suite-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy +++ b/test-suite-groovy/src/test/groovy/io/micronaut/docs/function/client/aws/AnalyticsClientSpec.groovy @@ -2,7 +2,7 @@ package io.micronaut.docs.function.client.aws import io.micronaut.context.ApplicationContext import io.micronaut.function.client.FunctionDefinition -import io.micronaut.function.client.aws.AWSInvokeRequestDefinition +import io.micronaut.function.client.aws.v2.AwsInvokeRequestDefinition import io.micronaut.test.extensions.spock.annotation.MicronautTest import spock.lang.Specification import jakarta.inject.Inject @@ -18,13 +18,12 @@ class AnalyticsClientSpec extends Specification { expect: definitions.size() == 1 - definitions.first() instanceof AWSInvokeRequestDefinition + definitions.first() instanceof AwsInvokeRequestDefinition when: - AWSInvokeRequestDefinition invokeRequestDefinition = (AWSInvokeRequestDefinition) definitions.first() + AwsInvokeRequestDefinition invokeRequestDefinition = (AwsInvokeRequestDefinition) definitions.first() then: invokeRequestDefinition.name == 'analytics' - invokeRequestDefinition.invokeRequest.functionName == 'AwsLambdaFunctionName' } } diff --git a/test-suite-kotlin/build.gradle.kts b/test-suite-kotlin/build.gradle.kts index c423ba56a2..175c4cbe43 100644 --- a/test-suite-kotlin/build.gradle.kts +++ b/test-suite-kotlin/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(projects.micronautFunctionAws) testImplementation(libs.kotlin.stdlib.jdk8) - testImplementation(projects.micronautFunctionClientAws) + testImplementation(projects.micronautFunctionClientAwsV2) testRuntimeOnly(mn.snakeyaml) } diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt index 1539ed0c88..5418a00b27 100644 --- a/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt +++ b/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/function/aws/AnalyticsClientTest.kt @@ -2,7 +2,7 @@ package io.micronaut.docs.function.aws import io.micronaut.context.ApplicationContext import io.micronaut.function.client.FunctionDefinition -import io.micronaut.function.client.aws.AWSInvokeRequestDefinition +import io.micronaut.function.client.aws.v2.AwsInvokeRequestDefinition import io.micronaut.test.extensions.junit5.annotation.MicronautTest import jakarta.inject.Inject import org.junit.jupiter.api.Assertions @@ -17,8 +17,8 @@ internal class AnalyticsClientTest { val definitions = applicationContext.getBeansOfType(FunctionDefinition::class.java) Assertions.assertEquals(1, definitions.size) Assertions.assertTrue(definitions.stream().findFirst().isPresent) - Assertions.assertTrue(definitions.stream().findFirst().get() is AWSInvokeRequestDefinition) - val invokeRequestDefinition = definitions.stream().findFirst().get() as AWSInvokeRequestDefinition + Assertions.assertTrue(definitions.stream().findFirst().get() is AwsInvokeRequestDefinition) + val invokeRequestDefinition = definitions.stream().findFirst().get() as AwsInvokeRequestDefinition Assertions.assertEquals("analytics", invokeRequestDefinition.name) //Assertions.assertEquals("AwsLambdaFunctionName", invokeRequestDefinition.invokeRequest.functionName) } diff --git a/test-suite/build.gradle.kts b/test-suite/build.gradle.kts index f6339f4ffa..98872291df 100644 --- a/test-suite/build.gradle.kts +++ b/test-suite/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { testImplementation(projects.micronautFunctionAws) - testImplementation(projects.micronautFunctionClientAws) + testImplementation(projects.micronautFunctionClientAwsV2) } tasks { diff --git a/test-suite/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java b/test-suite/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java index dec6690f8c..8f35476cd4 100644 --- a/test-suite/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java +++ b/test-suite/src/test/java/io/micronaut/docs/function/aws/AnalyticsClientTest.java @@ -2,7 +2,7 @@ import io.micronaut.context.ApplicationContext; import io.micronaut.function.client.FunctionDefinition; -import io.micronaut.function.client.aws.AWSInvokeRequestDefinition; +import io.micronaut.function.client.aws.v2.AwsInvokeRequestDefinition; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -23,9 +23,9 @@ void testSetupFunctionDefinitions() { assertEquals(1, definitions.size()); assertTrue(definitions.stream().findFirst().isPresent()); - assertTrue(definitions.stream().findFirst().get() instanceof AWSInvokeRequestDefinition); + assertTrue(definitions.stream().findFirst().get() instanceof AwsInvokeRequestDefinition); - AWSInvokeRequestDefinition invokeRequestDefinition = (AWSInvokeRequestDefinition) definitions.stream().findFirst().get(); + AwsInvokeRequestDefinition invokeRequestDefinition = (AwsInvokeRequestDefinition) definitions.stream().findFirst().get(); assertEquals("analytics", invokeRequestDefinition.getName()); //assertEquals("AwsLambdaFunctionName", invokeRequestDefinition.getInvokeRequest().getFunctionName()); diff --git a/test-suite/src/test/resources/application.properties b/test-suite/src/test/resources/application.properties new file mode 100644 index 0000000000..73c92aa9d4 --- /dev/null +++ b/test-suite/src/test/resources/application.properties @@ -0,0 +1 @@ +aws.lambda.functions.analytics.function-name=AwsLambdaFunctionName \ No newline at end of file From ddc219990ebb8f88b9bf8c36bf86a1504c448f5a Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Tue, 20 Aug 2024 14:11:19 +0000 Subject: [PATCH 094/149] [skip ci] Release v4.7.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6cba5d1c4a..17a6df50a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.7.0-SNAPSHOT +projectVersion=4.7.0 projectGroup=io.micronaut.aws title=Micronaut AWS From 4a34b0524e8b45c92504073bc95937eeca5f072a Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Tue, 20 Aug 2024 14:20:10 +0000 Subject: [PATCH 095/149] chore: Bump version to 4.7.1-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 17a6df50a9..ac2de52426 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.7.0 +projectVersion=4.7.1-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS From 7abf7bf706632f621ee00f395873d0a880c647b8 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 21 Aug 2024 13:02:58 +0200 Subject: [PATCH 096/149] unignore function invoke (#2195) * unignore * groovy 4.4.0 --- .../function/client/aws/LocalFunctionInvokeSpec.groovy | 1 - .../function/client/aws/LocalFunctionInvokeJavaTest.java | 2 -- gradle/libs.versions.toml | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy index 94a9dfc291..712ffa3cee 100644 --- a/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy +++ b/function-client-aws/src/test/groovy/io/micronaut/function/client/aws/LocalFunctionInvokeSpec.groovy @@ -35,7 +35,6 @@ import spock.lang.Specification * @author graemerocher * @since 1.0 */ -@Ignore("it is flaky https://ge.micronaut.io/scans/tests?tests.container=io.micronaut.function.client.aws.LocalFunctionInvokeSpec") class LocalFunctionInvokeSpec extends Specification { //tag::invokeLocalFunction[] diff --git a/function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java b/function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java index 6d927c824a..f9b2c1a99b 100644 --- a/function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java +++ b/function-client-aws/src/test/java/io/micronaut/function/client/aws/LocalFunctionInvokeJavaTest.java @@ -10,7 +10,6 @@ class LocalFunctionInvokeJavaTest { - @Disabled("it is flaky https://ge.micronaut.io/scans/tests?tests.container=io.micronaut.function.client.aws.LocalFunctionInvokeSpec") @Test void testInvokingALocalFunction() { Suma sum = new Suma(); @@ -27,7 +26,6 @@ void testInvokingALocalFunction() { server.close(); } - @Disabled("it is flaky https://ge.micronaut.io/scans/tests?tests.container=io.micronaut.function.client.aws.LocalFunctionInvokeSpec") @Test void testInvokingALocalFunctionRX() { Suma sum = new Suma(); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de45e5dbab..1a2219ca60 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ jetty = '11.0.22' logback-json-classic = '0.1.5' micronaut-discovery = "4.4.0" -micronaut-groovy = "4.3.0" +micronaut-groovy = "4.4.0" micronaut-logging = "1.4.0" micronaut-mongodb = "5.3.0" micronaut-reactor = "3.5.0" From e18f645997a75a6093e7742bbf85cb09004dfe58 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Thu, 22 Aug 2024 14:13:33 +0200 Subject: [PATCH 097/149] Fix tck tests (#2197) * tck: NoBodyResponseTest * tck: ResponseStatusTest * core micronaut 4.6.2 * groovy 4.0.22 * fix test --- .../alb/ApplicationLoadBalancerServletResponse.java | 6 +++++- .../proxy/payload1/ApiGatewayProxyServletResponse.java | 9 ++++++--- .../APIGatewayV2HTTPResponseServletResponse.java | 6 +++++- gradle/libs.versions.toml | 6 +++--- .../tests/ApplicationLoadBalancerTckTestSuite.java | 2 -- .../FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java | 7 +------ .../FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java | 7 +------ .../tests/MicronautLambdaHandlerHttpServerTestSuite.java | 1 - 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletResponse.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletResponse.java index 2963407a4a..d1e7bbb3fc 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletResponse.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletResponse.java @@ -18,6 +18,7 @@ import com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ConversionService; +import io.micronaut.core.util.StringUtils; import io.micronaut.function.BinaryTypeConfiguration; import io.micronaut.function.aws.proxy.AbstractServletHttpResponse; import io.micronaut.function.aws.proxy.MapCollapseUtils; @@ -49,7 +50,10 @@ public ApplicationLoadBalancerResponseEvent getNativeResponse() { nativeResponse.setBody(Base64.getMimeEncoder().encodeToString(body.toByteArray())); } else { nativeResponse.setIsBase64Encoded(false); - nativeResponse.setBody(body.toString(getCharacterEncoding())); + String bodyStr = body.toString(getCharacterEncoding()); + if (StringUtils.isNotEmpty(bodyStr)) { + nativeResponse.setBody(bodyStr); + } } return nativeResponse; } diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletResponse.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletResponse.java index c5f991142f..07b0a1d2ef 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletResponse.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletResponse.java @@ -18,6 +18,7 @@ import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ConversionService; +import io.micronaut.core.util.StringUtils; import io.micronaut.function.BinaryTypeConfiguration; import io.micronaut.function.aws.proxy.AbstractServletHttpResponse; import io.micronaut.function.aws.proxy.MapCollapseUtils; @@ -42,7 +43,6 @@ protected ApiGatewayProxyServletResponse(ConversionService conversionService, Bi @Override public APIGatewayProxyResponseEvent getNativeResponse() { APIGatewayProxyResponseEvent apiGatewayProxyResponseEvent = new APIGatewayProxyResponseEvent() - .withBody(body.toString()) .withStatusCode(status) .withMultiValueHeaders(MapCollapseUtils.getMultiHeaders(headers)) .withHeaders(MapCollapseUtils.getSingleValueHeaders(headers)); @@ -53,8 +53,11 @@ public APIGatewayProxyResponseEvent getNativeResponse() { .withBody(Base64.getMimeEncoder().encodeToString(body.toByteArray())); } else { apiGatewayProxyResponseEvent - .withIsBase64Encoded(false) - .withBody(body.toString(getCharacterEncoding())); + .withIsBase64Encoded(false); + String bodyStr = body.toString(getCharacterEncoding()); + if (StringUtils.isNotEmpty(bodyStr)) { + apiGatewayProxyResponseEvent.withBody(bodyStr); + } } return apiGatewayProxyResponseEvent; } diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPResponseServletResponse.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPResponseServletResponse.java index 94d50314a4..08370447ea 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPResponseServletResponse.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPResponseServletResponse.java @@ -18,6 +18,7 @@ import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ConversionService; +import io.micronaut.core.util.StringUtils; import io.micronaut.function.BinaryTypeConfiguration; import io.micronaut.function.aws.proxy.AbstractServletHttpResponse; import io.micronaut.function.aws.proxy.MapCollapseUtils; @@ -51,7 +52,10 @@ public APIGatewayV2HTTPResponse getNativeResponse() { .withIsBase64Encoded(true) .withBody(Base64.getMimeEncoder().encodeToString(body.toByteArray())); } else { - apiGatewayV2HTTPResponseBuilder.withBody(body.toString(getCharacterEncoding())); + String bodyStr = body.toString(getCharacterEncoding()); + if (StringUtils.isNotEmpty(bodyStr)) { + apiGatewayV2HTTPResponseBuilder.withBody(bodyStr); + } } return apiGatewayV2HTTPResponseBuilder.build(); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a2219ca60..c2dad40fe3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -micronaut = "4.6.1" +micronaut = "4.6.2" micronaut-docs = "2.0.0" micronaut-test = "4.5.0" -groovy = "4.0.15" +groovy = "4.0.22" spock = "2.3-groovy-4.0" bouncycastle = '1.70' @@ -18,7 +18,7 @@ micronaut-reactor = "3.5.0" micronaut-security = "4.9.1" micronaut-serde = "2.11.0" -micronaut-servlet = "4.10.0" +micronaut-servlet = "4.10.1" micronaut-test-resources="2.5.4" micronaut-views = "5.4.4" micronaut-validation = "4.7.0" diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java index e285408def..30aaa93401 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java @@ -16,8 +16,6 @@ "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", - "io.micronaut.http.server.tck.tests.NoBodyResponseTest", - "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest" }) @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy Application Load Balancer Event") diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java index 2699c7ae5a..cf16f79d60 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java @@ -1,9 +1,6 @@ package io.micronaut.http.server.tck.lambda.tests; -import org.junit.platform.suite.api.ExcludeClassNamePatterns; -import org.junit.platform.suite.api.SelectPackages; -import org.junit.platform.suite.api.Suite; -import org.junit.platform.suite.api.SuiteDisplayName; +import org.junit.platform.suite.api.*; @Suite @SelectPackages({ @@ -16,8 +13,6 @@ "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", - "io.micronaut.http.server.tck.tests.NoBodyResponseTest", - "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest" }) @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v1 Event model") diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java index 336d9a95ed..05a1abd645 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java @@ -1,9 +1,6 @@ package io.micronaut.http.server.tck.lambda.tests; -import org.junit.platform.suite.api.ExcludeClassNamePatterns; -import org.junit.platform.suite.api.SelectPackages; -import org.junit.platform.suite.api.Suite; -import org.junit.platform.suite.api.SuiteDisplayName; +import org.junit.platform.suite.api.*; @Suite @SelectPackages({ @@ -16,8 +13,6 @@ "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", - "io.micronaut.http.server.tck.tests.NoBodyResponseTest", - "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest" }) @SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v2 Event model") diff --git a/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java index dbcb034341..805e205716 100644 --- a/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java @@ -11,7 +11,6 @@ "io.micronaut.http.server.tck.lambda.tests" }) @ExcludeClassNamePatterns({ - "io.micronaut.http.server.tck.tests.ResponseStatusTest", "io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest", "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.LocalErrorReadingBodyTest", // Binding body different type (e.g. a String in error handler) From be7a9b9fee76fda0747c2c991d69b1ffdb62f801 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:29:01 +0200 Subject: [PATCH 098/149] chore(deps): update plugin io.micronaut.build.shared.settings to v7.2.1 (#2196) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 8fbdda62c8..e9d5784e30 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "7.2.0" + id("io.micronaut.build.shared.settings") version "7.2.1" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From db73edb8983d31288cc25d0031bfa22ba02366cf Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Thu, 22 Aug 2024 12:30:06 +0000 Subject: [PATCH 099/149] [skip ci] Release v4.7.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ac2de52426..02a40bff28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.7.1-SNAPSHOT +projectVersion=4.7.1 projectGroup=io.micronaut.aws title=Micronaut AWS From d5f80cca03d361754a1d89555301f06ceeb3083a Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Thu, 22 Aug 2024 12:37:36 +0000 Subject: [PATCH 100/149] chore: Bump version to 4.7.2-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 02a40bff28..058243db1a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.7.1 +projectVersion=4.7.2-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS From ad13efab4e48e8523aa60458ab15ddad1e4ccaed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 21:49:01 +0000 Subject: [PATCH 101/149] fix(deps): update aws-java-sdk monorepo to v1.12.770 (#2198) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c2dad40fe3..1eced98336 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.769' +managed-aws-java-sdk-v1 = '1.12.770' managed-aws-java-sdk-v2 = '2.27.8' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' From fe146cc67e245980b47a0e6eae75f16298a2d1db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 01:37:28 +0000 Subject: [PATCH 102/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.11 (#2199) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1eced98336..99bdf59c82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.770' -managed-aws-java-sdk-v2 = '2.27.8' +managed-aws-java-sdk-v2 = '2.27.11' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' From 9bd1a84c560b579ac447aedafa3ffecb3fc35945 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 00:40:26 +0000 Subject: [PATCH 103/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.12 (#2200) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 99bdf59c82..f012d47277 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.770' -managed-aws-java-sdk-v2 = '2.27.11' +managed-aws-java-sdk-v2 = '2.27.12' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' From 48afd72f7838b94ee0e265231ed3ba2f9a904729 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:06:26 +0000 Subject: [PATCH 104/149] fix(deps): update dependency org.eclipse.jetty:jetty-server to v11.0.23 (#2201) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f012d47277..513123a4c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ spock = "2.3-groovy-4.0" bouncycastle = '1.70' fileupload = '0.0.6' -jetty = '11.0.22' +jetty = '11.0.23' logback-json-classic = '0.1.5' micronaut-discovery = "4.4.0" From 0b6ad245192928a61b935cabedf3299d45457b18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:23:40 +0000 Subject: [PATCH 105/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.13 (#2202) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 513123a4c9..11664d7f2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.770' -managed-aws-java-sdk-v2 = '2.27.12' +managed-aws-java-sdk-v2 = '2.27.13' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' From d8283f60f4dcd746cbf6eec3cc9baa815272ca74 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 01:14:35 +0000 Subject: [PATCH 106/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.14 (#2203) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 11664d7f2e..98abe8a982 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.770' -managed-aws-java-sdk-v2 = '2.27.13' +managed-aws-java-sdk-v2 = '2.27.14' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' From c0201380fe9e4c70fc9f67916bb8b96ef6db3c9c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 00:45:04 +0000 Subject: [PATCH 107/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.15 (#2204) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98abe8a982..556a472b63 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.770' -managed-aws-java-sdk-v2 = '2.27.14' +managed-aws-java-sdk-v2 = '2.27.15' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' From 3f7ecf5568a01a2fb69ec33eae840f253a37d53f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 01:08:14 +0000 Subject: [PATCH 108/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.17 (#2206) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 556a472b63..63900e6184 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.770' -managed-aws-java-sdk-v2 = '2.27.15' +managed-aws-java-sdk-v2 = '2.27.17' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' From 89a9f46749c77638ac8cbc12ba7e455b660d12d1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:26:40 +0000 Subject: [PATCH 109/149] fix(deps): update dependency org.eclipse.jetty:jetty-server to v11.0.24 (#2209) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 63900e6184..ef9cea6717 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ spock = "2.3-groovy-4.0" bouncycastle = '1.70' fileupload = '0.0.6' -jetty = '11.0.23' +jetty = '11.0.24' logback-json-classic = '0.1.5' micronaut-discovery = "4.4.0" From 2e2caaf99ea0cd13fffae2423ee446e7621bdf1e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2024 02:20:15 +0000 Subject: [PATCH 110/149] fix(deps): update aws-java-sdk monorepo to v1.12.771 (#2210) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ef9cea6717..4628b083f3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.770' +managed-aws-java-sdk-v1 = '1.12.771' managed-aws-java-sdk-v2 = '2.27.17' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' From d4005fc9dc1f6b2dcf776d889c907200fa4872e2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:26:10 +0000 Subject: [PATCH 111/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.27.21 (#2212) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4628b083f3..8baac267f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.771' -managed-aws-java-sdk-v2 = '2.27.17' +managed-aws-java-sdk-v2 = '2.27.21' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' managed-aws-lambda-java-serialization = '1.1.5' From 3656061d56f36ccd0cb04d6b75f5f1d79b8b673b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 01:34:51 +0000 Subject: [PATCH 112/149] chore(deps): update dependency gradle to v8.10.1 (#2213) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41557..0aaefbcaf0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 837735402cb3f218b1d3f09af6f3d5c86d43beaf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 01:21:57 +0000 Subject: [PATCH 113/149] fix(deps): update aws-java-sdk monorepo to v1.12.772 (#2214) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8baac267f6..532645886d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.771' +managed-aws-java-sdk-v1 = '1.12.772' managed-aws-java-sdk-v2 = '2.27.21' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' From f8e78690bbbef2c52491210e24d326d10b285873 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 22:03:37 +0000 Subject: [PATCH 114/149] chore(deps): update dependency gradle to v8.10.2 (#2220) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf0..df97d72b8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From d645f91084a2e064507d3e40347c12b27c79ba44 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 00:41:50 +0000 Subject: [PATCH 115/149] fix(deps): update aws-java-sdk monorepo to v1.12.773 (#2222) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 532645886d..2677e9ca01 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.772' +managed-aws-java-sdk-v1 = '1.12.773' managed-aws-java-sdk-v2 = '2.27.21' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' From 2bb3a9591f5604ae1ec094f5de11df2ed90db524 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 02:01:17 +0000 Subject: [PATCH 116/149] fix(deps): update dependency io.micronaut.serde:micronaut-serde-bom to v2.11.1 (#2225) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2677e9ca01..a0e0ae9685 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ micronaut-mongodb = "5.3.0" micronaut-reactor = "3.5.0" micronaut-security = "4.9.1" -micronaut-serde = "2.11.0" +micronaut-serde = "2.11.1" micronaut-servlet = "4.10.1" micronaut-test-resources="2.5.4" micronaut-views = "5.4.4" From 982addc03a0a5118ee2e736b11faac3c9461fa7c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 22:47:16 +0000 Subject: [PATCH 117/149] chore(deps): update graalvm/setup-graalvm action to v1.2.4 (#2226) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index be653308d2..d7daa17196 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: fetch-depth: 0 - name: "🔧 Setup GraalVM CE" - uses: graalvm/setup-graalvm@v1.2.3 + uses: graalvm/setup-graalvm@v1.2.4 with: distribution: 'graalvm' java-version: ${{ matrix.java }} From 39f2358b8ec85f7f59be815af6c61cbaa99ae8f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 01:51:30 +0000 Subject: [PATCH 118/149] fix(deps): update aws-java-sdk monorepo to v1.12.775 (#2227) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a0e0ae9685..a2598faf99 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.773' +managed-aws-java-sdk-v1 = '1.12.775' managed-aws-java-sdk-v2 = '2.27.21' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' From a813ebc9de0e08905866b6e238c203b390c38284 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 22:08:14 +0000 Subject: [PATCH 119/149] chore(deps): update plugin io.micronaut.build.shared.settings to v7.2.2 (#2228) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index e9d5784e30..6acad1c3b8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "7.2.1" + id("io.micronaut.build.shared.settings") version "7.2.2" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 773ee60b80a6370089d50057c0dcc548aceece19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 21:26:31 +0000 Subject: [PATCH 120/149] fix(deps): update aws-java-sdk monorepo to v1.12.776 (#2229) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a2598faf99..303634cb3c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.775' +managed-aws-java-sdk-v1 = '1.12.776' managed-aws-java-sdk-v2 = '2.27.21' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' From 1f1969d431a1f7e3c08b298c9d95c6c23cd156c0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 01:08:13 +0000 Subject: [PATCH 121/149] fix(deps): update dependency com.amazonaws:aws-java-sdk-core to v1.12.777 (#2230) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 303634cb3c..f5d690a913 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-views = "5.4.4" micronaut-validation = "4.7.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.776' +managed-aws-java-sdk-v1 = '1.12.777' managed-aws-java-sdk-v2 = '2.27.21' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.13.0' From 00e2f3e8db8761217877338e34c67252af603cf8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:26:41 +0000 Subject: [PATCH 122/149] fix(deps): update dependency org.graalvm.sdk:graal-sdk to v23.1.5 (#2231) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5d690a913..0fe872e9a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,7 @@ javapoet = "1.13.0" # The following version should probably # be defined in Micronaut Graal but it's not shipped with a BOM yet -graal = "23.1.4" +graal = "23.1.5" kotlin = "1.9.25" # Micronaut From fbc21d1207638b9d7a39de69c14f55e761ec7128 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 21:29:56 +0000 Subject: [PATCH 123/149] fix(deps): update dependency io.micronaut.serde:micronaut-serde-bom to v2.11.2 (#2234) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0fe872e9a5..89c07a8c28 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ micronaut-mongodb = "5.3.0" micronaut-reactor = "3.5.0" micronaut-security = "4.9.1" -micronaut-serde = "2.11.1" +micronaut-serde = "2.11.2" micronaut-servlet = "4.10.1" micronaut-test-resources="2.5.4" micronaut-views = "5.4.4" From 6a7c1b5a74f501991cf4227fd677fad5f8073c9d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 01:54:52 +0000 Subject: [PATCH 124/149] chore(deps): update plugin io.micronaut.build.shared.settings to v7.2.3 (#2235) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 6acad1c3b8..520d48448e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "7.2.2" + id("io.micronaut.build.shared.settings") version "7.2.3" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 3dd3b61653db6319e1365c055fd6affb7244dd81 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 01:08:49 +0000 Subject: [PATCH 125/149] chore(deps): update graalvm/setup-graalvm action to v1.2.5 (#2236) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d7daa17196..140d2d617b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: fetch-depth: 0 - name: "🔧 Setup GraalVM CE" - uses: graalvm/setup-graalvm@v1.2.4 + uses: graalvm/setup-graalvm@v1.2.5 with: distribution: 'graalvm' java-version: ${{ matrix.java }} From ad9748767d2ebc62a5a7ee0b1f69c9efcdc78c4e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 00:21:11 +0000 Subject: [PATCH 126/149] chore(deps): update softprops/action-gh-release action to v2.0.9 (#2238) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4bfd84acb..45f7aa963c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -160,6 +160,6 @@ jobs: - name: Upload assets # Upload the artifacts to the existing release. Note that the SLSA provenance will # attest to each artifact file and not the aggregated ZIP file. - uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8 + uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9 with: files: artifacts.zip From f0c3dcc8551ace0ac382898b355d8d630c3b85d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 10:44:36 +0100 Subject: [PATCH 127/149] chore(deps): update mikepenz/action-junit-report action to v5 (#2239) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 140d2d617b..545ac3b8e5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -70,7 +70,7 @@ jobs: - name: "📊 Publish Test Report" if: always() - uses: mikepenz/action-junit-report@v4 + uses: mikepenz/action-junit-report@v5 with: check_name: Java CI / Test Report (${{ matrix.java }}) report_paths: '**/build/test-results/test/TEST-*.xml' From 62ba1e8f4f5df24ce9c29eb46e17b90f63f8ae6e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 10:44:45 +0100 Subject: [PATCH 128/149] chore(deps): update actions/checkout action to v4.2.2 (#2221) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45f7aa963c..91cf0970ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,7 +146,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Download artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: From e00ba1fb447e57678903e1d247d6576d17de3e1f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 10:44:58 +0100 Subject: [PATCH 129/149] chore(deps): update actions/upload-artifact action to v4.4.3 (#2207) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 545ac3b8e5..26ae97640f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -78,7 +78,7 @@ jobs: - name: "📜 Upload binary compatibility check results" if: matrix.java == '17' - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: binary-compatibility-reports path: "**/build/reports/binary-compatibility-*.html" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91cf0970ab..2dda058489 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,13 +66,13 @@ jobs: # Store the hash in a file, which is uploaded as a workflow artifact. sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256 - name: Upload build artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: gradle-build-outputs path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/* retention-days: 5 - name: Upload artifacts-sha256 - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: artifacts-sha256 path: artifacts-sha256 From 05860eebd8b0a26e17e954268530eed3f249bdea Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Thu, 7 Nov 2024 10:45:31 +0100 Subject: [PATCH 130/149] Update common files (#2211) From a6a048c310147404ef7148b78f5ba3e70ef2484b Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Thu, 7 Nov 2024 10:46:37 +0100 Subject: [PATCH 131/149] ci: projectVersion=4.8.0-SNAPSHOT [ci skip] --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 058243db1a..333e817f19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.7.2-SNAPSHOT +projectVersion=4.8.0-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS From 4f2f42bd0aa5a9f87f3b1222e11d85d2f7e72262 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Thu, 7 Nov 2024 15:14:01 +0100 Subject: [PATCH 132/149] AWS to Core 4.7.x (#2241) * fix(deps): update dependency io.micronaut.views:micronaut-views-bom to v5.5.1 * fix(deps): update dependency io.micronaut.validation:micronaut-validation-bom to v4.8.0 * fix(deps): update dependency io.micronaut.testresources:micronaut-test-resources-bom to v2.6.2 * fix(deps): update dependency io.micronaut.servlet:micronaut-servlet-bom to v4.11.2 * fix(deps): update dependency io.micronaut.serde:micronaut-serde-bom to v2.12.0 * fix(deps): update dependency io.micronaut.security:micronaut-security-bom to v4.11.0 * fix(deps): update dependency io.micronaut.reactor:micronaut-reactor-bom to v3.6.0 * fix(deps): update dependency io.micronaut.mongodb:micronaut-mongo-bom to v5.5.0 * fix(deps): update dependency io.micronaut.gradle:micronaut-gradle-plugin to v4.4.4 * fix(deps): update dependency io.micronaut.discovery:micronaut-discovery-client-bom to v4.5.0 * fix(deps): update dependency com.amazonaws:aws-lambda-java-events to v3.14.0 * fix(deps): update aws-java-sdk-v2 monorepo to v2.29.7 * Micronaut 4.7.2 * servlet 4.12.0 * javadoc: fix throws * fix javadoc error * ignore JsonViewsTest * ignore FormUrlEncodedBodyInRequestFilterTest --- .../events/serde/S3ObjectEntitySerde.java | 2 +- .../aws/proxy/ApiGatewayServletRequest.java | 2 +- gradle/libs.versions.toml | 27 +++++++++---------- .../ApplicationLoadBalancerTckTestSuite.java | 1 + ...sApiGatewayProxyV1HttpServerTestSuite.java | 1 + ...sApiGatewayProxyV2HttpServerTestSuite.java | 1 + ...onautLambdaHandlerHttpServerTestSuite.java | 2 ++ 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/aws-lambda-events-serde/src/main/java/io/micronaut/aws/lambda/events/serde/S3ObjectEntitySerde.java b/aws-lambda-events-serde/src/main/java/io/micronaut/aws/lambda/events/serde/S3ObjectEntitySerde.java index 9c98890ca7..7f3269f381 100644 --- a/aws-lambda-events-serde/src/main/java/io/micronaut/aws/lambda/events/serde/S3ObjectEntitySerde.java +++ b/aws-lambda-events-serde/src/main/java/io/micronaut/aws/lambda/events/serde/S3ObjectEntitySerde.java @@ -32,7 +32,7 @@ import java.io.IOException; /** - * This seems to be necessary because Serde was not picking the appropriate constructor {@link com.amazonaws.services.lambda.runtime.events.models.s3.S3EventNotification.S3ObjectEntity(String, Long, String, String, String)}. + * This seems to be necessary because Serde was not picking the appropriate constructor {@code S3EventNotification.S3ObjectEntity(String, Long, String, String, String)}. */ @Internal @Singleton diff --git a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java index 8df0fa64a6..47b6735dce 100644 --- a/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java +++ b/function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java @@ -311,7 +311,7 @@ public void setParsedBody(T body) { * @param bodySupplier HTTP Request's Body Supplier * @param base64EncodedSupplier Whether the body is Base 64 encoded * @return body bytes - * @throws IOException if the body is empty + * @throws EmptyBodyException if the body is empty */ protected byte[] getBodyBytes(@NonNull Supplier bodySupplier, @NonNull BooleanSupplier base64EncodedSupplier) throws EmptyBodyException { String requestBody = bodySupplier.get(); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 89c07a8c28..6d805e87dc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -micronaut = "4.6.2" +micronaut = "4.7.2" micronaut-docs = "2.0.0" micronaut-test = "4.5.0" groovy = "4.0.22" @@ -10,24 +10,23 @@ fileupload = '0.0.6' jetty = '11.0.24' logback-json-classic = '0.1.5' -micronaut-discovery = "4.4.0" +micronaut-discovery = "4.5.0" micronaut-groovy = "4.4.0" micronaut-logging = "1.4.0" -micronaut-mongodb = "5.3.0" -micronaut-reactor = "3.5.0" - -micronaut-security = "4.9.1" -micronaut-serde = "2.11.2" -micronaut-servlet = "4.10.1" -micronaut-test-resources="2.5.4" -micronaut-views = "5.4.4" -micronaut-validation = "4.7.0" +micronaut-mongodb = "5.5.0" +micronaut-reactor = "3.6.0" +micronaut-security = "4.11.0" +micronaut-serde = "2.12.0" +micronaut-servlet = "4.12.0" +micronaut-test-resources="2.6.2" +micronaut-views = "5.5.1" +micronaut-validation = "4.8.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.777' -managed-aws-java-sdk-v2 = '2.27.21' +managed-aws-java-sdk-v2 = '2.29.7' managed-aws-lambda = '1.2.3' -managed-aws-lambda-events = '3.13.0' +managed-aws-lambda-events = '3.14.0' managed-aws-lambda-java-serialization = '1.1.5' aws-lambda-java-runtime-interface-client = '2.6.0' @@ -43,7 +42,7 @@ graal = "23.1.5" kotlin = "1.9.25" # Micronaut -micronaut-gradle-plugin = "4.4.2" +micronaut-gradle-plugin = "4.4.4" [libraries] # Core diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java index 30aaa93401..b51d1e885a 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java @@ -11,6 +11,7 @@ "io.micronaut.http.server.tck.lambda.tests" }) @ExcludeClassNamePatterns({ + "io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826 "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest", "io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java index cf16f79d60..6afd909126 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java @@ -8,6 +8,7 @@ "io.micronaut.http.server.tck.lambda.tests" }) @ExcludeClassNamePatterns({ + "io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826 "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest", "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", diff --git a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java index 05a1abd645..3b0b7e79ff 100644 --- a/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java @@ -8,6 +8,7 @@ "io.micronaut.http.server.tck.lambda.tests" }) @ExcludeClassNamePatterns({ + "io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826 "io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest", "io.micronaut.http.server.tck.tests.hateoas.VndErrorTest", "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", diff --git a/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java b/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java index 805e205716..af790f55eb 100644 --- a/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java +++ b/test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java @@ -11,6 +11,8 @@ "io.micronaut.http.server.tck.lambda.tests" }) @ExcludeClassNamePatterns({ + "io.micronaut.http.server.tck.tests.forms.FormUrlEncodedBodyInRequestFilterTest", + "io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826 "io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest", "io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest", "io.micronaut.http.server.tck.tests.LocalErrorReadingBodyTest", // Binding body different type (e.g. a String in error handler) From 142ac9b2e975c1be8827d1d47e54d94d94f49fea Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Thu, 7 Nov 2024 14:50:41 +0000 Subject: [PATCH 133/149] [skip ci] Release v4.8.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 333e817f19..b161ddad3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.8.0-SNAPSHOT +projectVersion=4.8.0 projectGroup=io.micronaut.aws title=Micronaut AWS From c8ab6ae0a478e6a625d6646b6a12cf47c80f52b8 Mon Sep 17 00:00:00 2001 From: micronaut-build Date: Thu, 7 Nov 2024 14:58:04 +0000 Subject: [PATCH 134/149] chore: Bump version to 4.8.1-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b161ddad3a..0e235b7c4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.8.0 +projectVersion=4.8.1-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS From 90c7d64c860784a20be384460b957e8df0f39ab2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 9 Nov 2024 04:39:54 +0000 Subject: [PATCH 135/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.29.9 (#2243) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6d805e87dc..d53fb16cb1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-validation = "4.8.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.777' -managed-aws-java-sdk-v2 = '2.29.7' +managed-aws-java-sdk-v2 = '2.29.9' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.14.0' managed-aws-lambda-java-serialization = '1.1.5' From efed305f12f07459d32afd193d3a1b0373960ffb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 05:20:35 +0000 Subject: [PATCH 136/149] fix(deps): update aws-java-sdk-v2 monorepo to v2.29.11 (#2246) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d53fb16cb1..ebc70656e0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ micronaut-validation = "4.8.0" managed-alexa-ask-sdk = "2.86.0" managed-aws-java-sdk-v1 = '1.12.777' -managed-aws-java-sdk-v2 = '2.29.9' +managed-aws-java-sdk-v2 = '2.29.11' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.14.0' managed-aws-lambda-java-serialization = '1.1.5' From db33bd9ebf95cd86379300329380de2f15a9bef4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 12:04:55 +0100 Subject: [PATCH 137/149] chore(deps): update dependency gradle to v8.11 (#2245) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8b..94113f200e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 0f7ef8e63169fbf4978da80835e5d30be01f6b74 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 01:17:56 +0000 Subject: [PATCH 138/149] chore(deps): update graalvm/setup-graalvm action to v1.2.6 (#2249) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 26ae97640f..22e563ad58 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: fetch-depth: 0 - name: "🔧 Setup GraalVM CE" - uses: graalvm/setup-graalvm@v1.2.5 + uses: graalvm/setup-graalvm@v1.2.6 with: distribution: 'graalvm' java-version: ${{ matrix.java }} From da6f12ce5701b87db40aafe6b8493014eb98878e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 01:30:55 +0000 Subject: [PATCH 139/149] fix(deps): update aws-java-sdk monorepo to v1.12.778 (#2251) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ebc70656e0..62e038c542 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ micronaut-views = "5.5.1" micronaut-validation = "4.8.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.777' +managed-aws-java-sdk-v1 = '1.12.778' managed-aws-java-sdk-v2 = '2.29.11' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.14.0' From c18bc74d224e1f224bdab1b69a788290f9087422 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:57:41 +0000 Subject: [PATCH 140/149] fix(deps): update dependency io.micronaut.security:micronaut-security-bom to v4.11.1 (#2252) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 62e038c542..c605c189b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ micronaut-groovy = "4.4.0" micronaut-logging = "1.4.0" micronaut-mongodb = "5.5.0" micronaut-reactor = "3.6.0" -micronaut-security = "4.11.0" +micronaut-security = "4.11.1" micronaut-serde = "2.12.0" micronaut-servlet = "4.12.0" micronaut-test-resources="2.6.2" From 96d5a3deb8e67f7f452e56b3f604a08e6bc921b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:34:07 +0000 Subject: [PATCH 141/149] chore(deps): update dependency gradle to v8.11.1 (#2255) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f200e..e2847c8200 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From bcb5380468c0d1e96eb31a8a4b412e39ff239e80 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 01:56:20 +0000 Subject: [PATCH 142/149] fix(deps): update dependency io.micronaut.security:micronaut-security-bom to v4.11.2 (#2256) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c605c189b8..f5c632d977 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ micronaut-groovy = "4.4.0" micronaut-logging = "1.4.0" micronaut-mongodb = "5.5.0" micronaut-reactor = "3.6.0" -micronaut-security = "4.11.1" +micronaut-security = "4.11.2" micronaut-serde = "2.12.0" micronaut-servlet = "4.12.0" micronaut-test-resources="2.6.2" From ebefae7d276b833b5c49f8446d86a9eddf09f695 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 00:21:17 +0000 Subject: [PATCH 143/149] fix(deps): update aws-java-sdk monorepo to v1.12.779 (#2258) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5c632d977..c7d79230db 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ micronaut-views = "5.5.1" micronaut-validation = "4.8.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.778' +managed-aws-java-sdk-v1 = '1.12.779' managed-aws-java-sdk-v2 = '2.29.11' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.14.0' From aa5dcec3faed346e4b599b8b8d6654fcb409284b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 01:24:31 +0000 Subject: [PATCH 144/149] fix(deps): update aws-java-sdk monorepo to v1.12.780 (#2261) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c7d79230db..73cfbd3d30 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ micronaut-views = "5.5.1" micronaut-validation = "4.8.0" managed-alexa-ask-sdk = "2.86.0" -managed-aws-java-sdk-v1 = '1.12.779' +managed-aws-java-sdk-v1 = '1.12.780' managed-aws-java-sdk-v2 = '2.29.11' managed-aws-lambda = '1.2.3' managed-aws-lambda-events = '3.14.0' From d21ae2f82bf986bd85fae5631e606c15b905d394 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:54:12 +0100 Subject: [PATCH 145/149] chore(deps): update dependency gradle to v8.12 (#2263) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8200..cea7a793a8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6b..f3b75f3b0d 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum From dd2e91508d4c970ecb670a07ad298a8906a121a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:54:23 +0100 Subject: [PATCH 146/149] chore(deps): update actions/upload-artifact action to v4.5.0 (#2262) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 22e563ad58..571e79a24a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -78,7 +78,7 @@ jobs: - name: "📜 Upload binary compatibility check results" if: matrix.java == '17' - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 with: name: binary-compatibility-reports path: "**/build/reports/binary-compatibility-*.html" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dda058489..ba8ad7eed7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,13 +66,13 @@ jobs: # Store the hash in a file, which is uploaded as a workflow artifact. sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256 - name: Upload build artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 with: name: gradle-build-outputs path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/* retention-days: 5 - name: Upload artifacts-sha256 - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 with: name: artifacts-sha256 path: artifacts-sha256 From 5a7744458e2f35b17c9808511f54823aaed5fa97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:54:34 +0100 Subject: [PATCH 147/149] chore(deps): update softprops/action-gh-release action to v2.2.0 (#2253) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba8ad7eed7..d760186c8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -160,6 +160,6 @@ jobs: - name: Upload assets # Upload the artifacts to the existing release. Note that the SLSA provenance will # attest to each artifact file and not the aggregated ZIP file. - uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9 + uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0 with: files: artifacts.zip From ecc598d242eb1df9312aca72966c909bb2a91ebb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:54:49 +0100 Subject: [PATCH 148/149] chore(deps): update plugin io.micronaut.build.shared.settings to v7.3.0 (#2257) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 520d48448e..c2d4d3d665 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "7.2.3" + id("io.micronaut.build.shared.settings") version "7.3.0" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 263e52ebaf7977c069e66638ecfd8d20183c305b Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Mon, 23 Dec 2024 09:58:46 +0100 Subject: [PATCH 149/149] ci: projectVersion=4.9.0-SNAPSHOT [ci skip] --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0e235b7c4c..5b729205b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=4.8.1-SNAPSHOT +projectVersion=4.9.0-SNAPSHOT projectGroup=io.micronaut.aws title=Micronaut AWS