Merge branch '3.11.x' into 3.12.x

micronaut-projects · Jan 31, 2023 · 6348dcc · 6348dcc
2 parents 33ad545 + 6c85e86
commit 6348dcc
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 44 deletions.
diff --git a/aws-cdk/build.gradle.kts b/aws-cdk/build.gradle.kts
@@ -7,6 +7,6 @@ val micronautStarterVersion: String by project
 
 dependencies {
     api(libs.aws.cdk.lib)
-    api("io.micronaut.starter:micronaut-starter-api:$micronautStarterVersion")
+    api(libs.micronaut.starter)
     testImplementation(projects.functionAwsApiProxy)
 }
diff --git a/function-aws-api-proxy-test/build.gradle.kts b/function-aws-api-proxy-test/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     api(mn.micronaut.http.server)
-    api(project(":function-aws-api-proxy"))
+    api(projects.functionAwsApiProxy)
     implementation(libs.jetty.server)
     testImplementation(mn.micronaut.http.client)
 }
diff --git a/function-aws-custom-runtime/build.gradle.kts b/function-aws-custom-runtime/build.gradle.kts
@@ -8,8 +8,7 @@ dependencies {
 
     api(mn.micronaut.http.client)
     api(libs.managed.aws.lambda.events)
-    implementation(project(":aws-ua"))
-
+    implementation(projects.awsUa)
     testImplementation(projects.functionAwsApiProxy) {
         exclude(group = "com.fasterxml.jackson.module", module = "jackson-module-afterburner")
     }

diff --git a/function-client-aws/build.gradle.kts b/function-client-aws/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     api(projects.awsSdkV1)
-    implementation("com.amazonaws:aws-java-sdk-lambda")
+    implementation(libs.aws.java.sdk.lambda)
     implementation(mn.reactor)
     api(mn.micronaut.function.client)
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,6 @@
 projectVersion=3.12.1-SNAPSHOT
 projectGroup=io.micronaut.aws
 
-micronautDocsVersion=2.0.0
-micronautVersion=3.8.3
-micronautStarterVersion=3.8.3
-micronautTestVersion=3.8.0
-groovyVersion=3.0.13
-spockVersion=2.3-groovy-3.0
-
 title=Micronaut AWS
 projectDesc=Provides integration between Micronaut and Amazon Web Services (AWS)
 projectUrl=https://micronaut.io

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,10 @@
 [versions]
+micronaut = "3.8.0"
+micronaut-docs = "2.0.0"
+micronaut-test = "3.8.0"
+groovy = "3.0.13"
+spock = "2.3-groovy-3.0"
+
 bouncycastle = '1.70'
 fileupload = '0.0.5'
 jetty = '9.4.50.v20221201'
@@ -10,11 +16,12 @@ managed-aws-lambda = '1.2.2'
 managed-aws-lambda-events = '3.11.0'
 managed-aws-serverless-core = '1.9.1'
 managed-aws-cdk-lib='2.59.0'
+micronaut-starter = "3.8.0"
 servlet-api = "2.5"
 slf4j = "1.7.36"
 javapoet = "1.13.0"
 
-kotlin = "1.7.21"
+kotlin = "1.7.22"
 
 # Micronaut
 micronaut-gradle-plugin = "3.6.7"
@@ -41,6 +48,8 @@ awssdk-sqs = { module = 'software.amazon.awssdk:sqs' }
 awssdk-ssm = { module = 'software.amazon.awssdk:ssm' }
 awssdk-url-connection-client = { module = 'software.amazon.awssdk:url-connection-client' }
 
+kotlin-stdlib-jdk8 = { module = 'org.jetbrains.kotlin:kotlin-stdlib-jdk8', version.ref = 'kotlin' }
+
 boms-aws-java-sdk-v1 = { module = 'com.amazonaws:aws-java-sdk-bom', version.ref = 'managed-aws-java-sdk-v1' }
 boms-aws-java-sdk-v2 = { module = 'software.amazon.awssdk:bom', version.ref = 'managed-aws-java-sdk-v2' }
 
@@ -50,17 +59,24 @@ jackson-afterburner = { module = 'com.fasterxml.jackson.module:jackson-module-af
 jetty-server = { module = 'org.eclipse.jetty:jetty-server', version.ref = 'jetty' }
 jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' }
 junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine' }
+junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api' }
 junit-platform-engine = { module = "org.junit.platform:junit-platform-suite-engine" }
+aws-java-sdk-lambda = { module = 'com.amazonaws:aws-java-sdk-lambda' }
+
 logback-classic = { module = "ch.qos.logback:logback-classic" }
 logback-json-classic = { module = 'ch.qos.logback.contrib:logback-json-classic', version.ref = 'logback-json-classic' }
 jackson-databind = { module = 'com.fasterxml.jackson.core:jackson-databind' }
 
+micronaut-starter = { module = "io.micronaut.starter:micronaut-starter-api", version.ref = 'micronaut-starter'}
+
 managed-alexa-ask-sdk = { module = 'com.amazon.alexa:ask-sdk', version.ref = 'managed-alexa-ask-sdk' }
 managed-alexa-ask-sdk-core = { module = 'com.amazon.alexa:ask-sdk-core', version.ref = 'managed-alexa-ask-sdk' }
 managed-alexa-ask-sdk-lambda = { module = 'com.amazon.alexa:ask-sdk-lambda-support', version.ref = 'managed-alexa-ask-sdk' }
 managed-aws-java-sdk-core = { module = 'com.amazonaws:aws-java-sdk-core', version.ref = 'managed-aws-java-sdk-v1' }
 managed-aws-lambda-core = { module = 'com.amazonaws:aws-lambda-java-core', version.ref = 'managed-aws-lambda'}
 managed-aws-lambda-events = { module = 'com.amazonaws:aws-lambda-java-events', version.ref = 'managed-aws-lambda-events'}
+
+
 managed-awssdk-secretsmanager = { module = 'software.amazon.awssdk:secretsmanager', version.ref = 'managed-aws-java-sdk-v2' }
 managed-aws-serverless-core = { module = 'com.amazonaws.serverless:aws-serverless-java-container-core', version.ref = 'managed-aws-serverless-core' }
 managed-jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' }

diff --git a/test-suite-aws-sdk-v2/build.gradle.kts b/test-suite-aws-sdk-v2/build.gradle.kts
@@ -10,12 +10,12 @@ repositories {
 val micronautVersion: String by project
 
 dependencies {
-    testAnnotationProcessor(platform("io.micronaut:micronaut-bom:$micronautVersion"))
-    testAnnotationProcessor("io.micronaut:micronaut-inject-java")
-    testImplementation(platform("io.micronaut:micronaut-bom:$micronautVersion"))
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("io.micronaut.test:micronaut-test-junit5")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testAnnotationProcessor(platform(mn.micronaut.bom))
+    testAnnotationProcessor(mn.micronaut.inject.java)
+    testImplementation(platform(mn.micronaut.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(mn.micronaut.test.junit5)
+    testRuntimeOnly(libs.junit.jupiter.engine)
     testImplementation(projects.awsSdkV2)
 }
 tasks {

diff --git a/test-suite-groovy/build.gradle.kts b/test-suite-groovy/build.gradle.kts
@@ -8,17 +8,10 @@ repositories {
     mavenCentral()
 }
 
-val micronautVersion: String by project
-val micronautTestVersion: String by project
-val spockVersion: String by project
-
 dependencies {
-    testCompileOnly("io.micronaut:micronaut-inject-groovy:$micronautVersion")
-    testImplementation("org.spockframework:spock-core:${spockVersion}") {
-        exclude(module = "groovy-all")
-    }
-    testImplementation("io.micronaut.test:micronaut-test-spock:$micronautTestVersion")
-    testImplementation(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+    testCompileOnly(mn.micronaut.inject.groovy)
+    testImplementation(mn.micronaut.test.spock)
+    testImplementation(platform(mn.micronaut.bom))
     testImplementation(projects.functionAws)
     testImplementation(projects.functionClientAws)
 }

diff --git a/test-suite-kotlin/build.gradle.kts b/test-suite-kotlin/build.gradle.kts
@@ -12,14 +12,13 @@ repositories {
 val micronautVersion: String by project
 
 dependencies {
-    kaptTest("io.micronaut:micronaut-inject-java:$micronautVersion")
-
-    testImplementation(platform("io.micronaut:micronaut-bom:$micronautVersion"))
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("io.micronaut.test:micronaut-test-junit5")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    kaptTest(mn.micronaut.inject.java)
+    testAnnotationProcessor(platform(mn.micronaut.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(mn.micronaut.test.junit5)
+    testRuntimeOnly(libs.junit.jupiter.engine)
     testImplementation(projects.functionAws)
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22")
+    testImplementation(libs.kotlin.stdlib.jdk8)
     testImplementation(projects.functionClientAws)
 }
 

diff --git a/test-suite/build.gradle.kts b/test-suite/build.gradle.kts
@@ -10,16 +10,16 @@ repositories {
 val micronautVersion: String by project
 
 dependencies {
-    testAnnotationProcessor(platform("io.micronaut:micronaut-bom:$micronautVersion"))
-    testAnnotationProcessor("io.micronaut:micronaut-inject-java")
+    testAnnotationProcessor(platform(mn.micronaut.bom))
+    testAnnotationProcessor(mn.micronaut.inject.java)
+    testImplementation(platform(mn.micronaut.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(mn.micronaut.test.junit5)
+    testRuntimeOnly(libs.junit.jupiter.engine)
 
-    testImplementation(platform("io.micronaut:micronaut-bom:$micronautVersion"))
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("io.micronaut.test:micronaut-test-junit5")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-    testImplementation(project(":function-aws"))
-    testImplementation(project(":function-client-aws"))
+    testImplementation(projects.functionAws)
+    testImplementation(projects.functionClientAws)
 }
 
 tasks {