Merge branch 'log4j-fix-2' into 'main'

Log4j fix 2

See merge request !578

build.gradle

@@ -35,7 +35,7 @@ plugins {
   id "com.github.spotbugs" version "${spotbugsVersion}"
   id "com.star-zero.gradle.githook" version "${githooksVersion}"
   id "eclipse-wtp"
-  id "io.micronaut.application" version "${mnPluginVersion}"
+  id "io.micronaut.application" version "${micronautPluginVersion}"
   id "jacoco"
   id "maven-publish"
 }

gradle.properties

@@ -5,13 +5,14 @@ awsS3Version = 1.11.579
 githooksVersion = 1.2.0
 jacksonVersion = 2.9.0
 junitVersion = 5.8.2
-micronautVersion = 2.4.1
-mnPluginVersion = 1.4.2
+micronautVersion = 3.2.3
+micronautRxVersion = 2.1.1
+micronautPluginVersion = 3.1.1
 nodePluginVersion = 3.0.1
 nodeVersion = 16.3.0
 nshmpLibVersion = 0.8.2
 nshmpWsUtilsVersion = 0.1.3
-shadowVersion = 7.1.1
+shadowVersion = 7.1.2
 spotbugsVersion = 4.7.0
 spotlessVersion = 6.0.4
 swaggerVersion = 2.1.7

gradle/dependencies.gradle

@@ -20,11 +20,13 @@ dependencies {
   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"
 
   // 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")
 

src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java

 package gov.usgs.earthquake.nshmp.www;
 
-import javax.inject.Inject;
-
 import gov.usgs.earthquake.nshmp.www.services.HazardService;
 import gov.usgs.earthquake.nshmp.www.services.HazardService.QueryParameters;
 
@@ -15,6 +13,7 @@ import io.swagger.v3.oas.annotations.Operation;
 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 probabilistic seismic hazard calculations.

src/main/java/gov/usgs/earthquake/nshmp/www/RateController.java

@@ -2,8 +2,6 @@ package gov.usgs.earthquake.nshmp.www;
 
 import java.util.Optional;
 
-import javax.inject.Inject;
-
 import gov.usgs.earthquake.nshmp.www.services.RateService;
 import gov.usgs.earthquake.nshmp.www.services.RateService.Query;
 import gov.usgs.earthquake.nshmp.www.services.RateService.Service;
@@ -19,6 +17,7 @@ import io.micronaut.http.annotation.QueryValue;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.inject.Inject;
 
 /**
  * Micronaut controller for rate and probability services.

src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java

 package gov.usgs.earthquake.nshmp.www;
 
-import javax.inject.Inject;
-
 import gov.usgs.earthquake.nshmp.www.services.SourceServices;
 
 import io.micronaut.http.HttpRequest;
@@ -12,6 +10,7 @@ import io.micronaut.http.annotation.Get;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
 
 /**
  * Source model service to return the current installed model.

src/main/java/gov/usgs/earthquake/nshmp/www/SourceLogicTreesController.java

 package gov.usgs.earthquake.nshmp.www;
 
-import javax.inject.Inject;
-
 import gov.usgs.earthquake.nshmp.www.services.SourceLogicTreesService;
 
 import io.micronaut.http.HttpRequest;
@@ -12,6 +10,7 @@ import io.micronaut.http.annotation.PathVariable;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
 
 /**
  * Micronaut controller for NSHM source logic trees.

src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java

@@ -3,8 +3,6 @@ package gov.usgs.earthquake.nshmp.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.services.ServicesUtil;
@@ -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.

src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java

@@ -11,8 +11,6 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
-import javax.inject.Singleton;
-
 import com.google.common.base.Stopwatch;
 
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
@@ -38,6 +36,7 @@ import gov.usgs.earthquake.nshmp.www.services.SourceServices.SourceModel;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
 
 /**
  * Probabilistic seismic hazard calculation handler for

src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService2.java

@@ -11,8 +11,6 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
-import javax.inject.Singleton;
-
 import com.google.common.base.Stopwatch;
 
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
@@ -37,6 +35,7 @@ import gov.usgs.earthquake.nshmp.www.services.SourceServices.SourceModel;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
 
 /**
  * Probabilistic seismic hazard calculation handler for

src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java

@@ -6,8 +6,6 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
-import javax.inject.Singleton;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -30,6 +28,7 @@ import gov.usgs.earthquake.nshmp.www.services.ServicesUtil.ServiceRequestData;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
 
 /**
  * Earthquake probability and rate calculation handler service for

src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java

@@ -14,8 +14,6 @@ import java.util.HashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import javax.inject.Singleton;
-
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.gson.Gson;
@@ -36,6 +34,7 @@ import io.micronaut.context.annotation.Value;
 import io.micronaut.context.event.ShutdownEvent;
 import io.micronaut.context.event.StartupEvent;
 import io.micronaut.runtime.event.annotation.EventListener;
+import jakarta.inject.Singleton;
 
 /**
  * Micronaut controller utility objects and methods.

src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java

 package gov.usgs.earthquake.nshmp.www.services;
 
-import javax.inject.Singleton;
-
 import gov.usgs.earthquake.nshmp.model.Models;
 import gov.usgs.earthquake.nshmp.www.Response;
 import gov.usgs.earthquake.nshmp.www.SourceLogicTreesController;
@@ -9,6 +7,7 @@ import gov.usgs.earthquake.nshmp.www.meta.Status;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
 
 /**
  * Source model tree handler for {@link SourceLogicTreesController}

src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java

@@ -3,8 +3,6 @@ package gov.usgs.earthquake.nshmp.www.services;
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Singleton;
-
 import com.google.common.base.Stopwatch;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -20,6 +18,7 @@ import gov.usgs.earthquake.nshmp.www.meta.Status;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
 
 /**
  * Entry point for services related to source models. Current services: