update quarkus to 3.1.1

mbari-org · Mar 13, 2024 · 95b547d · 95b547d
1 parent 81c04d2
commit 95b547d
Show file tree

Hide file tree

Showing 38 changed files with 70 additions and 66 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 2024-03
 
+0.9.93
+
+- upgrade quarkus to 3.1.1 (from 2.16.4)
+
 0.9.92
 
 - enabled quarkus-micrometer-registry-prometheus

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.mbari</groupId>
   <artifactId>mxm</artifactId>
-  <version>0.9.92</version>
+  <version>0.9.93</version>
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
@@ -13,7 +13,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus.platform.version>2.16.11.Final</quarkus.platform.version>
+    <quarkus.platform.version>3.1.1.Final</quarkus.platform.version>
     <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>

diff --git a/src/main/java/org/mbari/mxm/ProviderManager.java b/src/main/java/org/mbari/mxm/ProviderManager.java
@@ -2,8 +2,8 @@
 
 import java.time.OffsetDateTime;
 import java.util.*;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.microprofile.config.inject.ConfigProperty;

diff --git a/src/main/java/org/mbari/mxm/SPARouting.java b/src/main/java/org/mbari/mxm/SPARouting.java
@@ -4,8 +4,8 @@
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
 import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 

diff --git a/src/main/java/org/mbari/mxm/db/argument/Argument.java b/src/main/java/org/mbari/mxm/db/argument/Argument.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/argument/ArgumentService.java b/src/main/java/org/mbari/mxm/db/argument/ArgumentService.java
@@ -3,8 +3,8 @@
 import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.db.DbUtl;
 import org.mbari.mxm.db.mission.Mission;

diff --git a/src/main/java/org/mbari/mxm/db/asset/Asset.java b/src/main/java/org/mbari/mxm/db/asset/Asset.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/asset/AssetService.java b/src/main/java/org/mbari/mxm/db/asset/AssetService.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.db.DbUtl;
 import org.mbari.mxm.db.assetClass.AssetClass;

diff --git a/src/main/java/org/mbari/mxm/db/assetClass/AssetClass.java b/src/main/java/org/mbari/mxm/db/assetClass/AssetClass.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/assetClass/AssetClassService.java b/src/main/java/org/mbari/mxm/db/assetClass/AssetClassService.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.db.DbUtl;
 import org.mbari.mxm.db.asset.Asset;

diff --git a/src/main/java/org/mbari/mxm/db/mission/Mission.java b/src/main/java/org/mbari/mxm/db/mission/Mission.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.time.OffsetDateTime;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/mission/MissionService.java b/src/main/java/org/mbari/mxm/db/mission/MissionService.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.Broadcaster;

diff --git a/src/main/java/org/mbari/mxm/db/missionStatusUpdate/MissionStatusUpdate.java b/src/main/java/org/mbari/mxm/db/missionStatusUpdate/MissionStatusUpdate.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.time.OffsetDateTime;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/missionStatusUpdate/MissionStatusUpdateService.java b/src/main/java/org/mbari/mxm/db/missionStatusUpdate/MissionStatusUpdateService.java
@@ -2,8 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.db.mission.Mission;
 import org.mbari.mxm.db.mission.MissionService;

diff --git a/src/main/java/org/mbari/mxm/db/missionTemplate/MissionTemplate.java b/src/main/java/org/mbari/mxm/db/missionTemplate/MissionTemplate.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.time.OffsetDateTime;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/missionTemplate/MissionTemplateService.java b/src/main/java/org/mbari/mxm/db/missionTemplate/MissionTemplateService.java
@@ -3,8 +3,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.Utl;
 import org.mbari.mxm.db.DbUtl;

diff --git a/src/main/java/org/mbari/mxm/db/missionTemplateAssetClass/MissionTemplateAssetClass.java b/src/main/java/org/mbari/mxm/db/missionTemplateAssetClass/MissionTemplateAssetClass.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/...ain/java/org/mbari/mxm/db/missionTemplateAssetClass/MissionTemplateAssetClassService.java b/...ain/java/org/mbari/mxm/db/missionTemplateAssetClass/MissionTemplateAssetClassService.java
@@ -6,9 +6,9 @@
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.json.JsonString;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.json.JsonString;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

diff --git a/src/main/java/org/mbari/mxm/db/parameter/Parameter.java b/src/main/java/org/mbari/mxm/db/parameter/Parameter.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/parameter/ParameterService.java b/src/main/java/org/mbari/mxm/db/parameter/ParameterService.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.db.DbUtl;
 import org.mbari.mxm.db.argument.Argument;

diff --git a/src/main/java/org/mbari/mxm/db/provider/Provider.java b/src/main/java/org/mbari/mxm/db/provider/Provider.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/provider/ProviderService.java b/src/main/java/org/mbari/mxm/db/provider/ProviderService.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.Getter;
 import org.mbari.mxm.Broadcaster;
 import org.mbari.mxm.ProgressBroadcaster;

diff --git a/src/main/java/org/mbari/mxm/db/support/DbSupport.java b/src/main/java/org/mbari/mxm/db/support/DbSupport.java
@@ -1,6 +1,6 @@
 package org.mbari.mxm.db.support;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import lombok.extern.slf4j.Slf4j;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.postgres.PostgresPlugin;

diff --git a/src/main/java/org/mbari/mxm/db/unit/Unit.java b/src/main/java/org/mbari/mxm/db/unit/Unit.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/org/mbari/mxm/db/unit/UnitService.java b/src/main/java/org/mbari/mxm/db/unit/UnitService.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.mbari.mxm.db.DbUtl;
 import org.mbari.mxm.db.support.DbSupport;

diff --git a/src/main/java/org/mbari/mxm/graphql/MxmGraphQLEndpoint.java b/src/main/java/org/mbari/mxm/graphql/MxmGraphQLEndpoint.java
@@ -3,9 +3,9 @@
 import io.smallrye.graphql.api.Subscription;
 import io.smallrye.mutiny.Multi;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.validation.Valid;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.microprofile.graphql.*;
 import org.mbari.mxm.Broadcaster;

diff --git a/src/main/java/org/mbari/mxm/graphql/ProviderCreate.java b/src/main/java/org/mbari/mxm/graphql/ProviderCreate.java
@@ -1,6 +1,6 @@
 package org.mbari.mxm.graphql;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.NoArgsConstructor;

diff --git a/src/main/java/org/mbari/mxm/graphql/ProviderProgress.java b/src/main/java/org/mbari/mxm/graphql/ProviderProgress.java
@@ -1,6 +1,6 @@
 package org.mbari.mxm.graphql;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.NoArgsConstructor;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForArgument.java b/src/main/java/org/mbari/mxm/graphql/ext/ForArgument.java
@@ -3,8 +3,8 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.argument.Argument;
 import org.mbari.mxm.db.parameter.Parameter;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForAsset.java b/src/main/java/org/mbari/mxm/graphql/ext/ForAsset.java
@@ -3,8 +3,8 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.asset.Asset;
 import org.mbari.mxm.db.assetClass.AssetClass;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForAssetClass.java b/src/main/java/org/mbari/mxm/graphql/ext/ForAssetClass.java
@@ -3,8 +3,8 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Description;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.asset.Asset;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForMission.java b/src/main/java/org/mbari/mxm/graphql/ext/ForMission.java
@@ -5,8 +5,8 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.argument.Argument;
 import org.mbari.mxm.db.argument.ArgumentService;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForMissionTemplate.java b/src/main/java/org/mbari/mxm/graphql/ext/ForMissionTemplate.java
@@ -5,8 +5,8 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.assetClass.AssetClass;
 import org.mbari.mxm.db.mission.Mission;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForParameter.java b/src/main/java/org/mbari/mxm/graphql/ext/ForParameter.java
@@ -5,8 +5,8 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.parameter.Parameter;
 import org.mbari.mxm.db.provider.Provider;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForProvider.java b/src/main/java/org/mbari/mxm/graphql/ext/ForProvider.java
@@ -7,8 +7,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Description;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.assetClass.AssetClass;

diff --git a/src/main/java/org/mbari/mxm/graphql/ext/ForUnit.java b/src/main/java/org/mbari/mxm/graphql/ext/ForUnit.java
@@ -3,8 +3,8 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Source;
 import org.mbari.mxm.db.unit.Unit;
 import org.mbari.mxm.db.unit.UnitService;

diff --git a/src/main/java/org/mbari/mxm/provider_client/rest/ProviderClientRestService.java b/src/main/java/org/mbari/mxm/provider_client/rest/ProviderClientRestService.java
@@ -1,7 +1,7 @@
 package org.mbari.mxm.provider_client.rest;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
 import org.mbari.mxm.provider_client.responses.*;
 
 @Path("/")