Merge branch 'main' into tobixlea/headers

Author: tobixlea

.github/workflows/release.yml

@@ -20,8 +20,10 @@ jobs:
       - uses: actions/checkout@v3
       - name: Configure Git User # may be removed after https://github.com/actions/checkout/issues/13 is resolved
         run: |
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
-          git config user.name "${{ github.actor }}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+          git config user.name "$GITHUB_ACTOR"
+        env:
+          GITHUB_ACTOR: ${{ github.actor }}
       - name: Set up Maven
         uses: actions/setup-java@v3
         with:
@@ -33,8 +35,18 @@ jobs:
           gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} # Value of the GPG private key to import
           gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase
       - name: Release and publish package
-        run: mvn release:prepare release:perform -B -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }}
+        run: mvn release:prepare release:perform -B -DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$DEVELOPMENT_VERSION"
         env:
           MAVEN_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          RELEASE_VERSION: ${{ github.event.inputs.releaseVersion }}
+          DEVELOPMENT_VERSION: ${{ github.event.inputs.developmentVersion }}
+      - name: Upload to Central Publisher Portal
+        run: |
+          AUTH=$(echo -n "$CENTRAL_USERNAME:$CENTRAL_PASSWORD" | base64)
+          curl --fail -X POST "https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/com.amazonaws.serverless" \
+            -H "Authorization: Bearer $AUTH"
+        env:
+          CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+          CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}

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

@@ -6,12 +6,12 @@
     <name>AWS Serverless Java container support - Core</name>
     <description>Allows Java applications written for a servlet container to run in AWS Lambda</description>
     <url>https://aws.amazon.com/lambda</url>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
 
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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

@@ -6,12 +6,12 @@
     <name>AWS Serverless Java container support - Jersey implementation</name>
     <description>Allows Java applications written for Jersey to run in AWS Lambda</description>
     <url>https://aws.amazon.com/lambda</url>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
 
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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

@@ -6,12 +6,12 @@
     <name>AWS Serverless Java container support - Spring implementation</name>
     <description>Allows Java applications written for the Spring framework to run in AWS Lambda</description>
     <url>https://aws.amazon.com/lambda</url>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
 
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>aws-serverless-java-container</artifactId>
         <groupId>com.amazonaws.serverless</groupId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

aws-serverless-java-container-springboot4/src/main/java/com/amazonaws/serverless/proxy/spring/AwsSpringWebCustomRuntimeEventLoop.java

@@ -130,7 +130,6 @@ private void eventLoop(ServletWebServerApplicationContext context) {
 
 					HttpServletRequest httpServletRequest = AwsSpringHttpProcessingUtils.generateHttpServletRequest(
 							incomingEvent.getBody(), null, mvc.getServletContext(), mapper);
-					httpServletRequest.startAsync();
 					AwsProxyResponse awsResponse = AwsSpringHttpProcessingUtils.processRequest(
 							httpServletRequest, mvc, responseWriter);
 					if (logger.isDebugEnabled()) {

aws-serverless-java-container-springboot4/src/main/java/com/amazonaws/serverless/proxy/spring/SpringDelegatingLambdaContainerHandler.java

@@ -78,7 +78,6 @@ public void handleRequest(InputStream input, OutputStream output, Context lambda
         ServerlessMVC mvc = initHandler.getMvc();
         HttpServletRequest httpServletRequest = AwsSpringHttpProcessingUtils
         		.generateHttpServletRequest(input, lambdaContext, mvc.getServletContext(), this.mapper);
-        httpServletRequest.startAsync();
         AwsProxyResponse awsProxyResponse = AwsSpringHttpProcessingUtils.processRequest(httpServletRequest, mvc, responseWriter);
         this.mapper.writeValue(output, awsProxyResponse);
     }