From e8b5aa73852796dd91de1a5c2d7b2884c213fe89 Mon Sep 17 00:00:00 2001 From: vicheey Date: Wed, 18 Jun 2025 21:30:08 +0000 Subject: [PATCH 1/5] chore: release - prepare for next development iteration --- aws-serverless-java-container-core/pom.xml | 4 ++-- aws-serverless-java-container-jersey/pom.xml | 8 ++++---- aws-serverless-java-container-spring/pom.xml | 8 ++++---- aws-serverless-java-container-springboot3/pom.xml | 8 ++++---- aws-serverless-jersey-archetype/pom.xml | 6 +++--- aws-serverless-spring-archetype/pom.xml | 6 +++--- aws-serverless-springboot3-archetype/pom.xml | 6 +++--- pom.xml | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/aws-serverless-java-container-core/pom.xml b/aws-serverless-java-container-core/pom.xml index 5b7d331f..9d0ff3cb 100644 --- a/aws-serverless-java-container-core/pom.xml +++ b/aws-serverless-java-container-core/pom.xml @@ -6,12 +6,12 @@ AWS Serverless Java container support - Core Allows Java applications written for a servlet container to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless aws-serverless-java-container - 2.1.4 + 2.1.5-SNAPSHOT .. diff --git a/aws-serverless-java-container-jersey/pom.xml b/aws-serverless-java-container-jersey/pom.xml index ee776bd6..1788a36b 100644 --- a/aws-serverless-java-container-jersey/pom.xml +++ b/aws-serverless-java-container-jersey/pom.xml @@ -6,12 +6,12 @@ AWS Serverless Java container support - Jersey implementation Allows Java applications written for Jersey to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless aws-serverless-java-container - 2.1.4 + 2.1.5-SNAPSHOT .. @@ -24,7 +24,7 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.4 + 2.1.5-SNAPSHOT com.fasterxml.jackson.core @@ -35,7 +35,7 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.4 + 2.1.5-SNAPSHOT tests test-jar test diff --git a/aws-serverless-java-container-spring/pom.xml b/aws-serverless-java-container-spring/pom.xml index 1f656287..f03d9db0 100644 --- a/aws-serverless-java-container-spring/pom.xml +++ b/aws-serverless-java-container-spring/pom.xml @@ -6,12 +6,12 @@ AWS Serverless Java container support - Spring implementation Allows Java applications written for the Spring framework to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless aws-serverless-java-container - 2.1.4 + 2.1.5-SNAPSHOT .. @@ -25,12 +25,12 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless aws-serverless-java-container-core - 2.1.4 + 2.1.5-SNAPSHOT tests test-jar test diff --git a/aws-serverless-java-container-springboot3/pom.xml b/aws-serverless-java-container-springboot3/pom.xml index d9dcc7e1..5dcac156 100644 --- a/aws-serverless-java-container-springboot3/pom.xml +++ b/aws-serverless-java-container-springboot3/pom.xml @@ -3,7 +3,7 @@ aws-serverless-java-container com.amazonaws.serverless - 2.1.4 + 2.1.5-SNAPSHOT 4.0.0 @@ -12,7 +12,7 @@ AWS Serverless Java container support - SpringBoot 3 implementation Allows Java applications written for SpringBoot 3 to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.4 + 2.1.5-SNAPSHOT 6.2.8 @@ -30,12 +30,12 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless aws-serverless-java-container-core - 2.1.4 + 2.1.5-SNAPSHOT tests test-jar test diff --git a/aws-serverless-jersey-archetype/pom.xml b/aws-serverless-jersey-archetype/pom.xml index 69fcd0ed..4afdc999 100644 --- a/aws-serverless-jersey-archetype/pom.xml +++ b/aws-serverless-jersey-archetype/pom.xml @@ -4,17 +4,17 @@ com.amazonaws.serverless aws-serverless-java-container - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless.archetypes aws-serverless-jersey-archetype - 2.1.4 + 2.1.5-SNAPSHOT maven-archetype https://github.com/aws/serverless-java-container.git - aws-serverless-java-container-2.1.4 + HEAD diff --git a/aws-serverless-spring-archetype/pom.xml b/aws-serverless-spring-archetype/pom.xml index 5c15bbd0..2a2f59b8 100644 --- a/aws-serverless-spring-archetype/pom.xml +++ b/aws-serverless-spring-archetype/pom.xml @@ -4,17 +4,17 @@ com.amazonaws.serverless aws-serverless-java-container - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless.archetypes aws-serverless-spring-archetype - 2.1.4 + 2.1.5-SNAPSHOT maven-archetype https://github.com/aws/serverless-java-container.git - aws-serverless-java-container-2.1.4 + HEAD diff --git a/aws-serverless-springboot3-archetype/pom.xml b/aws-serverless-springboot3-archetype/pom.xml index 50dea38b..74fac615 100644 --- a/aws-serverless-springboot3-archetype/pom.xml +++ b/aws-serverless-springboot3-archetype/pom.xml @@ -4,17 +4,17 @@ com.amazonaws.serverless aws-serverless-java-container - 2.1.4 + 2.1.5-SNAPSHOT com.amazonaws.serverless.archetypes aws-serverless-springboot3-archetype - 2.1.4 + 2.1.5-SNAPSHOT maven-archetype https://github.com/aws/serverless-java-container.git - aws-serverless-java-container-2.1.4 + HEAD diff --git a/pom.xml b/pom.xml index 6040b24f..dd73a040 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.amazonaws.serverless aws-serverless-java-container pom - 2.1.4 + 2.1.5-SNAPSHOT AWS Serverless Java container A Java framework to run Spring, Spring Boot, Jersey, Spark, and Struts applications inside AWS Lambda https://github.com/aws/serverless-java-container @@ -37,7 +37,7 @@ https://github.com/aws/serverless-java-container scm:git:https://github.com/aws/serverless-java-container.git - aws-serverless-java-container-2.1.4 + HEAD From 18a067ef56a01fb48b980e74d0c73ee121023264 Mon Sep 17 00:00:00 2001 From: ekruczek Date: Mon, 15 Sep 2025 23:10:39 +0200 Subject: [PATCH 2/5] fix: headers with null values removed from response (#1523) Co-authored-by: Emil Kruczek --- .../proxy/internal/servlet/AwsHttpServletResponse.java | 9 ++++++--- .../internal/servlet/AwsHttpServletResponseTest.java | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponse.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponse.java index 86a72ead..f5395a0b 100644 --- a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponse.java +++ b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponse.java @@ -496,9 +496,12 @@ private void setHeader(String key, String value, boolean overwrite) { values = new ArrayList<>(); } - values.add(encodedValue); - - headers.put(encodedKey, values); + if (value == null && overwrite) { + headers.remove(encodedKey); + } else if (value != null) { + values.add(encodedValue); + headers.put(encodedKey, values); + } } private boolean canSetHeader() { diff --git a/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponseTest.java b/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponseTest.java index 88d2a5e7..143caab6 100644 --- a/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponseTest.java +++ b/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponseTest.java @@ -173,6 +173,16 @@ void responseHeaders_getAwsResponseHeaders_expectLatestHeader() { assertEquals("application/xml", awsResp.getFirst(HttpHeaders.CONTENT_TYPE)); } + @Test + void responseHeaders_setHeaderWithNullValue_expectHeaderRemoved() { + AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null); + resp.setHeader(HttpHeaders.CONTENT_DISPOSITION, "inline"); + resp.setHeader(HttpHeaders.CONTENT_DISPOSITION, null); + + Headers awsResp = resp.getAwsResponseHeaders(); + assertEquals(0, awsResp.size()); + } + @Test void responseHeaders_getAwsResponseHeaders_expectedMultpleCookieHeaders() { AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null); From 30af781d5e143f390db9963a4fd6812f60fd8ff7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 15:18:52 -0700 Subject: [PATCH 3/5] chore(deps): bump com.amazonaws:aws-lambda-java-core from 1.2.3 to 1.4.0 (#1524) Bumps [com.amazonaws:aws-lambda-java-core](https://github.com/aws/aws-lambda-java-libs) from 1.2.3 to 1.4.0. - [Commits](https://github.com/aws/aws-lambda-java-libs/commits) --- updated-dependencies: - dependency-name: com.amazonaws:aws-lambda-java-core dependency-version: 1.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- aws-serverless-java-container-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-serverless-java-container-core/pom.xml b/aws-serverless-java-container-core/pom.xml index 9d0ff3cb..e9aa6bbe 100644 --- a/aws-serverless-java-container-core/pom.xml +++ b/aws-serverless-java-container-core/pom.xml @@ -24,7 +24,7 @@ com.amazonaws aws-lambda-java-core - 1.2.3 + 1.4.0 From a1c920b88173233493015cb28adf243c61adcd63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 15:23:32 -0700 Subject: [PATCH 4/5] chore(deps-dev): bump org.mockito:mockito-core from 5.17.0 to 5.19.0 (#1517) Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.17.0 to 5.19.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.17.0...v5.19.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-version: 5.19.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dd73a040..ebc634fb 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 2.19.1 2.0.17 5.12.2 - 5.17.0 + 5.19.0 1.3 UTF-8 From af5a61d177ab2f3d67371d8fcfecbd776daae631 Mon Sep 17 00:00:00 2001 From: reedham-aws Date: Thu, 18 Sep 2025 22:58:53 +0000 Subject: [PATCH 5/5] chore: release - prepare release aws-serverless-java-container-2.1.5 --- aws-serverless-java-container-core/pom.xml | 4 ++-- aws-serverless-java-container-jersey/pom.xml | 8 ++++---- aws-serverless-java-container-spring/pom.xml | 8 ++++---- aws-serverless-java-container-springboot3/pom.xml | 8 ++++---- aws-serverless-jersey-archetype/pom.xml | 6 +++--- aws-serverless-spring-archetype/pom.xml | 6 +++--- aws-serverless-springboot3-archetype/pom.xml | 6 +++--- pom.xml | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/aws-serverless-java-container-core/pom.xml b/aws-serverless-java-container-core/pom.xml index e9aa6bbe..bd4318e8 100644 --- a/aws-serverless-java-container-core/pom.xml +++ b/aws-serverless-java-container-core/pom.xml @@ -6,12 +6,12 @@ AWS Serverless Java container support - Core Allows Java applications written for a servlet container to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless aws-serverless-java-container - 2.1.5-SNAPSHOT + 2.1.5 .. diff --git a/aws-serverless-java-container-jersey/pom.xml b/aws-serverless-java-container-jersey/pom.xml index 1788a36b..e90446a3 100644 --- a/aws-serverless-java-container-jersey/pom.xml +++ b/aws-serverless-java-container-jersey/pom.xml @@ -6,12 +6,12 @@ AWS Serverless Java container support - Jersey implementation Allows Java applications written for Jersey to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless aws-serverless-java-container - 2.1.5-SNAPSHOT + 2.1.5 .. @@ -24,7 +24,7 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.5-SNAPSHOT + 2.1.5 com.fasterxml.jackson.core @@ -35,7 +35,7 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.5-SNAPSHOT + 2.1.5 tests test-jar test diff --git a/aws-serverless-java-container-spring/pom.xml b/aws-serverless-java-container-spring/pom.xml index f03d9db0..9ab8a97e 100644 --- a/aws-serverless-java-container-spring/pom.xml +++ b/aws-serverless-java-container-spring/pom.xml @@ -6,12 +6,12 @@ AWS Serverless Java container support - Spring implementation Allows Java applications written for the Spring framework to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless aws-serverless-java-container - 2.1.5-SNAPSHOT + 2.1.5 .. @@ -25,12 +25,12 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless aws-serverless-java-container-core - 2.1.5-SNAPSHOT + 2.1.5 tests test-jar test diff --git a/aws-serverless-java-container-springboot3/pom.xml b/aws-serverless-java-container-springboot3/pom.xml index 5dcac156..a41c3a72 100644 --- a/aws-serverless-java-container-springboot3/pom.xml +++ b/aws-serverless-java-container-springboot3/pom.xml @@ -3,7 +3,7 @@ aws-serverless-java-container com.amazonaws.serverless - 2.1.5-SNAPSHOT + 2.1.5 4.0.0 @@ -12,7 +12,7 @@ AWS Serverless Java container support - SpringBoot 3 implementation Allows Java applications written for SpringBoot 3 to run in AWS Lambda https://aws.amazon.com/lambda - 2.1.5-SNAPSHOT + 2.1.5 6.2.8 @@ -30,12 +30,12 @@ com.amazonaws.serverless aws-serverless-java-container-core - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless aws-serverless-java-container-core - 2.1.5-SNAPSHOT + 2.1.5 tests test-jar test diff --git a/aws-serverless-jersey-archetype/pom.xml b/aws-serverless-jersey-archetype/pom.xml index 4afdc999..9f1862e4 100644 --- a/aws-serverless-jersey-archetype/pom.xml +++ b/aws-serverless-jersey-archetype/pom.xml @@ -4,17 +4,17 @@ com.amazonaws.serverless aws-serverless-java-container - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless.archetypes aws-serverless-jersey-archetype - 2.1.5-SNAPSHOT + 2.1.5 maven-archetype https://github.com/aws/serverless-java-container.git - HEAD + aws-serverless-java-container-2.1.5 diff --git a/aws-serverless-spring-archetype/pom.xml b/aws-serverless-spring-archetype/pom.xml index 2a2f59b8..d3cdb9f1 100644 --- a/aws-serverless-spring-archetype/pom.xml +++ b/aws-serverless-spring-archetype/pom.xml @@ -4,17 +4,17 @@ com.amazonaws.serverless aws-serverless-java-container - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless.archetypes aws-serverless-spring-archetype - 2.1.5-SNAPSHOT + 2.1.5 maven-archetype https://github.com/aws/serverless-java-container.git - HEAD + aws-serverless-java-container-2.1.5 diff --git a/aws-serverless-springboot3-archetype/pom.xml b/aws-serverless-springboot3-archetype/pom.xml index 74fac615..02c3738a 100644 --- a/aws-serverless-springboot3-archetype/pom.xml +++ b/aws-serverless-springboot3-archetype/pom.xml @@ -4,17 +4,17 @@ com.amazonaws.serverless aws-serverless-java-container - 2.1.5-SNAPSHOT + 2.1.5 com.amazonaws.serverless.archetypes aws-serverless-springboot3-archetype - 2.1.5-SNAPSHOT + 2.1.5 maven-archetype https://github.com/aws/serverless-java-container.git - HEAD + aws-serverless-java-container-2.1.5 diff --git a/pom.xml b/pom.xml index ebc634fb..c4bb9b90 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.amazonaws.serverless aws-serverless-java-container pom - 2.1.5-SNAPSHOT + 2.1.5 AWS Serverless Java container A Java framework to run Spring, Spring Boot, Jersey, Spark, and Struts applications inside AWS Lambda https://github.com/aws/serverless-java-container @@ -37,7 +37,7 @@ https://github.com/aws/serverless-java-container scm:git:https://github.com/aws/serverless-java-container.git - HEAD + aws-serverless-java-container-2.1.5