Skip to content

Commit 9a07dcc

Browse files
authored
feat: Support Jakarta EE along with Spring Boot 3 support
2 parents dd524dc + 980ebfa commit 9a07dcc

File tree

177 files changed

+592
-703
lines changed

Some content is hidden

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

177 files changed

+592
-703
lines changed

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

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,35 @@
66
<name>AWS Serverless Java container support - Core</name>
77
<description>Allows Java applications written for a servlet container to run in AWS Lambda</description>
88
<url>https://aws.amazon.com/lambda</url>
9-
<version>1.10-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010

1111
<parent>
1212
<groupId>com.amazonaws.serverless</groupId>
1313
<artifactId>aws-serverless-java-container</artifactId>
14-
<version>1.10-SNAPSHOT</version>
14+
<version>2.0-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

1818
<properties>
19-
<jaxrs.version>2.1.1</jaxrs.version>
20-
<servlet.version>3.1.0</servlet.version>
19+
<jaxrs.version>3.1.0</jaxrs.version>
20+
<servlet.version>6.0.0</servlet.version>
2121
</properties>
2222

23+
<repositories>
24+
<repository>
25+
<id>apache.snapshots</id>
26+
<name>Apache Development Snapshot Repository</name>
27+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
28+
<releases>
29+
<enabled>false</enabled>
30+
</releases>
31+
<snapshots>
32+
<enabled>true</enabled>
33+
</snapshots>
34+
</repository>
35+
</repositories>
36+
37+
2338
<dependencies>
2439
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-lambda-java-core -->
2540
<dependency>
@@ -30,15 +45,15 @@
3045

3146
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
3247
<dependency>
33-
<groupId>javax.servlet</groupId>
34-
<artifactId>javax.servlet-api</artifactId>
48+
<groupId>jakarta.servlet</groupId>
49+
<artifactId>jakarta.servlet-api</artifactId>
3550
<version>${servlet.version}</version>
3651
</dependency>
3752

3853
<!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
3954
<dependency>
40-
<groupId>javax.ws.rs</groupId>
41-
<artifactId>javax.ws.rs-api</artifactId>
55+
<groupId>jakarta.ws.rs</groupId>
56+
<artifactId>jakarta.ws.rs-api</artifactId>
4257
<version>${jaxrs.version}</version>
4358
</dependency>
4459

@@ -56,12 +71,15 @@
5671
<version>${jackson.version}</version>
5772
</dependency>
5873

59-
60-
<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
6174
<dependency>
62-
<groupId>commons-fileupload</groupId>
63-
<artifactId>commons-fileupload</artifactId>
64-
<version>1.5</version>
75+
<groupId>org.apache.commons</groupId>
76+
<artifactId>commons-fileupload2</artifactId>
77+
<version>2.0-SNAPSHOT</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.eclipse.angus</groupId>
81+
<artifactId>angus-mail</artifactId>
82+
<version>2.0.1</version>
6583
</dependency>
6684

6785
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime -->
@@ -72,11 +90,10 @@
7290
<scope>compile</scope>
7391
</dependency>
7492

75-
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
7693
<dependency>
77-
<groupId>org.apache.httpcomponents</groupId>
78-
<artifactId>httpclient</artifactId>
79-
<version>4.5.14</version>
94+
<groupId>org.apache.httpcomponents.client5</groupId>
95+
<artifactId>httpclient5</artifactId>
96+
<version>5.2.1</version>
8097
<scope>test</scope>
8198
</dependency>
8299
<dependency>
@@ -95,17 +112,17 @@
95112
<scope>test</scope>
96113
</dependency>
97114
<dependency>
98-
<groupId>org.apache.httpcomponents</groupId>
99-
<artifactId>httpcore</artifactId>
100-
<version>4.4.16</version>
115+
<groupId>org.apache.httpcomponents.core5</groupId>
116+
<artifactId>httpcore5</artifactId>
117+
<version>5.2.1</version>
101118
<scope>compile</scope>
102119
<optional>true</optional><!-- TODO move AwsProxyRequestBuilder to seperate test-jar and change scope to test
103120
https://github.com/awslabs/aws-serverless-java-container/issues/394 -->
104121
</dependency>
105122
<dependency>
106123
<groupId>org.springframework.security</groupId>
107124
<artifactId>spring-security-web</artifactId>
108-
<version>5.7.8</version>
125+
<version>6.0.2</version>
109126
<scope>test</scope>
110127
</dependency>
111128
</dependencies>
@@ -204,20 +221,4 @@
204221
</plugin>
205222
</plugins>
206223
</build>
207-
208-
<profiles>
209-
<profile>
210-
<id>java9-plus</id>
211-
<activation>
212-
<jdk>[9,)</jdk>
213-
</activation>
214-
<dependencies>
215-
<dependency>
216-
<groupId>com.sun.activation</groupId>
217-
<artifactId>jakarta.activation</artifactId>
218-
<version>1.2.2</version>
219-
</dependency>
220-
</dependencies>
221-
</profile>
222-
</profiles>
223224
</project>

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/AwsHttpApiV2SecurityContextWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.amazonaws.serverless.proxy.model.HttpApiV2ProxyRequest;
1717
import com.amazonaws.services.lambda.runtime.Context;
1818

19-
import javax.ws.rs.core.SecurityContext;
19+
import jakarta.ws.rs.core.SecurityContext;
2020

2121
public class AwsHttpApiV2SecurityContextWriter implements SecurityContextWriter<HttpApiV2ProxyRequest> {
2222
@Override

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/AwsProxyExceptionHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
2424

25-
import javax.ws.rs.InternalServerErrorException;
26-
import javax.ws.rs.core.HttpHeaders;
27-
import javax.ws.rs.core.MediaType;
25+
import jakarta.ws.rs.InternalServerErrorException;
26+
import jakarta.ws.rs.core.HttpHeaders;
27+
import jakarta.ws.rs.core.MediaType;
2828

2929
import java.io.IOException;
3030
import java.io.OutputStream;

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/AwsProxySecurityContextWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
1717
import com.amazonaws.services.lambda.runtime.Context;
1818

19-
import javax.ws.rs.core.SecurityContext;
19+
import jakarta.ws.rs.core.SecurityContext;
2020

2121
/**
2222
* Default implementation of <code>SecurityContextWriter</code>. Creates a SecurityContext object based on an API Gateway

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/LogFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
package com.amazonaws.serverless.proxy;
1414

15-
import javax.ws.rs.core.SecurityContext;
15+
import jakarta.ws.rs.core.SecurityContext;
1616

1717
/**
1818
* Implementations of the log formatter interface are used by {@link com.amazonaws.serverless.proxy.internal.LambdaContainerHandler} class to log each request

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/RequestReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.amazonaws.serverless.proxy.model.ContainerConfig;
1818
import com.amazonaws.services.lambda.runtime.Context;
1919

20-
import javax.ws.rs.core.SecurityContext;
20+
import jakarta.ws.rs.core.SecurityContext;
2121

2222

2323
/**

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/SecurityContextWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
1616
import com.amazonaws.services.lambda.runtime.Context;
1717

18-
import javax.ws.rs.core.SecurityContext;
18+
import jakarta.ws.rs.core.SecurityContext;
1919

2020
/**
2121
* This object is used by the container implementation to generated a Jax-Rs <code>SecurityContext</code> object from the

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030

31-
import javax.ws.rs.core.SecurityContext;
31+
import jakarta.ws.rs.core.SecurityContext;
3232

3333
import java.io.IOException;
3434
import java.io.InputStream;

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/jaxrs/AwsHttpApiV2SecurityContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323

24-
import javax.ws.rs.core.HttpHeaders;
25-
import javax.ws.rs.core.SecurityContext;
24+
import jakarta.ws.rs.core.HttpHeaders;
25+
import jakarta.ws.rs.core.SecurityContext;
2626
import java.nio.charset.StandardCharsets;
2727
import java.security.Principal;
2828
import java.util.Base64;

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/jaxrs/AwsProxySecurityContext.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414

1515
import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
1616
import com.amazonaws.serverless.proxy.model.CognitoAuthorizerClaims;
17-
import com.amazonaws.serverless.proxy.model.RequestSource;
1817
import com.amazonaws.services.lambda.runtime.Context;
1918

20-
import javax.ws.rs.core.SecurityContext;
19+
import jakarta.ws.rs.core.SecurityContext;
2120

2221
import java.security.Principal;
2322

0 commit comments

Comments
 (0)