From 9ee537e121083813c2bc34a07fd60ed9ffb65f4c Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Thu, 4 Apr 2024 13:08:40 -0600 Subject: [PATCH] test --- build.gradle | 6 +++++- gradle/dependencies.gradle | 35 +++++++++++++++++++---------------- micronaut-cli.yml | 2 +- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 4110352..fed3980 100644 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,10 @@ plugins { compileJava.options.encoding = "UTF-8" compileTestJava.options.encoding = "UTF-8" mainClassName = "gov.usgs.earthquake.nshmp.www.Application" -sourceCompatibility = JavaVersion.VERSION_11 java { + sourceCompatibility = JavaVersion.toVersion("11") + targetCompatibility = JavaVersion.toVersion("11") withSourcesJar() } @@ -75,6 +76,9 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask) { graalvmNative.toolchainDetection = false micronaut { runtime("lambda_java") + // nativeLambda { + // lambdaRuntimeClassName = "io.micronaut.function.aws.runtime.MicronautLambdaRuntime" + // } processing { incremental(true) annotations("gov.usgs.earthquake.nshmp.www.*") diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 136cf0d..496f3ba 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -9,26 +9,29 @@ dependencies { implementation "ghsc:nshmp-utils-java:${nshmpUtilsJavaVersion}" // Micronaut - annotationProcessor platform("io.micronaut:micronaut-bom:${micronautVersion}") - annotationProcessor "io.micronaut:micronaut-inject-java" - annotationProcessor "io.micronaut:micronaut-validation" - implementation platform("io.micronaut:micronaut-bom:${micronautVersion}") - implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut:micronaut-inject" - implementation "io.micronaut:micronaut-validation" - implementation "io.micronaut:micronaut-runtime" - implementation "io.micronaut:micronaut-http-server-netty" - implementation "io.projectreactor:reactor-core" - implementation "io.micronaut.rxjava3:micronaut-rxjava3:${micronautRxVersion}" - implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:${jacksonVersion}" - runtimeOnly "ch.qos.logback:logback-classic" + // annotationProcessor platform("io.micronaut:micronaut-bom:${micronautVersion}") + // annotationProcessor "io.micronaut:micronaut-inject-java" + // annotationProcessor "io.micronaut:micronaut-validation" + // implementation platform("io.micronaut:micronaut-bom:${micronautVersion}") + // implementation "io.micronaut:micronaut-http-client" + // implementation "io.micronaut:micronaut-inject" + // implementation "io.micronaut:micronaut-validation" + // implementation "io.micronaut:micronaut-runtime" + // implementation "io.micronaut:micronaut-http-server-netty" + // implementation "io.projectreactor:reactor-core" + // implementation "io.micronaut.rxjava3:micronaut-rxjava3:${micronautRxVersion}" + // implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:${jacksonVersion}" + // runtimeOnly "ch.qos.logback:logback-classic" // Micronaut Lambda annotationProcessor("io.micronaut:micronaut-http-validation") - implementation("jakarta.annotation:jakarta.annotation-api") - implementation("io.micronaut.crac:micronaut-crac") - implementation("io.micronaut.aws:micronaut-aws-apigateway") implementation("io.micronaut:micronaut-jackson-databind") + implementation("io.micronaut.aws:micronaut-aws-apigateway") + implementation("io.micronaut.crac:micronaut-crac") + implementation("jakarta.annotation:jakarta.annotation-api") + implementation("io.micronaut.aws:micronaut-function-aws-api-proxy") + + runtimeOnly("ch.qos.logback:logback-classic") // Swagger annotationProcessor("io.micronaut.openapi:micronaut-openapi") diff --git a/micronaut-cli.yml b/micronaut-cli.yml index de3d713..c8ee5ad 100644 --- a/micronaut-cli.yml +++ b/micronaut-cli.yml @@ -3,4 +3,4 @@ defaultPackage: gov.usgs.earthquake.nshmp.www testFramework: junit sourceLanguage: java buildTool: gradle -features: [amazon-api-gateway, annotation-api, app-name, aws-lambda, aws-lambda-handler-default, gradle, http-client, jackson-databind, java, java-application, junit, logback, micronaut-build, readme, shade, snapstart, x86, yaml] +features: [amazon-api-gateway, app-name, aws-lambda, aws-lambda-events-serde, aws-lambda-handler-default, gradle, http-client-test, java, java-application, junit, logback, micronaut-aot, micronaut-build, micronaut-http-validation, properties, readme, serialization-jackson, shade, snapstart, static-resources, x86] -- GitLab