build to 6.0.1, test to 4.0.0-SNAPSHOT, groovy to 4.0.6, spock to 2.3…

…-groovy-4.0, github workflows to Java 17, fixes for core breaking changes (#1497)

.github/workflows/central-sync.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Sonatype OSSRH
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/graalvm.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['11', '17']
+        java: ['17']
         graalvm: ['latest', 'dev']
     steps:
        # https://github.com/actions/virtual-environments/issues/709

.github/workflows/gradle.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11', '17']
+        java: ['17']
     steps:
        # https://github.com/actions/virtual-environments/issues/709
       - name: Free disk space
@@ -72,7 +72,7 @@ jobs:
           name: binary-compatibility-reports
           path: "**/build/reports/binary-compatibility-*.html"
       - name: Publish to Sonatype Snapshots
-        if: success() && github.event_name == 'push' && matrix.java == '11'
+        if: success() && github.event_name == 'push' && matrix.java == '17'
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -88,7 +88,7 @@ jobs:
           if_true: "micronaut-projects/micronaut-docs"
           if_false: ${{ github.repository }}
       - name: Publish to Github Pages
-        if: success() && github.event_name == 'push' && matrix.java == '11'
+        if: success() && github.event_name == 'push' && matrix.java == '17'
         uses: micronaut-projects/github-pages-deploy-action@master
         env:
           TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}

.github/workflows/publish-snapshot.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Sonatype Snapshots
         if: success()
         env:

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Set the current release version
         id: release_version
         run: echo ::set-output name=release_version::${GITHUB_REF:11}

.github/workflows/sonarqube.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Optional setup step
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

aws-alexa-httpserver/build.gradle

@@ -3,17 +3,17 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor libs.micronaut.validation
+    annotationProcessor mn.micronaut.validation
 
-    implementation libs.micronaut.validation
+    implementation mn.micronaut.validation
 
-    api project(":aws-alexa")
+    api projects.awsAlexa
 
-    implementation libs.micronaut.http.server
+    implementation mn.micronaut.http.server
     api(libs.managed.alexa.ask.sdk.core)
 
-    testImplementation libs.micronaut.http.client
-    testImplementation libs.micronaut.http.server.netty
+    testImplementation mn.micronaut.http.client
+    testImplementation mn.micronaut.http.server.netty
     testImplementation libs.bouncycastle.provider
     testImplementation (libs.alexa.ask.sdk) {
         transitive(false)

aws-alexa/build.gradle

@@ -3,21 +3,21 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor libs.micronaut.validation
+    annotationProcessor mn.micronaut.validation
 
-    implementation libs.micronaut.validation
+    implementation mn.micronaut.validation
 
     compileOnly(libs.alexa.ask.sdk)
     api(libs.managed.alexa.ask.sdk.core)
 
-    testAnnotationProcessor libs.micronaut.inject.java
+    testAnnotationProcessor mn.micronaut.inject.java
     testImplementation(libs.alexa.ask.sdk) {
         transitive(false)
     }
     testImplementation libs.alexa.ask.sdk.apache.client
 
-    testImplementation libs.micronaut.http.client
-    testImplementation libs.micronaut.http.server.netty
-    testImplementation libs.groovy.json
+    testImplementation mn.micronaut.http.client
+    testImplementation mn.micronaut.http.server.netty
+    testImplementation mn.groovy.json
     testRuntimeOnly libs.jcl.over.slf4j
 }

aws-cdk/build.gradle

@@ -2,13 +2,8 @@ plugins {
     id("io.micronaut.build.internal.aws-module")
 }
 
-repositories {
-    mavenCentral()
-    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
-}
-
 dependencies {
     api libs.aws.cdk.lib
     api("io.micronaut.starter:micronaut-starter-api:$micronautStarterVersion")
-    testImplementation(project(":function-aws-api-proxy"))
+    testImplementation(projects.functionAwsApiProxy)
 }

aws-common/build.gradle

@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-    compileOnly libs.micronaut.runtime
-    testImplementation libs.micronaut.runtime
+    compileOnly mn.micronaut.runtime
+    testImplementation mn.micronaut.runtime
 }

aws-distributed-configuration/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api project(":aws-common")
-    api(libs.micronaut.discovery.client)
-    testImplementation libs.micronaut.http.server.netty
+    api projects.awsCommon
+    api(mn.micronaut.discovery)
+    testImplementation mn.micronaut.http.server.netty
 }

aws-parameter-store/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 dependencies {
-    api libs.micronaut.discovery.client
-    api project(":aws-service-discovery")
-    api project(":aws-sdk-v2")
+    api mn.micronaut.discovery
+    api projects.awsServiceDiscovery
+    api projects.awsSdkV2
     implementation libs.aws.ssm
 
-    implementation libs.projectreactor
+    implementation mn.reactor
 
-    testImplementation libs.micronaut.http.server.netty
+    testImplementation mn.micronaut.http.server.netty
 }

aws-sdk-v1/build.gradle

@@ -6,9 +6,11 @@ dependencies {
     api platform(libs.boms.aws.java.sdk.v1)
     api libs.managed.aws.java.sdk.core
 
-    api project(":aws-common")
+    api projects.awsCommon
 
     runtimeOnly libs.jcl.over.slf4j
 
-    testImplementation libs.micronaut.http.server.netty
+    testImplementation mn.micronaut.http.server.netty
+    testRuntimeOnly mn.snakeyaml
+
 }

aws-sdk-v2/build.gradle

@@ -4,9 +4,9 @@ plugins {
 
 dependencies {
     api platform(libs.boms.aws.java.sdk.v2)
-    api project(":aws-common")
+    api projects.awsCommon
 
-    compileOnly libs.graal
+    compileOnly mn.graal
 
     // Clients
     compileOnly libs.awssdk.url.connection.client
@@ -25,7 +25,7 @@ dependencies {
     compileOnly libs.awssdk.servicediscovery
 
     // Tests
-    testAnnotationProcessor libs.micronaut.inject.java
+    testAnnotationProcessor mn.micronaut.inject.java
     testImplementation libs.awssdk.apigatewaymanagementapi
     testImplementation libs.awssdk.servicediscovery
     testImplementation libs.awssdk.url.connection.client
@@ -40,4 +40,5 @@ dependencies {
     testImplementation libs.awssdk.ssm
     testImplementation libs.awssdk.rekognition
     testRuntimeOnly libs.jcl.over.slf4j
+    testRuntimeOnly mn.snakeyaml
 }

aws-secretsmanager/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api project(":aws-sdk-v2")
-    api project(":aws-distributed-configuration")
+    api projects.awsSdkV2
+    api projects.awsDistributedConfiguration
     api libs.awssdk.secretsmanager
 }

aws-service-discovery/build.gradle

@@ -3,11 +3,11 @@ plugins {
 }
 
 dependencies {
-    api libs.micronaut.discovery.client
-    api project(":aws-sdk-v2")
+    api mn.micronaut.discovery
+    api projects.awsSdkV2
 
     implementation libs.awssdk.servicediscovery
 
-    testImplementation libs.projectreactor
-    testImplementation libs.micronaut.http.server.netty
+    testImplementation mn.reactor
+    testImplementation mn.micronaut.http.server.netty
 }

build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id "io.micronaut.build.internal.docs"
-    id "io.micronaut.build.internal.dependency-updates"
     id "io.micronaut.build.internal.quality-reporting"
 }
 

buildSrc/src/main/groovy/io.micronaut.build.internal.aws-base.gradle

@@ -2,3 +2,10 @@ repositories {
     mavenCentral()
     maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
 }
+
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute(module("org.codehaus.groovy:groovy"))
+                .using(module("org.apache.groovy:groovy:4.0.6"))
+    }
+}

function-aws-alexa/build.gradle

@@ -3,19 +3,19 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor libs.micronaut.validation
+    annotationProcessor mn.micronaut.validation
 
-    implementation libs.micronaut.runtime
-    implementation libs.micronaut.validation
+    implementation mn.micronaut.runtime
+    implementation mn.micronaut.validation
 
-    implementation project(":function-aws")
+    implementation projects.functionAws
 
     api libs.managed.alexa.ask.sdk.lambda
-    api project(":aws-alexa")
+    api projects.awsAlexa
 
     runtimeOnly libs.jcl.over.slf4j
 
-    testAnnotationProcessor libs.micronaut.inject.java
+    testAnnotationProcessor mn.micronaut.inject.java
     testImplementation (libs.alexa.ask.sdk) {
         transitive(false)
     }

function-aws-api-proxy-test/build.gradle

@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-    api libs.micronaut.http.server
-    api project(":function-aws-api-proxy")
+    api mn.micronaut.http.server
+    api projects.functionAwsApiProxy
     implementation libs.jetty.server
-    testImplementation libs.micronaut.http.client
+    testImplementation mn.micronaut.http.client
 }

function-aws-api-proxy/build.gradle

@@ -3,32 +3,32 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor libs.micronaut.graal
+    annotationProcessor mn.micronaut.graal
 
-    compileOnly libs.micronaut.security
+    compileOnly mn.micronaut.security
 
-    implementation libs.micronaut.http.netty
+    implementation mn.micronaut.http.netty
+    implementation mn.micronaut.core.processor
+    implementation mn.reactor
 
-    implementation libs.projectreactor
-
-    api libs.micronaut.http.server
+    api mn.micronaut.http.server
     api(libs.managed.aws.serverless.core) {
         exclude group:'javax.servlet', module:'javax.servlet-api'
         exclude group:'com.fasterxml.jackson.module', module:'jackson-module-afterburner'
         exclude group: "commons-logging"
     }
     api libs.managed.jcl.over.slf4j
-    api project(":function-aws")
-    api project(":aws-common")
+    api projects.functionAws
+    api projects.awsCommon
 
-    testAnnotationProcessor libs.micronaut.validation
-    testImplementation libs.micronaut.validation
+    testAnnotationProcessor mn.micronaut.validation
+    testImplementation mn.micronaut.validation
 
-    testImplementation libs.micronaut.inject.java
-    testImplementation libs.micronaut.http.client
-    testImplementation libs.micronaut.security
+    testImplementation mn.micronaut.inject.java
+    testImplementation mn.micronaut.http.client
+    testImplementation mn.micronaut.security
 
-    testImplementation libs.micronaut.views.handlebars
+    testImplementation mn.micronaut.views.handlebars
 
     testImplementation libs.jackson.afterburner
     testImplementation libs.servlet.api

function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/MicronautAwsProxyResponse.java

@@ -56,7 +56,8 @@ public class MicronautAwsProxyResponse<T> implements MutableHttpResponse<T>, Clo
     private final AwsProxyRequest request;
     private final MicronautLambdaContainerContext handler;
     private T body;
-    private HttpStatus status;
+    private int status;
+    private String reason = HttpStatus.OK.getReason();
     private AwsProxyResponse response = new AwsProxyResponse();
     private final AwsHeaders awsHeaders = new AwsHeaders();
     private Headers multiValueHeaders = new Headers();
@@ -76,7 +77,7 @@ public class MicronautAwsProxyResponse<T> implements MutableHttpResponse<T>, Clo
         this.request = request;
         this.response.setMultiValueHeaders(multiValueHeaders);
         this.handler = environment;
-        this.status = HttpStatus.OK;
+        this.status = HttpStatus.OK.getCode();
         this.response.setStatusCode(HttpStatus.OK.getCode());
     }
 
@@ -112,18 +113,28 @@ public MutableHttpHeaders getHeaders() {
     }
 
     @Override
-    public MutableHttpResponse<T> status(HttpStatus status, CharSequence message) {
+    public MutableHttpResponse<T> status(int status, CharSequence message) {
         ArgumentUtils.requireNonNull("status", status);
+        if (message == null) {
+            this.reason = HttpStatus.getDefaultReason(status);
+        } else {
+            this.reason = message.toString();
+        }
         this.status = status;
-        response.setStatusCode(status.getCode());
+        response.setStatusCode(status);
         return this;
     }
 
     @Override
-    public HttpStatus getStatus() {
+    public int code() {
         return status;
     }
 
+    @Override
+    public String reason() {
+        return reason;
+    }
+
     /**
      * @return Any cookies
      */