Skip to content

Commit e406ad5

Browse files
dekideki
authored
Preparation for Release 1.6.0
Preparation for Release 1.6.0
2 parents 750f819 + 38afcbd commit e406ad5

File tree

81 files changed

+293
-2705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+293
-2705
lines changed

‎.github/workflows/continuous-integration-workflow.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ jobs:
5353
# Spring core 5.2 and above. SpringBoot 1.5 is deprecated
5454
run: ./gha_build.sh spring true true -Djacoco.minCoverage=0.4
5555
- name: Build Spring 4.3
56-
run: ./gha_build.sh spring false false -Dspring.version=4.3.29.RELEASE -Dspring-security.version=4.2.18.RELEASE
56+
run: ./gha_build.sh spring false false -Dspring.version=4.3.30.RELEASE -Dspring-security.version=4.2.20.RELEASE
5757
- name: Build Spring 5.0
58-
run: ./gha_build.sh spring false false -Dspring.version=5.0.19.RELEASE -Dspring-security.version=5.0.18.RELEASE
58+
run: ./gha_build.sh spring false false -Dspring.version=5.0.20.RELEASE -Dspring-security.version=5.0.19.RELEASE
5959
- name: Build Spring 5.1
60-
run: ./gha_build.sh spring false false -Dspring.version=5.1.18.RELEASE -Dspring-security.version=5.1.12.RELEASE
60+
run: ./gha_build.sh spring false false -Dspring.version=5.1.20.RELEASE -Dspring-security.version=5.1.13.RELEASE
61+
- name: Build Spring 5.2
62+
run: ./gha_build.sh spring false false -Dspring.version=5.2.16.RELEASE -Dspring-security.version=5.2.11.RELEASE
6163

6264
build_springboot2:
6365
name: Build and test SpringBoot 2
@@ -66,10 +68,13 @@ jobs:
6668
- uses: actions/checkout@v2
6769
- name: Build latest
6870
run: ./gha_build.sh springboot2 true true
69-
- name: Build Spring Boot 2.0
70-
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.0.9.RELEASE -Dspring.version=5.0.19.RELEASE -Dspringsecurity.version=5.0.18.RELEASE
71-
- name: Build Spring Boot 2.1
72-
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.1.17.RELEASE -Dspring.version=5.1.18.RELEASE -Dspringsecurity.version=5.1.12.RELEASE
71+
# https://github.com/spring-projects/spring-boot/wiki/Supported-Versions
72+
- name: Build Spring Boot 2.2
73+
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.2.13.RELEASE -Dspring.version=5.2.15.RELEASE -Dspringsecurity.version=5.2.8.RELEASE
74+
- name: Build Spring Boot 2.3
75+
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.3.12.RELEASE -Dspring.version=5.2.15.RELEASE -Dspringsecurity.version=5.3.9.RELEASE
76+
- name: Build Spring Boot 2.4
77+
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.4.9 -Dspring.version=5.3.9 -Dspringsecurity.version=5.4.7
7378

7479
build_struts2:
7580
name: Build and test Struts 2

‎aws-serverless-java-container-core/pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>com.amazonaws</groupId>
2727
<artifactId>aws-lambda-java-core</artifactId>
28-
<version>1.2.0</version>
28+
<version>1.2.1</version>
2929
</dependency>
3030

3131
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>org.apache.httpcomponents</groupId>
7676
<artifactId>httpmime</artifactId>
77-
<version>4.5.6</version>
77+
<version>4.5.13</version>
7878
<scope>compile</scope>
7979
</dependency>
8080

@@ -88,13 +88,15 @@
8888
<dependency>
8989
<groupId>org.apache.httpcomponents</groupId>
9090
<artifactId>httpcore</artifactId>
91-
<version>4.4.10</version>
91+
<version>4.4.14</version>
9292
<scope>compile</scope>
93+
<optional>true</optional><!-- TODO move AwsProxyRequestBuilder to seperate test-jar and change scope to test
94+
https://github.com/awslabs/aws-serverless-java-container/issues/394 -->
9395
</dependency>
9496
<dependency>
9597
<groupId>org.springframework.security</groupId>
9698
<artifactId>spring-security-web</artifactId>
97-
<version>5.2.11.RELEASE</version>
99+
<version>5.5.1</version>
98100
<scope>test</scope>
99101
</dependency>
100102
</dependencies>

‎aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/LambdaContainerHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,12 @@ public abstract class LambdaContainerHandler<RequestType, ResponseType, Containe
8181
private static ContainerConfig config = ContainerConfig.defaultConfig();
8282
private static ObjectMapper objectMapper = new ObjectMapper();
8383
static {
84-
objectMapper.registerModule(new AfterburnerModule());
84+
registerAfterBurner();
8585
}
8686

87+
private static void registerAfterBurner() {
88+
objectMapper.registerModule(new AfterburnerModule());
89+
}
8790

8891

8992
//-------------------------------------------------------------

‎aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletRequest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.commons.io.FilenameUtils;
2828
import org.apache.commons.io.IOUtils;
2929
import org.apache.commons.io.input.NullInputStream;
30-
import org.apache.http.message.BasicHeaderValueParser;
3130
import org.slf4j.Logger;
3231
import org.slf4j.LoggerFactory;
3332

@@ -83,7 +82,6 @@ public abstract class AwsHttpServletRequest implements HttpServletRequest {
8382
private ServletContext servletContext;
8483
private AwsHttpSession session;
8584
private String queryString;
86-
private BasicHeaderValueParser headerParser;
8785
private Map<String, Part> multipartFormParameters;
8886
private Map<String, List<String>> urlEncodedFormParameters;
8987

@@ -107,7 +105,6 @@ public abstract class AwsHttpServletRequest implements HttpServletRequest {
107105
AwsHttpServletRequest(Context lambdaContext) {
108106
this.lambdaContext = lambdaContext;
109107
attributes = new HashMap<>();
110-
headerParser = new BasicHeaderValueParser();
111108
setAttribute(DISPATCHER_TYPE_ATTRIBUTE, DispatcherType.REQUEST);
112109
}
113110

‎aws-serverless-java-container-spring/pom.xml

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
</parent>
1717

1818
<properties>
19-
<spring.version>5.2.16.RELEASE</spring.version>
20-
<springboot.version>1.5.22.RELEASE</springboot.version>
21-
<spring-security.version>5.2.11.RELEASE</spring-security.version>
19+
<spring.version>5.3.9</spring.version>
20+
<spring-security.version>5.5.1</spring-security.version>
2221
</properties>
2322

2423
<dependencies>
@@ -89,38 +88,6 @@
8988
<version>2.2.4</version>
9089
<scope>test</scope>
9190
</dependency>
92-
<dependency>
93-
<groupId>org.springframework.boot</groupId>
94-
<artifactId>spring-boot</artifactId>
95-
<version>${springboot.version}</version>
96-
<optional>true</optional>
97-
<exclusions>
98-
<exclusion>
99-
<groupId>org.springframework</groupId>
100-
<artifactId>spring-context</artifactId>
101-
</exclusion>
102-
<exclusion>
103-
<groupId>org.springframework</groupId>
104-
<artifactId>spring-core</artifactId>
105-
</exclusion>
106-
</exclusions>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.springframework.boot</groupId>
110-
<artifactId>spring-boot-autoconfigure</artifactId>
111-
<version>${springboot.version}</version>
112-
<scope>test</scope>
113-
<exclusions>
114-
<exclusion>
115-
<groupId>org.springframework</groupId>
116-
<artifactId>spring-context</artifactId>
117-
</exclusion>
118-
<exclusion>
119-
<groupId>org.springframework</groupId>
120-
<artifactId>spring-core</artifactId>
121-
</exclusion>
122-
</exclusions>
123-
</dependency>
12491
<dependency>
12592
<groupId>org.springframework.security</groupId>
12693
<artifactId>spring-security-config</artifactId>

‎aws-serverless-java-container-spring/src/main/java/com/amazonaws/serverless/proxy/spring/SpringBootLambdaContainerHandler.java

Lines changed: 0 additions & 208 deletions
This file was deleted.

0 commit comments

Comments
 (0)