diff --git a/gradle.properties b/gradle.properties index 104736d3fa35af49b532109e62f8107a3ca435f9..6e69a119387b179bc044d6f830b3041c159abe31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,14 @@ cdmVersion = 5.1.0 githooksVersion = 1.2.0 jacksonVersion = 2.9.0 junitVersion = 5.8.2 -mnVersion = 2.4.1 +micronautVersion = 3.2.3 +micronautRxVersion = 2.1.1 netcdfVersion = 5.1.0 nodePluginVersion = 3.0.1 nodeVersion = 16.3.0 nshmpLibVersion = 0.8.2 nshmpWsUtilsVersion = 0.1.3 -shadowVersion = 7.1.1 +shadowVersion = 7.1.2 slfVersion = 1.7.30 spotbugsVersion = 4.7.0 spotlessVersion = 6.0.4 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ad400b04fa4f91a2b66916b516e9ff409be1bb33..5d0bbfcfa842838020e95c04571dd5f92be0e8bb 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,26 +10,27 @@ dependencies { implementation "org.slf4j:slf4j-jdk14:${slfVersion}" // Micronaut - annotationProcessor platform("io.micronaut:micronaut-bom:${mnVersion}") + annotationProcessor platform("io.micronaut:micronaut-bom:${micronautVersion}") annotationProcessor "io.micronaut:micronaut-inject-java" annotationProcessor "io.micronaut:micronaut-validation" - implementation platform("io.micronaut:micronaut-bom:${mnVersion}") + 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.micronaut.rxjava3:micronaut-rxjava3:${micronautRxVersion}" implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:${jacksonVersion}" runtimeOnly "ch.qos.logback:logback-classic" // Swagger - annotationProcessor("io.micronaut.configuration:micronaut-openapi") + annotationProcessor("io.micronaut.openapi:micronaut-openapi") implementation("io.swagger.core.v3:swagger-annotations") implementation("io.swagger.core.v3:swagger-models") // junit - testAnnotationProcessor "io.micronaut:micronaut-inject-java:${mnVersion}" - testImplementation platform("io.micronaut:micronaut-bom:${mnVersion}") + testAnnotationProcessor "io.micronaut:micronaut-inject-java:${micronautVersion}" + testImplementation platform("io.micronaut:micronaut-bom:${micronautVersion}") testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "io.micronaut.test:micronaut-test-junit5" diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java index 414c7b4cc500e12282c3f8e0956afe27aebe2817..bab2dccdac8fd1d3a4c95a249839e44dae621d30 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java @@ -2,8 +2,6 @@ package gov.usgs.earthquake.nshmp.netcdf.www; import java.nio.file.Path; -import javax.inject.Inject; - import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass; import gov.usgs.earthquake.nshmp.netcdf.NshmGroup; @@ -24,6 +22,7 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.inject.Inject; /** * Micronaut controller for getting static hazards for a specific diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java index 87062bc05c2004531b09cd2cea778b6c8c7f6aa2..ec3e9dfc765f07f26416d4678e715ac009e5720c 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java @@ -3,8 +3,6 @@ package gov.usgs.earthquake.nshmp.netcdf.www; import java.nio.charset.StandardCharsets; import java.util.stream.Collectors; -import javax.inject.Inject; - import com.google.common.io.Resources; import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet; @@ -16,6 +14,7 @@ import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.inject.Inject; /** * Expose OpenAPI YAML file.