From 90d126bf15907f48fcaf3e3386baa200ffd45b3a Mon Sep 17 00:00:00 2001 From: David-DAM <82216301+David-DAM@users.noreply.github.com> Date: Sat, 1 Aug 2026 11:08:24 +0200 Subject: [PATCH 1/2] Update all examples, dependencies, and documentation to use Java 17 as the minimum supported version. --- .github/workflows/check-build.yml | 1 - .github/workflows/check-e2e.yml | 1 - Makefile | 2 +- README.md | 20 +++++------ docs/core/logging.md | 20 +++++------ docs/core/metrics.md | 12 +++---- docs/core/tracing.md | 14 ++++---- docs/index.md | 20 +++++------ docs/upgrade.md | 34 +++++++++---------- docs/utilities/idempotency.md | 12 +++---- docs/utilities/lambda_metadata.md | 4 +-- docs/utilities/large_messages.md | 10 +++--- docs/utilities/parameters.md | 10 +++--- docs/utilities/validation.md | 10 +++--- examples/README.md | 3 +- .../deploy/ddb-streams/template.yaml | 2 +- .../deploy/kinesis/template.yml | 2 +- .../deploy/sqs/template.yml | 2 +- examples/powertools-examples-batch/pom.xml | 4 +-- .../README.md | 2 +- .../infra/cdk/pom.xml | 4 +-- .../infra/sam/template.yaml | 2 +- .../pom.xml | 4 +-- .../cdk/app/pom.xml | 4 +-- .../cdk/infra/pom.xml | 4 +-- .../cdk/infra/src/main/java/cdk/CdkStack.java | 8 ++--- .../gradle/README.md | 2 +- .../gradle/build.gradle | 4 +-- .../gradle/template.yaml | 6 ++-- .../kotlin/README.md | 2 +- .../kotlin/build.gradle.kts | 2 +- .../kotlin/template.yaml | 6 ++-- .../sam-bazel/BUILD.bazel | 2 +- .../sam-bazel/template.yaml | 2 +- .../sam-graalvm/pom.xml | 4 +-- .../sam/pom.xml | 4 +-- .../sam/template.yaml | 2 +- .../serverless/pom.xml | 4 +-- .../serverless/serverless.yml | 2 +- .../terraform/infra/lambda.tf | 4 +-- .../terraform/pom.xml | 4 +-- .../sam-graalvm/pom.xml | 4 +-- .../sam/pom.xml | 4 +-- .../sam/template.yaml | 2 +- examples/powertools-examples-kafka/README.md | 2 +- examples/powertools-examples-kafka/pom.xml | 4 +-- .../powertools-examples-kafka/template.yaml | 2 +- .../powertools-examples-kafka/tools/pom.xml | 4 +-- .../sam-graalvm/pom.xml | 4 +-- .../sam/pom.xml | 4 +-- .../sam/template.yaml | 2 +- .../sam-graalvm/pom.xml | 4 +-- .../sam/pom.xml | 4 +-- .../sam/template.yaml | 2 +- .../powertools-examples-validation/pom.xml | 4 +-- .../template.yaml | 2 +- pom.xml | 6 ++-- powertools-e2e-tests/README.md | 4 +-- powertools-e2e-tests/handlers/pom.xml | 13 ++----- powertools-e2e-tests/pom.xml | 4 +-- .../powertools/testutils/Infrastructure.java | 9 ++--- .../powertools/testutils/JavaRuntime.java | 1 - 62 files changed, 164 insertions(+), 182 deletions(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index bef04340e..f3ae5f948 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -72,7 +72,6 @@ jobs: strategy: matrix: java: - - 11 - 17 - 21 - 25 diff --git a/.github/workflows/check-e2e.yml b/.github/workflows/check-e2e.yml index d37097d10..a4b6ff31e 100644 --- a/.github/workflows/check-e2e.yml +++ b/.github/workflows/check-e2e.yml @@ -99,7 +99,6 @@ jobs: max-parallel: 20 matrix: java: - - 11 - 17 - 21 - 25 diff --git a/Makefile b/Makefile index 8fa41a398..86eded613 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ build-docs-website: docs-local-docker: docker build -t squidfunk/mkdocs-material ./docs/ - docker run --rm -it -p 8000:8000 -v ${PWD}:/docs squidfunk/mkdocs-material + docker run --rm -it -p 8000:8000 -v $(CURDIR):/docs squidfunk/mkdocs-material test: mvn test diff --git a/README.md b/README.md index 6e5216b4f..66a7a854f 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ Next, configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lam aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -120,14 +120,14 @@ Next, configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lam implementation "org.aspectj:aspectjrt:1.9.22" } - sourceCompatibility = 11 - targetCompatibility = 11 + sourceCompatibility = 17 + targetCompatibility = 17 ``` ### Java Compatibility -Powertools for AWS Lambda (Java) supports all Java versions from 11 to 25 in line with the [corresponding Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html). +Powertools for AWS Lambda (Java) supports all Java versions from 17 to 25 in line with the [corresponding Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html). For the modules that provide annotations, Powertools for AWS Lambda (Java) leverages the **aspectj** library. You may need to add the appropriate version of `aspectjrt` to your dependencies based on the JDK used for building your function: @@ -146,10 +146,10 @@ You may need to add the appropriate version of `aspectjrt` to your dependencies Use the following [dependency matrix](https://github.com/eclipse-aspectj/aspectj/blob/master/docs/release/JavaVersionCompatibility.adoc) to understand which AspectJ version to use based on your JDK version: | JDK version | aspectj version | -|-------------|------------------------| -| `11-17` | `1.9.20.1` (or higher) | -| `21` | `1.9.21` (or higher) | -| `25` | `1.9.25` (or higher) | +|-----------|------------------------| +| `17` | `1.9.20.1` (or higher) | +| `21` | `1.9.21` (or higher) | +| `25` | `1.9.25` (or higher) | diff --git a/docs/core/logging.md b/docs/core/logging.md index 4a53e06e2..bb6f8392a 100644 --- a/docs/core/logging.md +++ b/docs/core/logging.md @@ -54,9 +54,9 @@ Depending on preference, you must choose to use either _log4j2_ or _logback_ as aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -113,9 +113,9 @@ Depending on preference, you must choose to use either _log4j2_ or _logback_ as aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -163,8 +163,8 @@ Depending on preference, you must choose to use either _log4j2_ or _logback_ as implementation 'software.amazon.lambda:powertools-logging-log4j:{{ powertools.version }}' } - sourceCompatibility = 11 - targetCompatibility = 11 + sourceCompatibility = 17 + targetCompatibility = 17 ``` === "logback" @@ -184,8 +184,8 @@ Depending on preference, you must choose to use either _log4j2_ or _logback_ as implementation 'software.amazon.lambda:powertools-logging-logback:{{ powertools.version }}' } - sourceCompatibility = 11 - targetCompatibility = 11 + sourceCompatibility = 17 + targetCompatibility = 17 ``` diff --git a/docs/core/metrics.md b/docs/core/metrics.md index e7f7bd87f..372fcc7e1 100644 --- a/docs/core/metrics.md +++ b/docs/core/metrics.md @@ -57,9 +57,9 @@ Visit the AWS documentation for a complete explanation for [Amazon CloudWatch co aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -105,8 +105,8 @@ Visit the AWS documentation for a complete explanation for [Amazon CloudWatch co implementation 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}' // Use this instead of 'aspect' when using the functional approach } - sourceCompatibility = 11 - targetCompatibility = 11 + sourceCompatibility = 17 + targetCompatibility = 17 ``` ## Getting started @@ -181,7 +181,7 @@ For most use-cases, we recommend using Environment variables and only overwrite Type: AWS::Serverless::Function Properties: ... - Runtime: java11 + Runtime: java17 Environment: Variables: POWERTOOLS_SERVICE_NAME: payment diff --git a/docs/core/tracing.md b/docs/core/tracing.md index 1cd37f91c..d98817f57 100644 --- a/docs/core/tracing.md +++ b/docs/core/tracing.md @@ -41,9 +41,9 @@ a provides functionality to reduce the overhead of performing common tracing tas aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -89,8 +89,8 @@ a provides functionality to reduce the overhead of performing common tracing tas implementation 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}' // Use this instead of 'aspect' when using the functional approach } - sourceCompatibility = 11 // or higher - targetCompatibility = 11 // or higher + sourceCompatibility = 17 // or higher + targetCompatibility = 17 // or higher ``` ## Initialization @@ -107,7 +107,7 @@ Before your use this utility, your AWS Lambda function [must have permissions](h Type: AWS::Serverless::Function Properties: ... - Runtime: java11 + Runtime: java17 Tracing: Active Environment: @@ -217,7 +217,7 @@ specifying a different `captureMode` to always record response, exception, both, Type: AWS::Serverless::Function Properties: ... - Runtime: java11 + Runtime: java17 Tracing: Active Environment: diff --git a/docs/index.md b/docs/index.md index 655c16e03..a38135aa5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -118,9 +118,9 @@ Powertools for AWS Lambda (Java) dependencies are available in Maven Central. Yo aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -183,15 +183,15 @@ Powertools for AWS Lambda (Java) dependencies are available in Maven Central. Yo aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}' } - sourceCompatibility = 11 - targetCompatibility = 11 + sourceCompatibility = 17 + targetCompatibility = 17 ``` ???+ tip "Don't want to use AspectJ?" Powertools for AWS Lambda (Java) now provides a functional API that doesn't require AspectJ configuration. Learn more about the [functional approach](./usage-patterns.md#functional-approach). ### Java Compatibility -Powertools for AWS Lambda (Java) supports all Java versions from 11 to 25 in line with the [corresponding Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html). +Powertools for AWS Lambda (Java) supports all Java versions from 17 to 25 in line with the [corresponding Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html). In addition to the functional approach, [Logging](./core/logging.md), [Metrics](./core/metrics.md), [Tracing](./core/tracing.md), [Parameters](./utilities/parameters.md), [Idempotency](./utilities/idempotency.md), [Validation](./utilities/validation.md), and [Large Messages](./utilities/large_messages.md) utilities support annotations using AspectJ, which require configuration of the `aspectjrt` runtime library. @@ -208,10 +208,10 @@ You may need to add the appropriate version of `aspectjrt` to your dependencies Use the following [dependency matrix](https://github.com/eclipse-aspectj/aspectj/blob/master/docs/release/JavaVersionCompatibility.adoc) to understand which AspectJ version to use based on your JDK version: | JDK version | aspectj version | -|-------------|------------------------| -| `11-17` | `1.9.20.1` (or higher) | -| `21` | `1.9.21` (or higher) | -| `25` | `1.9.25` (or higher) | +|----------|------------------------| +| `17` | `1.9.20.1` (or higher) | +| `21` | `1.9.21` (or higher) | +| `25` | `1.9.25` (or higher) | ## Environment variables diff --git a/docs/upgrade.md b/docs/upgrade.md index c9662a3db..fae07f555 100644 --- a/docs/upgrade.md +++ b/docs/upgrade.md @@ -22,29 +22,29 @@ We've made minimal breaking changes to make your transition to `v2` as smooth as The following table shows a summary of the changes made in `v2` and whether code changes are necessary. Each change that requires a code change links to a section below explaining more details. -| Area | Change | Code change required | -| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------- | -| **Logging** | The [logging module was re-designed](#redesigned-logging-utility) from scratch to support popular Java logging paradigms and libraries like `log4j2`, `logback`, and `slf4j`. | Yes | -| **Metrics** | [Changed public interface](#updated-metrics-utility-interface) to remove direct coupling with `aws-embedded-metrics-java`. | Yes | -| **Tracing** | [Removed deprecated `captureResponse` and `captureError` options](#deprecated-capture-mode-related-tracing-annotation-parameters) on `@Tracing` annotation. | Yes | -| **Idempotency** | The [`powertools-idempotency` module was split by provider](#idempotency-utility-split-into-sub-modules-by-provider) to improve modularity and reduce the deployment package size. | Yes | -| **Idempotency** | Updated `IdempotencyConfig` interface to support addition of response hooks. | No | -| **Parameters** | The [`powertools-parameters` module was split by provider](#parameters-utility-split-into-sub-modules-by-provider) to improve modularity and reduce the deployment package size. | Yes | +| Area | Change | Code change required | +| -------------------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -------------------- | +| **Logging** | The [logging module was re-designed](#redesigned-logging-utility) from scratch to support popular Java logging paradigms and libraries like `log4j2`, `logback`, and `slf4j`. | Yes | +| **Metrics** | [Changed public interface](#updated-metrics-utility-interface) to remove direct coupling with `aws-embedded-metrics-java`. | Yes | +| **Tracing** | [Removed deprecated `captureResponse` and `captureError` options](#deprecated-capture-mode-related-tracing-annotation-parameters) on `@Tracing` annotation. | Yes | +| **Idempotency** | The [`powertools-idempotency` module was split by provider](#idempotency-utility-split-into-sub-modules-by-provider) to improve modularity and reduce the deployment package size. | Yes | +| **Idempotency** | Updated `IdempotencyConfig` interface to support addition of response hooks. | No | +| **Parameters** | The [`powertools-parameters` module was split by provider](#parameters-utility-split-into-sub-modules-by-provider) to improve modularity and reduce the deployment package size. | Yes | | **Batch Processing** | [Removed deprecated `powertools-sqs` module](#removed-powertools-sqs-module-in-favor-of-powertools-batch) in favor of the more generic [Batch Processing](./utilities/batch.md) utility. | Yes | -| **Batch Processing** | Updated Batch Processing `BatchMessageHandler` interface to add support for parallel processing. | No | -| **Validation** | The `@Validation` utility returns 4xx error codes instead of 5xx error codes when used with API Gateway now. | No | -| **Validation** | Validating batch event sources now adds failed events as partial batch failures and does not fail the whole batch anymore. | No | -| **Custom Resources** | [Removed deprecated `Response.failed()` and `Response.success()` methods](#custom-resources-updates-the-response-class). | Yes | -| **Custom Resources** | Changed interface of `Response` class to add an optional `reason` field. | No | -| **Dependencies** | Renamed `powertools-core` to `powertools-common`. This module should not be used as direct dependency and is listed here for completeness. | No | -| **Dependencies** | [Removed `org.aspectj.aspectjrt` as project dependency](#aspectj-runtime-not-included-by-default-anymore) in favor of consumers including the version they prefer. | Yes | -| **Language support** | Removed support for Java 8. The minimum required Java version is Java 11. | N/A | +| **Batch Processing** | Updated Batch Processing `BatchMessageHandler` interface to add support for parallel processing. | No | +| **Validation** | The `@Validation` utility returns 4xx error codes instead of 5xx error codes when used with API Gateway now. | No | +| **Validation** | Validating batch event sources now adds failed events as partial batch failures and does not fail the whole batch anymore. | No | +| **Custom Resources** | [Removed deprecated `Response.failed()` and `Response.success()` methods](#custom-resources-updates-the-response-class). | Yes | +| **Custom Resources** | Changed interface of `Response` class to add an optional `reason` field. | No | +| **Dependencies** | Renamed `powertools-core` to `powertools-common`. This module should not be used as direct dependency and is listed here for completeness. | No | +| **Dependencies** | [Removed `org.aspectj.aspectjrt` as project dependency](#aspectj-runtime-not-included-by-default-anymore) in favor of consumers including the version they prefer. | Yes | +| **Language support** | Removed support for Java 11. The minimum required Java version is Java 17. | N/A | ### First Steps Before you start, we suggest making a copy of your current working project or create a new branch with `git`. -1. **Upgrade** Java to at least version 11. While version 11 is supported, we recommend using the [newest available LTS version](https://downloads.corretto.aws/#/downloads){target="\_blank"} of Java. +1. **Upgrade** Java to at least version 17. While version 17 is supported, we recommend using the [newest available LTS version](https://downloads.corretto.aws/#/downloads){target="\_blank"} of Java. 2. **Review** the following section to confirm if you need to make changes to your code. ## Redesigned Logging Utility diff --git a/docs/utilities/idempotency.md b/docs/utilities/idempotency.md index cecc65d7b..628b648f1 100644 --- a/docs/utilities/idempotency.md +++ b/docs/utilities/idempotency.md @@ -50,9 +50,9 @@ times with the same parameters**. This makes idempotent operations safe to retry aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -98,8 +98,8 @@ times with the same parameters**. This makes idempotent operations safe to retry implementation 'software.amazon.lambda:powertools-idempotency-dynamodb:{{ powertools.version }}' } - sourceCompatibility = 11 // or higher - targetCompatibility = 11 // or higher + sourceCompatibility = 17 // or higher + targetCompatibility = 17 // or higher ``` ### Required resources @@ -1256,7 +1256,7 @@ To unit test your function with DynamoDB Local, you can refer to this guide to [ com.amazonaws DynamoDBLocal - + 2.2.0 test diff --git a/docs/utilities/lambda_metadata.md b/docs/utilities/lambda_metadata.md index e79af2e32..ab29cbfc1 100644 --- a/docs/utilities/lambda_metadata.md +++ b/docs/utilities/lambda_metadata.md @@ -43,8 +43,8 @@ Lambda Metadata provides idiomatic access to the Lambda Metadata Endpoint (LMDS) implementation 'software.amazon.lambda:powertools-lambda-metadata:{{ powertools.version }}' } - sourceCompatibility = 11 - targetCompatibility = 11 + sourceCompatibility = 17 + targetCompatibility = 17 ``` ### IAM Permissions diff --git a/docs/utilities/large_messages.md b/docs/utilities/large_messages.md index 893d62832..cfd35f0de 100644 --- a/docs/utilities/large_messages.md +++ b/docs/utilities/large_messages.md @@ -115,9 +115,9 @@ of [amazon-sqs-java-extended-client-lib](https://github.com/awslabs/amazon-sqs-j aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -162,8 +162,8 @@ of [amazon-sqs-java-extended-client-lib](https://github.com/awslabs/amazon-sqs-j aspect 'software.amazon.lambda:powertools-large-messages:{{ powertools.version }}' // Use 'implementation' instead of 'aspect' when using the functional approach } - sourceCompatibility = 11 // or higher - targetCompatibility = 11 // or higher + sourceCompatibility = 17 // or higher + targetCompatibility = 17 // or higher ``` ## Permissions diff --git a/docs/utilities/parameters.md b/docs/utilities/parameters.md index 6de47df68..7b84c354c 100644 --- a/docs/utilities/parameters.md +++ b/docs/utilities/parameters.md @@ -58,9 +58,9 @@ Note that you must provide the concrete parameters module you want to use below aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 @@ -108,8 +108,8 @@ Note that you must provide the concrete parameters module you want to use below implementation 'software.amazon.lambda:powertools-parameters-secrets:{{ powertools.version }}' // Use this instead of 'aspect' when using provider classes directly } - sourceCompatibility = 11 // or higher - targetCompatibility = 11 // or higher + sourceCompatibility = 17 // or higher + targetCompatibility = 17 // or higher ``` **IAM Permissions** diff --git a/docs/utilities/validation.md b/docs/utilities/validation.md index 8e0d2c631..67eb2fc92 100644 --- a/docs/utilities/validation.md +++ b/docs/utilities/validation.md @@ -35,9 +35,9 @@ This utility provides JSON Schema validation for payloads held within events and aspectj-maven-plugin 1.14 - 11 - 11 - 11 + 17 + 17 + 17 software.amazon.lambda @@ -83,8 +83,8 @@ This utility provides JSON Schema validation for payloads held within events and implementation 'software.amazon.lambda:powertools-validation:{{ powertools.version }}' // Use this instead of 'aspect' when using the functional approach } - sourceCompatibility = 11 // or higher - targetCompatibility = 11 // or higher + sourceCompatibility = 17 // or higher + targetCompatibility = 17 // or higher ``` ## Validating events diff --git a/examples/README.md b/examples/README.md index 727bc652e..bd0df1a77 100644 --- a/examples/README.md +++ b/examples/README.md @@ -34,7 +34,7 @@ Many of the examples use [AWS Serverless Application Model](https://aws.amazon.c To use the SAM CLI, you need the following tools. * SAM CLI - [Install the SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) -* Java11 - [Install the Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html) +* Java17 - [Install the Java 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html) * Maven - [Install Maven](https://maven.apache.org/install.html) * Docker - [Install Docker community edition](https://hub.docker.com/search/?type=edition&offering=community) @@ -67,7 +67,6 @@ If you're not using SAM, you can look for examples for other tools under [powert You can find more examples in the https://github.com/aws/aws-sam-cli-app-templates project: -* [Java 11 + Maven](https://github.com/aws/aws-sam-cli-app-templates/tree/master/java11/hello-pt-maven) * [Java 17 + Maven](https://github.com/aws/aws-sam-cli-app-templates/tree/master/java17/hello-pt-maven) * [Java 17 + Gradle](https://github.com/aws/aws-sam-cli-app-templates/tree/master/java17/hello-pt-gradle) diff --git a/examples/powertools-examples-batch/deploy/ddb-streams/template.yaml b/examples/powertools-examples-batch/deploy/ddb-streams/template.yaml index 91f8799c4..71d3bfbdd 100644 --- a/examples/powertools-examples-batch/deploy/ddb-streams/template.yaml +++ b/examples/powertools-examples-batch/deploy/ddb-streams/template.yaml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active Architectures: diff --git a/examples/powertools-examples-batch/deploy/kinesis/template.yml b/examples/powertools-examples-batch/deploy/kinesis/template.yml index dcece61b8..2f86a5d65 100644 --- a/examples/powertools-examples-batch/deploy/kinesis/template.yml +++ b/examples/powertools-examples-batch/deploy/kinesis/template.yml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active Environment: diff --git a/examples/powertools-examples-batch/deploy/sqs/template.yml b/examples/powertools-examples-batch/deploy/sqs/template.yml index 1232e4d51..2ed6152a3 100644 --- a/examples/powertools-examples-batch/deploy/sqs/template.yml +++ b/examples/powertools-examples-batch/deploy/sqs/template.yml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 5400 Environment: Variables: diff --git a/examples/powertools-examples-batch/pom.xml b/examples/powertools-examples-batch/pom.xml index 264e3ecf5..ff9678009 100644 --- a/examples/powertools-examples-batch/pom.xml +++ b/examples/powertools-examples-batch/pom.xml @@ -11,8 +11,8 @@ Powertools for AWS Lambda (Java) - Examples - Batch - 11 - 11 + 17 + 17 1.9.20.1 2.44.13 diff --git a/examples/powertools-examples-cloudformation/README.md b/examples/powertools-examples-cloudformation/README.md index aff40b331..94b775570 100644 --- a/examples/powertools-examples-cloudformation/README.md +++ b/examples/powertools-examples-cloudformation/README.md @@ -22,7 +22,7 @@ sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-2.10. To use CDK you need the following tools. * CDK - [Install CDK](https://docs.aws.amazon.com/cdk/v2/guide/getting_started.html) -* Java 11 - [Install Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html) +* Java 17 - [Install Java 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html) * Maven - [Install Maven](https://maven.apache.org/install.html) * Docker - [Install Docker community edition](https://hub.docker.com/search/?type=edition&offering=community) diff --git a/examples/powertools-examples-cloudformation/infra/cdk/pom.xml b/examples/powertools-examples-cloudformation/infra/cdk/pom.xml index b1cdb5f0b..e05302154 100644 --- a/examples/powertools-examples-cloudformation/infra/cdk/pom.xml +++ b/examples/powertools-examples-cloudformation/infra/cdk/pom.xml @@ -20,8 +20,8 @@ maven-compiler-plugin 3.8.1 - 8 - 8 + 17 + 17 diff --git a/examples/powertools-examples-cloudformation/infra/sam/template.yaml b/examples/powertools-examples-cloudformation/infra/sam/template.yaml index a7ce4adf1..885fb6921 100644 --- a/examples/powertools-examples-cloudformation/infra/sam/template.yaml +++ b/examples/powertools-examples-cloudformation/infra/sam/template.yaml @@ -25,7 +25,7 @@ Resources: Properties: CodeUri: ../../ Handler: helloworld.App::handleRequest - Runtime: java11 + Runtime: java17 Architectures: - x86_64 MemorySize: 512 diff --git a/examples/powertools-examples-cloudformation/pom.xml b/examples/powertools-examples-cloudformation/pom.xml index dad22be74..8f1637fe7 100644 --- a/examples/powertools-examples-cloudformation/pom.xml +++ b/examples/powertools-examples-cloudformation/pom.xml @@ -10,8 +10,8 @@ Powertools for AWS Lambda (Java) - Examples - CloudFormation - 11 - 11 + 17 + 17 1.4.0 3.16.1 2.48.0 diff --git a/examples/powertools-examples-core-utilities/cdk/app/pom.xml b/examples/powertools-examples-core-utilities/cdk/app/pom.xml index 12206f52b..ea3e78ec6 100644 --- a/examples/powertools-examples-core-utilities/cdk/app/pom.xml +++ b/examples/powertools-examples-core-utilities/cdk/app/pom.xml @@ -12,8 +12,8 @@ 2.26.0 - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-core-utilities/cdk/infra/pom.xml b/examples/powertools-examples-core-utilities/cdk/infra/pom.xml index 8f8bcd899..79c88281c 100644 --- a/examples/powertools-examples-core-utilities/cdk/infra/pom.xml +++ b/examples/powertools-examples-core-utilities/cdk/infra/pom.xml @@ -18,8 +18,8 @@ maven-compiler-plugin 3.15.0 - 11 - 11 + 17 + 17 diff --git a/examples/powertools-examples-core-utilities/cdk/infra/src/main/java/cdk/CdkStack.java b/examples/powertools-examples-core-utilities/cdk/infra/src/main/java/cdk/CdkStack.java index 8e6b44112..517523e32 100644 --- a/examples/powertools-examples-core-utilities/cdk/infra/src/main/java/cdk/CdkStack.java +++ b/examples/powertools-examples-core-utilities/cdk/infra/src/main/java/cdk/CdkStack.java @@ -94,13 +94,13 @@ private Function createHelloWorldFunction() { environment.put("POWERTOOLS_METRICS_NAMESPACE", "Coreutilities"); return Function.Builder.create(this, "HelloWorldFunction") - .runtime(Runtime.JAVA_11) + .runtime(Runtime.JAVA_17) .memorySize(512) .timeout(Duration.seconds(20)) .tracing(Tracing.ACTIVE) .code(Code.fromAsset("../app/", AssetOptions.builder() .bundling(BundlingOptions.builder() - .image(Runtime.JAVA_11.getBundlingImage()) + .image(Runtime.JAVA_17.getBundlingImage()) .command(functionPackageInstructions) .build()) .build())) @@ -120,13 +120,13 @@ private Function createHelloWorldStreamFunction() { environment.put("POWERTOOLS_SERVICE_NAME", "hello"); return Function.Builder.create(this, "HelloWorldStreamFunction") - .runtime(Runtime.JAVA_11) + .runtime(Runtime.JAVA_17) .memorySize(512) .timeout(Duration.seconds(20)) .tracing(Tracing.ACTIVE) .code(Code.fromAsset("../app/", AssetOptions.builder() .bundling(BundlingOptions.builder() - .image(Runtime.JAVA_11.getBundlingImage()) + .image(Runtime.JAVA_17.getBundlingImage()) .command(functionPackageInstructions) .build()) .build())) diff --git a/examples/powertools-examples-core-utilities/gradle/README.md b/examples/powertools-examples-core-utilities/gradle/README.md index adc7fe635..3c84e636b 100644 --- a/examples/powertools-examples-core-utilities/gradle/README.md +++ b/examples/powertools-examples-core-utilities/gradle/README.md @@ -1,7 +1,7 @@ # Powertools for AWS Lambda (Java) - Core Utilities Example with Gradle This project demonstrates the Lambda for Powertools Java module deployed using [Serverless Application Model](https://aws.amazon.com/serverless/sam/) with -[Gradle](https://gradle.org/) running the build. This example is configured for Java 11 only; in order to use a newer version, check out the Gradle +[Gradle](https://gradle.org/) running the build. This example is configured for Java 17 only; in order to use a newer version, check out the Gradle configuration guide [in the main project README](../../../README.md). You can also use `sam init` to create a new Gradle-powered Powertools application - choose to use the **AWS Quick Start Templates**, diff --git a/examples/powertools-examples-core-utilities/gradle/build.gradle b/examples/powertools-examples-core-utilities/gradle/build.gradle index 5a81bd53d..47591eec6 100644 --- a/examples/powertools-examples-core-utilities/gradle/build.gradle +++ b/examples/powertools-examples-core-utilities/gradle/build.gradle @@ -9,8 +9,8 @@ wrapper { } compileJava { - sourceCompatibility = "11" - targetCompatibility = "11" + sourceCompatibility = "17" + targetCompatibility = "17" ajc { enabled = true diff --git a/examples/powertools-examples-core-utilities/gradle/template.yaml b/examples/powertools-examples-core-utilities/gradle/template.yaml index 1a1572fca..a1e0d808b 100644 --- a/examples/powertools-examples-core-utilities/gradle/template.yaml +++ b/examples/powertools-examples-core-utilities/gradle/template.yaml @@ -9,7 +9,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active # https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html Environment: @@ -26,7 +26,7 @@ Resources: Properties: CodeUri: . Handler: helloworld.App::handleRequest - Runtime: java11 + Runtime: java17 MemorySize: 512 Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object Variables: @@ -43,7 +43,7 @@ Resources: Properties: CodeUri: . Handler: helloworld.AppStream::handleRequest - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active Environment: diff --git a/examples/powertools-examples-core-utilities/kotlin/README.md b/examples/powertools-examples-core-utilities/kotlin/README.md index 422e12742..01d630f5e 100644 --- a/examples/powertools-examples-core-utilities/kotlin/README.md +++ b/examples/powertools-examples-core-utilities/kotlin/README.md @@ -1,7 +1,7 @@ # Powertools for AWS Lambda (Kotlin) - Core Utilities Example This project demonstrates the Lambda for Powertools Kotlin module deployed using [Serverless Application Model](https://aws.amazon.com/serverless/sam/) with -[Gradle](https://gradle.org/) running the build. This example is configured for Java 11 only; in order to use a newer version, check out the Gradle +[Gradle](https://gradle.org/) running the build. This example is configured for Java 17 only; in order to use a newer version, check out the Gradle configuration guide [in the main project README](../../../README.md). You can also use `sam init` to create a new Gradle-powered Powertools application - choose to use the **AWS Quick Start Templates**, diff --git a/examples/powertools-examples-core-utilities/kotlin/build.gradle.kts b/examples/powertools-examples-core-utilities/kotlin/build.gradle.kts index 7d2a3b831..97be84e6a 100644 --- a/examples/powertools-examples-core-utilities/kotlin/build.gradle.kts +++ b/examples/powertools-examples-core-utilities/kotlin/build.gradle.kts @@ -22,5 +22,5 @@ dependencies { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } diff --git a/examples/powertools-examples-core-utilities/kotlin/template.yaml b/examples/powertools-examples-core-utilities/kotlin/template.yaml index 1a1572fca..a1e0d808b 100644 --- a/examples/powertools-examples-core-utilities/kotlin/template.yaml +++ b/examples/powertools-examples-core-utilities/kotlin/template.yaml @@ -9,7 +9,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active # https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html Environment: @@ -26,7 +26,7 @@ Resources: Properties: CodeUri: . Handler: helloworld.App::handleRequest - Runtime: java11 + Runtime: java17 MemorySize: 512 Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object Variables: @@ -43,7 +43,7 @@ Resources: Properties: CodeUri: . Handler: helloworld.AppStream::handleRequest - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active Environment: diff --git a/examples/powertools-examples-core-utilities/sam-bazel/BUILD.bazel b/examples/powertools-examples-core-utilities/sam-bazel/BUILD.bazel index 97fa37394..ab87b9903 100644 --- a/examples/powertools-examples-core-utilities/sam-bazel/BUILD.bazel +++ b/examples/powertools-examples-core-utilities/sam-bazel/BUILD.bazel @@ -49,7 +49,7 @@ genrule( -inpath "$$BASE_JAR" \ -aspectpath "$$POWERTOOLS_JARS" \ -outjar $(location powertools_sam_lib_woven.jar) \ - -source 11 -target 11 -nowarn + -source 17 -target 17 -nowarn """, ) diff --git a/examples/powertools-examples-core-utilities/sam-bazel/template.yaml b/examples/powertools-examples-core-utilities/sam-bazel/template.yaml index 1e489b8eb..527b1d44d 100644 --- a/examples/powertools-examples-core-utilities/sam-bazel/template.yaml +++ b/examples/powertools-examples-core-utilities/sam-bazel/template.yaml @@ -7,7 +7,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active # https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html Environment: diff --git a/examples/powertools-examples-core-utilities/sam-graalvm/pom.xml b/examples/powertools-examples-core-utilities/sam-graalvm/pom.xml index 6204dc906..8c744a95c 100644 --- a/examples/powertools-examples-core-utilities/sam-graalvm/pom.xml +++ b/examples/powertools-examples-core-utilities/sam-graalvm/pom.xml @@ -10,8 +10,8 @@ 2.26.0 - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-core-utilities/sam/pom.xml b/examples/powertools-examples-core-utilities/sam/pom.xml index 917215c21..30ef3bcc3 100644 --- a/examples/powertools-examples-core-utilities/sam/pom.xml +++ b/examples/powertools-examples-core-utilities/sam/pom.xml @@ -9,8 +9,8 @@ jar - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-core-utilities/sam/template.yaml b/examples/powertools-examples-core-utilities/sam/template.yaml index 6b1814dce..696215134 100644 --- a/examples/powertools-examples-core-utilities/sam/template.yaml +++ b/examples/powertools-examples-core-utilities/sam/template.yaml @@ -7,7 +7,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active # https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html Environment: diff --git a/examples/powertools-examples-core-utilities/serverless/pom.xml b/examples/powertools-examples-core-utilities/serverless/pom.xml index 8e5ff0c9c..1a348643a 100644 --- a/examples/powertools-examples-core-utilities/serverless/pom.xml +++ b/examples/powertools-examples-core-utilities/serverless/pom.xml @@ -9,8 +9,8 @@ jar - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-core-utilities/serverless/serverless.yml b/examples/powertools-examples-core-utilities/serverless/serverless.yml index d8dec8080..200b88e6d 100644 --- a/examples/powertools-examples-core-utilities/serverless/serverless.yml +++ b/examples/powertools-examples-core-utilities/serverless/serverless.yml @@ -9,7 +9,7 @@ frameworkVersion: '3' provider: name: aws - runtime: java11 + runtime: java17 # you can overwrite defaults here # stage: dev diff --git a/examples/powertools-examples-core-utilities/terraform/infra/lambda.tf b/examples/powertools-examples-core-utilities/terraform/infra/lambda.tf index abebccf54..1d5b11aec 100644 --- a/examples/powertools-examples-core-utilities/terraform/infra/lambda.tf +++ b/examples/powertools-examples-core-utilities/terraform/infra/lambda.tf @@ -1,5 +1,5 @@ resource "aws_lambda_function" "hello_world_lambda" { - runtime = "java11" + runtime = "java17" filename = "target/helloworld-lambda.jar" source_code_hash = filebase64sha256("target/helloworld-lambda.jar") function_name = "hello_world_lambda" @@ -16,7 +16,7 @@ resource "aws_lambda_function" "hello_world_lambda" { } resource "aws_lambda_function" "hello_world_stream_lambda" { - runtime = "java11" + runtime = "java17" filename = "target/helloworld-lambda.jar" source_code_hash = filebase64sha256("target/helloworld-lambda.jar") function_name = "hello_world_stream_lambda" diff --git a/examples/powertools-examples-core-utilities/terraform/pom.xml b/examples/powertools-examples-core-utilities/terraform/pom.xml index 461737a7a..679580062 100644 --- a/examples/powertools-examples-core-utilities/terraform/pom.xml +++ b/examples/powertools-examples-core-utilities/terraform/pom.xml @@ -9,8 +9,8 @@ jar - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-idempotency/sam-graalvm/pom.xml b/examples/powertools-examples-idempotency/sam-graalvm/pom.xml index eeb32cae0..2206ed8b4 100644 --- a/examples/powertools-examples-idempotency/sam-graalvm/pom.xml +++ b/examples/powertools-examples-idempotency/sam-graalvm/pom.xml @@ -8,8 +8,8 @@ Powertools for AWS Lambda (Java) - Examples - Idempotency GraalVM - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-idempotency/sam/pom.xml b/examples/powertools-examples-idempotency/sam/pom.xml index faf502deb..80e28bead 100644 --- a/examples/powertools-examples-idempotency/sam/pom.xml +++ b/examples/powertools-examples-idempotency/sam/pom.xml @@ -23,8 +23,8 @@ Powertools for AWS Lambda (Java) - Examples - Idempotency - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-idempotency/sam/template.yaml b/examples/powertools-examples-idempotency/sam/template.yaml index 2d5e5bc56..272173ec1 100644 --- a/examples/powertools-examples-idempotency/sam/template.yaml +++ b/examples/powertools-examples-idempotency/sam/template.yaml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active Environment: diff --git a/examples/powertools-examples-kafka/README.md b/examples/powertools-examples-kafka/README.md index 76cd81cb9..5b4f91ade 100644 --- a/examples/powertools-examples-kafka/README.md +++ b/examples/powertools-examples-kafka/README.md @@ -15,7 +15,7 @@ Each format has its own Lambda function handler that demonstrates how to use the ### Prerequisites - [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) -- Java 11+ +- Java 17+ - Maven ### Build diff --git a/examples/powertools-examples-kafka/pom.xml b/examples/powertools-examples-kafka/pom.xml index a084b0e04..e29099e1b 100644 --- a/examples/powertools-examples-kafka/pom.xml +++ b/examples/powertools-examples-kafka/pom.xml @@ -8,8 +8,8 @@ Powertools for AWS Lambda (Java) - Examples - Kafka - 11 - 11 + 17 + 17 1.9.20.1 1.12.1 4.35.0 diff --git a/examples/powertools-examples-kafka/template.yaml b/examples/powertools-examples-kafka/template.yaml index 509b13ca3..2fb80e956 100644 --- a/examples/powertools-examples-kafka/template.yaml +++ b/examples/powertools-examples-kafka/template.yaml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active diff --git a/examples/powertools-examples-kafka/tools/pom.xml b/examples/powertools-examples-kafka/tools/pom.xml index 383cdfc97..602604101 100644 --- a/examples/powertools-examples-kafka/tools/pom.xml +++ b/examples/powertools-examples-kafka/tools/pom.xml @@ -9,8 +9,8 @@ 2.0.0 - 11 - 11 + 17 + 17 1.12.1 4.31.0 4.0.2 diff --git a/examples/powertools-examples-parameters/sam-graalvm/pom.xml b/examples/powertools-examples-parameters/sam-graalvm/pom.xml index 572375100..02d3fdcf6 100644 --- a/examples/powertools-examples-parameters/sam-graalvm/pom.xml +++ b/examples/powertools-examples-parameters/sam-graalvm/pom.xml @@ -9,8 +9,8 @@ 2.26.0 - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-parameters/sam/pom.xml b/examples/powertools-examples-parameters/sam/pom.xml index 5b8b17d95..e34b30e52 100644 --- a/examples/powertools-examples-parameters/sam/pom.xml +++ b/examples/powertools-examples-parameters/sam/pom.xml @@ -8,8 +8,8 @@ Powertools for AWS Lambda (Java) - Examples - Parameters - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-parameters/sam/template.yaml b/examples/powertools-examples-parameters/sam/template.yaml index 9d3bf8b0e..81cc3aa9e 100644 --- a/examples/powertools-examples-parameters/sam/template.yaml +++ b/examples/powertools-examples-parameters/sam/template.yaml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active diff --git a/examples/powertools-examples-serialization/sam-graalvm/pom.xml b/examples/powertools-examples-serialization/sam-graalvm/pom.xml index e2744223b..5a2c95be1 100644 --- a/examples/powertools-examples-serialization/sam-graalvm/pom.xml +++ b/examples/powertools-examples-serialization/sam-graalvm/pom.xml @@ -8,8 +8,8 @@ Powertools for AWS Lambda (Java) - Examples - Serialization GraalVM - 11 - 11 + 17 + 17 diff --git a/examples/powertools-examples-serialization/sam/pom.xml b/examples/powertools-examples-serialization/sam/pom.xml index ff85d9814..882b7b810 100644 --- a/examples/powertools-examples-serialization/sam/pom.xml +++ b/examples/powertools-examples-serialization/sam/pom.xml @@ -8,8 +8,8 @@ Powertools for AWS Lambda (Java) - Examples - Serialization - 11 - 11 + 17 + 17 diff --git a/examples/powertools-examples-serialization/sam/template.yaml b/examples/powertools-examples-serialization/sam/template.yaml index f330ec146..1fde1ae1a 100644 --- a/examples/powertools-examples-serialization/sam/template.yaml +++ b/examples/powertools-examples-serialization/sam/template.yaml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml index c312f0b39..9acdfbfd6 100644 --- a/examples/powertools-examples-validation/pom.xml +++ b/examples/powertools-examples-validation/pom.xml @@ -22,8 +22,8 @@ Powertools for AWS Lambda (Java) - Examples - Validation - 11 - 11 + 17 + 17 1.9.20.1 diff --git a/examples/powertools-examples-validation/template.yaml b/examples/powertools-examples-validation/template.yaml index f18a9fb00..b378e950e 100644 --- a/examples/powertools-examples-validation/template.yaml +++ b/examples/powertools-examples-validation/template.yaml @@ -6,7 +6,7 @@ Description: > Globals: Function: Timeout: 20 - Runtime: java11 + Runtime: java17 MemorySize: 512 Tracing: Active diff --git a/pom.xml b/pom.xml index 7702bed40..a3e1c7743 100644 --- a/pom.xml +++ b/pom.xml @@ -80,8 +80,8 @@ - 11 - 11 + 17 + 17 3.1.2 2.26.0 2.0.17 @@ -94,7 +94,7 @@ 3.16.1 1.3.1 3.15.0 - 1.9.7 + 1.9.20.1 1.13.1 0.8.11 1.6.13 diff --git a/powertools-e2e-tests/README.md b/powertools-e2e-tests/README.md index 25571875e..787a3bd84 100644 --- a/powertools-e2e-tests/README.md +++ b/powertools-e2e-tests/README.md @@ -6,10 +6,10 @@ This module is internal and meant to be used for end-to-end (E2E) testing of Pow - An AWS account is needed as well as a local environment able to reach this account ([credentials](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials.html)). -- [Java 11+](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html) +- [Java 17+](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html) - [Docker](https://docs.docker.com/engine/install/) (or [Finch](https://github.com/runfinch/finch) — if using Finch, set `export CDK_DOCKER=finch` before running tests) -To execute the E2E tests, use the following command: `export JAVA_VERSION=11 && mvn clean verify -Pe2e` +To execute the E2E tests, use the following command: `export JAVA_VERSION=17 && mvn clean verify -Pe2e` ### Under the hood diff --git a/powertools-e2e-tests/handlers/pom.xml b/powertools-e2e-tests/handlers/pom.xml index 93c3f41cf..e6b28f6ea 100644 --- a/powertools-e2e-tests/handlers/pom.xml +++ b/powertools-e2e-tests/handlers/pom.xml @@ -11,8 +11,8 @@ UTF-8 - 11 - 11 + 17 + 17 1.4.0 1.3.1 3.16.1 @@ -243,15 +243,6 @@ - - jdk11to16 - - [11,16] - - - 1.9.7 - - jdk17to20 diff --git a/powertools-e2e-tests/pom.xml b/powertools-e2e-tests/pom.xml index d6c0766df..935c78052 100644 --- a/powertools-e2e-tests/pom.xml +++ b/powertools-e2e-tests/pom.xml @@ -28,8 +28,8 @@ Powertools for AWS Lambda (Java) – End-To-End Tests - 11 - 11 + 17 + 17 10.6.0 2.258.0 diff --git a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java index ae96943c2..9e8337f0f 100644 --- a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java +++ b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java @@ -16,6 +16,7 @@ import static java.util.Collections.singletonList; +import com.fasterxml.jackson.databind.JsonNode; import java.io.File; import java.io.IOException; import java.nio.file.Paths; @@ -24,13 +25,9 @@ import java.util.Map; import java.util.Objects; import java.util.UUID; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; - -import com.fasterxml.jackson.databind.JsonNode; - import software.amazon.awscdk.App; import software.amazon.awscdk.BundlingOptions; import software.amazon.awscdk.CfnOutput; @@ -516,9 +513,7 @@ private JavaRuntime mapRuntimeVersion(String environmentVariableName) { if (javaVersion == null) { throw new IllegalArgumentException(environmentVariableName + " is not set"); } - if (javaVersion.startsWith("11")) { - ret = JavaRuntime.JAVA11; - } else if (javaVersion.startsWith("17")) { + if (javaVersion.startsWith("17")) { ret = JavaRuntime.JAVA17; } else if (javaVersion.startsWith("21")) { ret = JavaRuntime.JAVA21; diff --git a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java index 625a222aa..0df5cf5e3 100644 --- a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java +++ b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java @@ -17,7 +17,6 @@ import software.amazon.awscdk.services.lambda.Runtime; public enum JavaRuntime { - JAVA11("java11", Runtime.JAVA_11, "11"), JAVA17("java17", Runtime.JAVA_17, "17"), JAVA21("java21", Runtime.JAVA_21, "21"), JAVA25("java25", Runtime.JAVA_25, "25"); From 9d3c379e0f4d1b669218a7944b9c7aa32580446a Mon Sep 17 00:00:00 2001 From: David-DAM <82216301+David-DAM@users.noreply.github.com> Date: Sat, 1 Aug 2026 11:17:53 +0200 Subject: [PATCH 2/2] Use `${PWD}` instead of `$(CURDIR)` in Makefile for consistency. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86eded613..8fa41a398 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ build-docs-website: docs-local-docker: docker build -t squidfunk/mkdocs-material ./docs/ - docker run --rm -it -p 8000:8000 -v $(CURDIR):/docs squidfunk/mkdocs-material + docker run --rm -it -p 8000:8000 -v ${PWD}:/docs squidfunk/mkdocs-material test: mvn test