From 95b547dc3ea6e2ffc4dd3b251570df7932ad2f83 Mon Sep 17 00:00:00 2001 From: Carlos Rueda Date: Tue, 12 Mar 2024 18:51:14 -0700 Subject: [PATCH] update quarkus to 3.1.1 --- ChangeLog.md | 4 ++++ pom.xml | 4 ++-- src/main/java/org/mbari/mxm/ProviderManager.java | 4 ++-- src/main/java/org/mbari/mxm/SPARouting.java | 4 ++-- src/main/java/org/mbari/mxm/db/argument/Argument.java | 2 +- .../org/mbari/mxm/db/argument/ArgumentService.java | 4 ++-- src/main/java/org/mbari/mxm/db/asset/Asset.java | 2 +- src/main/java/org/mbari/mxm/db/asset/AssetService.java | 4 ++-- .../java/org/mbari/mxm/db/assetClass/AssetClass.java | 2 +- .../org/mbari/mxm/db/assetClass/AssetClassService.java | 4 ++-- src/main/java/org/mbari/mxm/db/mission/Mission.java | 2 +- .../java/org/mbari/mxm/db/mission/MissionService.java | 4 ++-- .../db/missionStatusUpdate/MissionStatusUpdate.java | 2 +- .../MissionStatusUpdateService.java | 4 ++-- .../mbari/mxm/db/missionTemplate/MissionTemplate.java | 2 +- .../mxm/db/missionTemplate/MissionTemplateService.java | 4 ++-- .../MissionTemplateAssetClass.java | 2 +- .../MissionTemplateAssetClassService.java | 6 +++--- .../java/org/mbari/mxm/db/parameter/Parameter.java | 2 +- .../org/mbari/mxm/db/parameter/ParameterService.java | 4 ++-- src/main/java/org/mbari/mxm/db/provider/Provider.java | 2 +- .../org/mbari/mxm/db/provider/ProviderService.java | 4 ++-- src/main/java/org/mbari/mxm/db/support/DbSupport.java | 2 +- src/main/java/org/mbari/mxm/db/unit/Unit.java | 2 +- src/main/java/org/mbari/mxm/db/unit/UnitService.java | 4 ++-- .../java/org/mbari/mxm/graphql/MxmGraphQLEndpoint.java | 6 +++--- .../java/org/mbari/mxm/graphql/ProviderCreate.java | 2 +- .../java/org/mbari/mxm/graphql/ProviderProgress.java | 2 +- .../java/org/mbari/mxm/graphql/ext/ForArgument.java | 4 ++-- src/main/java/org/mbari/mxm/graphql/ext/ForAsset.java | 4 ++-- .../java/org/mbari/mxm/graphql/ext/ForAssetClass.java | 4 ++-- .../java/org/mbari/mxm/graphql/ext/ForMission.java | 4 ++-- .../org/mbari/mxm/graphql/ext/ForMissionTemplate.java | 4 ++-- .../java/org/mbari/mxm/graphql/ext/ForParameter.java | 4 ++-- .../java/org/mbari/mxm/graphql/ext/ForProvider.java | 4 ++-- src/main/java/org/mbari/mxm/graphql/ext/ForUnit.java | 4 ++-- .../rest/ProviderClientRestService.java | 4 ++-- src/main/java/org/mbari/mxm/rest/ProviderResource.java | 10 +++++----- 38 files changed, 70 insertions(+), 66 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index bd0953c..a40e374 100644 --- 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 index 045cf33..b572a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.mbari mxm - 0.9.92 + 0.9.93 3.8.1 true @@ -13,7 +13,7 @@ UTF-8 quarkus-bom io.quarkus - 2.16.11.Final + 3.1.1.Final 3.0.0-M7 diff --git a/src/main/java/org/mbari/mxm/ProviderManager.java b/src/main/java/org/mbari/mxm/ProviderManager.java index 240f161..beef493 100644 --- 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 index b7cbbaa..573d597 100644 --- 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 index 95e9482..87529a8 100644 --- 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 index 57d6c21..ca96fd7 100644 --- 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 index 5aa959e..7cceb7c 100644 --- 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 index f7f230f..27b6f2b 100644 --- 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 index 8af6373..39edbf0 100644 --- 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 index 6b18b6b..1ba7196 100644 --- 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 index 20e2dd5..c59bde3 100644 --- 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 index af5ee6c..83a1a2d 100644 --- 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 index fe01f5d..cfb185f 100644 --- 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 index 2a1016a..cb2c9f3 100644 --- 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 index 0ca4b5a..6029c9d 100644 --- 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 index 2a40164..85144c2 100644 --- 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 index 03bd7d1..144ce17 100644 --- 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/src/main/java/org/mbari/mxm/db/missionTemplateAssetClass/MissionTemplateAssetClassService.java b/src/main/java/org/mbari/mxm/db/missionTemplateAssetClass/MissionTemplateAssetClassService.java index 3e2d182..d1a62b2 100644 --- a/src/main/java/org/mbari/mxm/db/missionTemplateAssetClass/MissionTemplateAssetClassService.java +++ b/src/main/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 index b8a04d6..046c3b8 100644 --- 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 index d860cea..b648680 100644 --- 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 index 10b80ba..e7e9eb3 100644 --- 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 index 0cd4a64..cfb7a3a 100644 --- 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 index da34dd9..361ecb8 100644 --- 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 index 1ccac53..57cef3a 100644 --- 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 index 727a0d6..f6c815e 100644 --- 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 index 8e3bef1..ae8c66c 100644 --- 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 index 722272c..450e394 100644 --- 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 index f107e88..a02ce4b 100644 --- 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 index c043b1f..d54828a 100644 --- 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 index ebff5ce..39a64c5 100644 --- 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 index f5c1d01..9324d31 100644 --- 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 index b0b6cf2..a60f312 100644 --- 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 index 081f2ff..298dfe4 100644 --- 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 index 3265654..05cc297 100644 --- 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 index d60a562..6ec5911 100644 --- 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 index eb106d8..a996a37 100644 --- 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 index cee046b..f3b3155 100644 --- 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("/") diff --git a/src/main/java/org/mbari/mxm/rest/ProviderResource.java b/src/main/java/org/mbari/mxm/rest/ProviderResource.java index dfbf8c6..99d92b1 100644 --- a/src/main/java/org/mbari/mxm/rest/ProviderResource.java +++ b/src/main/java/org/mbari/mxm/rest/ProviderResource.java @@ -1,11 +1,11 @@ package org.mbari.mxm.rest; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.CREATED; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; import org.eclipse.microprofile.openapi.annotations.Operation; import org.mbari.mxm.Utl;