feat: Provide Spring Boot 3 support #510

mbfreder · 2023-04-11T17:56:52Z

Issue #, if available: #487

Description of changes:

Updated to Spring 6.0.7, Spring Boot 3.0.4 and Spring Security 6.0.2
Added Jakarta namespace compatibility

By submitting this pull request

I confirm that my contribution is made under the terms of the Apache 2.0 license.
I confirm that I've made a best effort attempt to update all relevant documentation.

deki

Thank you for your contribution. I made some comments, mostly related to the dependencies used.

Please make sure to update the pet-store samples in the samples folder as well.

deki · 2023-04-11T18:18:38Z

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

@@ -17,9 +17,24 @@

    <properties>
        <jaxrs.version>2.1.1</jaxrs.version>


Update to 3.1.0 or remove property if no longer in use

Done, thanks.

deki · 2023-04-11T18:19:17Z

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

@@ -17,9 +17,24 @@

    <properties>
        <jaxrs.version>2.1.1</jaxrs.version>
-        <servlet.version>3.1.0</servlet.version>
+        <servlet.version>5.0.0</servlet.version>


Any reason why we are not going with 6.0.0? Spring Boot also uses that version.

AwsServletContext.SERVLET_API_MAJOR_VERSION and AwsServletContext.SERVLET_API_MINOR_VERSION need to be changed along with it.

Updating to 6.0.0 gave me a bunch of 'class not found" issues. That's why I went with 5.0.0.

Well they removed a bunch of already deprecated stuff in 6.0.0 where we most likely return UnsupportedOperationException anyway (e.g. for HttpSessionContext related things as we don't support sessions). Let's go for 6.0.0 to be aligned with Spring.

deki · 2023-04-11T18:22:03Z

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

-            <version>${servlet.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0</version>


Either stick with ${servlet.version} or remove the property above if it's no longer in use.

deki · 2023-04-11T18:22:41Z

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

-            <version>${jaxrs.version}</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.0.0-M1</version>


Either stick with ${jaxrs.version} and use 3.1.0 instead of the old milestone release or remove the property above if it's no longer in use.

Done, thanks.

deki · 2023-04-11T18:24:32Z

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

+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>


Why is it necessary to add this dependency?

After doin the namespace change I got this error:

[ERROR] getMimeType_mimeTypeOfCorrectFile_expectMime Time elapsed: 0.001 s <<< ERROR! java.lang.RuntimeException: Provider for jakarta.activation.spi.MimeTypeRegistryProvider cannot be found at com.amazonaws.serverless.proxy.internal.servlet.AwsServletContextTest.getMimeType_mimeTypeOfCorrectFile_expectMime(AwsServletContextTest.java:62)

After some research I found this on stackoverflow. After I added the dependency, the error disappeared.

Ok I see, that's related to #504. Need to revisit that, angus-mail should not be required just for mimetype resolution.

deki · 2023-04-11T18:56:01Z

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

-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-            <scope>test</scope>


why no longer scope test?

I missed that. Updated.

Should be 2.1.1

deki · 2023-04-11T19:02:16Z

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

-            <artifactId>javax.el</artifactId>
-            <version>3.0.0</version>
+            <artifactId>jakarta.el</artifactId>
+            <version>5.0.0-M1</version>


Probably should be org.glassfish.expressly:expressly:5.0.0 instead of this old milestone release.

Thanks, updated.

deki · 2023-04-11T19:03:11Z

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

+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <version>2.1.0</version>


2.1.1? Why is it needed to have this with compile scope?

It's used in the AwsServletContext class. With a test scope, it gives the following errors:

package jakarta.activation.spi does not exist cannot find symbol [ERROR] symbol: class MimetypesFileTypeMap [ERROR] location: class com.amazonaws.serverless.proxy.internal.servlet.AwsServletContext

Updated to 2.1.1

deki · 2023-04-11T19:04:09Z

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

-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <spring.version>6.0.7</spring.version>
+        <springboot.version>3.0.4</springboot.version>


Should be 3.0.5

deki · 2023-04-11T19:05:22Z

aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/pom.xml

@@ -16,7 +16,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.10</version>
+        <version>3.0.4</version>


deki

Let's move all poms to 2.0-SNAPSHOT along with that change. Please note the samples also contain build.gradle files as an alternative that need to be aligned to the Maven poms.

deki · 2023-04-15T10:30:01Z

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

@@ -17,9 +17,24 @@

    <properties>
        <jaxrs.version>2.1.1</jaxrs.version>
-        <servlet.version>3.1.0</servlet.version>
+        <servlet.version>5.0.0</servlet.version>


Well they removed a bunch of already deprecated stuff in 6.0.0 where we most likely return UnsupportedOperationException anyway (e.g. for HttpSessionContext related things as we don't support sessions). Let's go for 6.0.0 to be aligned with Spring.

deki · 2023-04-16T08:51:35Z

...er-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContext.java

+
+    @Override
+    public int getSessionTimeout() {
+        return 15;


let's use 0, wdyt?

Makes sense.

deki · 2023-04-16T08:52:36Z

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

+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>


Ok I see, that's related to #504. Need to revisit that, angus-mail should not be required just for mimetype resolution.

deki · 2023-04-16T09:01:23Z

samples/spring/pet-store/pom.xml

-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <spring.version>5.3.26</spring.version>
+        <java.version>17</java.version>


java.version is a Spring Boot specific property, isn't it? Afaik it only has an effect if the pom extends spring-boot-starter-parent.

You're right. Thanks for pointing that out.

deki

Let's remove the java9-plus profile along with the old com.sun.activation:jakarta.activation dependency.

deki · 2023-04-17T20:22:41Z

...ava/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java

+
+    @Override
+    public String getProtocolRequestId() {
+        return null;


return empty string, implement in AwsHttpServletRequest

deki · 2023-04-17T20:22:54Z

...ava/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java

@@ -498,6 +492,21 @@ public AsyncContext getAsyncContext() {
        return asyncContext;
    }

+    @Override
+    public String getRequestId() {
+        return null;


we have a requestId, let's return it. implement in AwsHttpServletRequest.

deki · 2023-04-17T20:29:26Z

...re/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponse.java

+//    public void setStatus(int i, String s) {
+//        if (!canSetHeader()) return;
+//        statusCode = i;
+//        statusMessage = s;


looks like statusMessage variable can be remove completely

deki · 2023-04-17T20:34:43Z

...src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyRequestDispatcher.java

@@ -80,7 +80,7 @@ public void forward(ServletRequest servletRequest, ServletResponse servletRespon
        }

        if (isNamedDispatcher) {
-            lambdaContainerHandler.doFilter((HttpServletRequest) servletRequest, (HttpServletResponse) servletResponse, getServlet(dispatchTo));


this got explicitly added in rev. f1755de

deki · 2023-04-17T20:35:04Z

...er-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContext.java

@@ -44,8 +46,8 @@
    //-------------------------------------------------------------
    // Constants - Public
    // -------------------------------------------------------------
-    public static final int SERVLET_API_MAJOR_VERSION = 3;
-    public static final int SERVLET_API_MINOR_VERSION = 1;
+    public static final int SERVLET_API_MAJOR_VERSION = 5;


should be 6 now

Thanks. Updated

deki · 2023-04-17T20:36:50Z

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

-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-            <scope>test</scope>


Should be 2.1.1

deki · 2023-04-17T20:41:36Z

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

+        <spring.version>6.0.8</spring.version>
+        <springboot.version>3.0.5</springboot.version>
+        <springsecurity.version>6.0.2</springsecurity.version>
+        <java.version>17</java.version>


java.version is a Spring Boot specific property. It only has an effect if the pom extends spring-boot-starter-parent.

Right. Updated.

deki · 2023-04-17T20:43:10Z

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

            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>


is it needed here? seems it also works without it...

…ty-web, servlet API, commons-fileupload.

- Fixed 2 failing tests in AwsServletContextTest by adding version 2.0.0 of the angus-mail dependency

@notblank

…ata (cannot find symbol @notblank, @Email etc...)

…izerError in SecurityAppTest - Updated hibernate-validator version to 8.0.0.FINAL to fix failing test in ServletAppTest (jakarta.validation not working) - Updated Spring-core version to 6.0.7 to fix CVSS error

…assfish:jakarta.el 5.0.0-M1 in Spring component's pom.xml -Updated the CommonsMultipartResolver to StandardServletMultipartResolver

… tests failing in JerseyAwsProxyTest class with error (java.lang.NoClassDefFoundError: jakarta/ws/rs/core/EntityPart)

- updated dependencies versions in Jersey, Spring and SpringBoot archetypes

- Updated some dependencies versions

- updated build.gradle files to be aligned to the Maven poms - moved all poms to 2.0-SNAPSHOT

….activation dependency.

mbfreder requested a review from deki April 11, 2023 17:57

mbfreder changed the title ~~feat: Add Spring Boot 3 support~~ feat: Provide Spring Boot 3 support Apr 11, 2023

deki requested changes Apr 11, 2023

View reviewed changes

deki self-assigned this Apr 11, 2023

mbfreder requested a review from deki April 14, 2023 18:02

deki requested changes Apr 16, 2023

View reviewed changes

mbfreder requested a review from deki April 17, 2023 07:50

deki requested changes Apr 17, 2023

View reviewed changes

mbfreder requested a review from deki April 20, 2023 16:14

deki changed the base branch from springboot3-support to main April 24, 2023 08:35

Mbea and others added 15 commits April 25, 2023 01:33

Updated versions of Spring, Spring Security, Springboot spring-securi…

749cad7

…ty-web, servlet API, commons-fileupload.

- Did the namespace change on the other components

9cf61f0

- Fixed 2 failing tests in AwsServletContextTest by adding version 2.0.0 of the angus-mail dependency

Update jersey.version to 3.11 to fix issues in JerseyHandlerFilter

4db2388

Upgrade jakarta.validation-api version to 3.0.2 to fix issue in UserD…

6472119

…ata (cannot find symbol @notblank, @Email etc...)

Added jakarta.websocket-api 2.0.0 to fix java.lang.ExceptionInInitial…

8017ce6

…izerError in SecurityAppTest - Updated hibernate-validator version to 8.0.0.FINAL to fix failing test in ServletAppTest (jakarta.validation not working) - Updated Spring-core version to 6.0.7 to fix CVSS error

- Added jakarta-activation-api 2.1.0, jakarta.el-api 5.0.1 and org.gl…

1b6254e

…assfish:jakarta.el 5.0.0-M1 in Spring component's pom.xml -Updated the CommonsMultipartResolver to StandardServletMultipartResolver

- added jakarta.ws.rs-api 3.1.0 to pom.xml in Jersey component to fix…

3abb8fc

… tests failing in JerseyAwsProxyTest class with error (java.lang.NoClassDefFoundError: jakarta/ws/rs/core/EntityPart)

- excluded Spark and struts modules from the build

43179c0

- updated dependencies versions in Jersey, Spring and SpringBoot archetypes

chore: removed unnecessary comments

7639de8

Renamed springboot2 directory and module to springboot3

51642dc

fix: updated name and description in SpringBoot3 component pom.xml

dbdb614

- Updated the pet-store samples

578e3d7

- Updated some dependencies versions

- moved to Servlet 6.0.0

d41e9c5

- updated build.gradle files to be aligned to the Maven poms - moved all poms to 2.0-SNAPSHOT

Removed java-9 profiles along with the old com.sun.activation:jakarta…

4b1a7b4

….activation dependency.

chore(deps): Updated sample apps

980ebfa

mbfreder force-pushed the sprinboot3-support branch from 9023174 to 980ebfa Compare April 25, 2023 09:32

deki merged commit 9a07dcc into aws:main Apr 25, 2023

		@@ -17,9 +17,24 @@

		<properties>
		<jaxrs.version>2.1.1</jaxrs.version>

feat: Provide Spring Boot 3 support #510

feat: Provide Spring Boot 3 support #510

Conversation

mbfreder commented Apr 11, 2023

deki left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

deki left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

deki left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment