diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AssetAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AssetAPI.java index 510460be06d4..33dbc049c589 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AssetAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AssetAPI.java @@ -11,8 +11,8 @@ import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.jboss.resteasy.annotations.providers.multipart.MultipartForm; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import java.io.InputStream; /** diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AuthenticationAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AuthenticationAPI.java index b3e2ed34275b..679c182c6f8b 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AuthenticationAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AuthenticationAPI.java @@ -5,11 +5,11 @@ import com.dotcms.model.ResponseEntityView; import com.dotcms.model.authentication.APITokenRequest; import com.dotcms.model.authentication.TokenEntity; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tags; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/ContentTypeAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/ContentTypeAPI.java index 116d292414cf..188d92b1378a 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/ContentTypeAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/ContentTypeAPI.java @@ -10,16 +10,16 @@ import com.dotcms.model.views.CommonViews.ContentTypeInternalView; import com.fasterxml.jackson.annotation.JsonView; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tags; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/DefaultAuthenticationContextImpl.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/DefaultAuthenticationContextImpl.java index 5be7a1147c54..e9402f77bf4d 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/DefaultAuthenticationContextImpl.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/DefaultAuthenticationContextImpl.java @@ -16,9 +16,9 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/FolderAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/FolderAPI.java index 53b4edb1eade..e90a5df76cbf 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/FolderAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/FolderAPI.java @@ -6,12 +6,12 @@ import com.dotcms.model.folder.SearchByPathRequest; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tags; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/LanguageAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/LanguageAPI.java index f2c3abcb3781..1a571db5b133 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/LanguageAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/LanguageAPI.java @@ -8,15 +8,15 @@ import com.dotcms.model.views.CommonViews.LanguageFileView; import com.fasterxml.jackson.annotation.JsonView; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tags; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/SiteAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/SiteAPI.java index 54e219ff89de..8bddac393220 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/SiteAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/SiteAPI.java @@ -10,16 +10,16 @@ import com.dotcms.model.site.SiteView; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tags; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/UserAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/UserAPI.java index 9daad14a7a8d..e01b9eb8f838 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/UserAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/UserAPI.java @@ -3,11 +3,11 @@ import com.dotcms.api.provider.DefaultResponseExceptionMapper; import com.dotcms.api.provider.DotCMSClientHeaders; import com.dotcms.model.user.User; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tags; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/WorkflowAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/WorkflowAPI.java index c046fe812c79..fb971a199441 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/WorkflowAPI.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/WorkflowAPI.java @@ -5,13 +5,13 @@ import com.dotcms.model.ResponseEntityView; import com.dotcms.model.content.CreateContentRequest; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tags; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/AuthenticationParamContextImpl.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/AuthenticationParamContextImpl.java index 75eaca31d4c4..000165d415bf 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/AuthenticationParamContextImpl.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/AuthenticationParamContextImpl.java @@ -3,7 +3,7 @@ import io.quarkus.arc.DefaultBean; import java.util.Arrays; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * This class is used to pass the token from the CLI to the API client. If the token is present here we use directly diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RemoteURLParamContextImpl.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RemoteURLParamContextImpl.java index 82d83b57af90..50441c0e32c4 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RemoteURLParamContextImpl.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RemoteURLParamContextImpl.java @@ -3,7 +3,7 @@ import io.quarkus.arc.DefaultBean; import java.net.URL; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * This class is used to pass the token from the CLI to the API client. If the token is present here diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RestClientFactory.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RestClientFactory.java index e8addbdbdbef..cefb91f686fe 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RestClientFactory.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RestClientFactory.java @@ -8,8 +8,8 @@ import java.net.URL; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/YAMLFactoryServiceManagerImpl.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/YAMLFactoryServiceManagerImpl.java index acdcc7d82f72..0c8f80ccee59 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/YAMLFactoryServiceManagerImpl.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/YAMLFactoryServiceManagerImpl.java @@ -16,7 +16,7 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; @ApplicationScoped diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/ClientObjectMapper.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/ClientObjectMapper.java index 2e7670e1f201..6843aac30c95 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/ClientObjectMapper.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/ClientObjectMapper.java @@ -50,7 +50,7 @@ import com.github.jonpeterson.jackson.module.versioning.VersioningModule; import java.util.List; import java.util.Map; -import javax.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.ContextResolver; public class ClientObjectMapper implements ContextResolver { diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DefaultResponseExceptionMapper.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DefaultResponseExceptionMapper.java index b924bd46361c..33751e6dfddb 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DefaultResponseExceptionMapper.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DefaultResponseExceptionMapper.java @@ -4,15 +4,16 @@ import com.fasterxml.jackson.databind.JsonNode; import io.quarkus.arc.Priority; import io.quarkus.security.UnauthorizedException; +import jakarta.annotation.Priority; +import jakarta.validation.ValidationException; +import jakarta.ws.rs.core.Response; import java.io.ByteArrayInputStream; -import javax.validation.ValidationException; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; + import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; /** diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DotCMSClientHeaders.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DotCMSClientHeaders.java index 06042eb40d2c..86b0d872433c 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DotCMSClientHeaders.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DotCMSClientHeaders.java @@ -3,9 +3,11 @@ import com.dotcms.api.AuthenticationContext; import java.io.IOException; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MultivaluedMap; +import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; +import org.jboss.logging.Logger; /** diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractLocalPathStructure.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractLocalPathStructure.java index 9fcaf51ce754..ffe5e7aa5dbb 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractLocalPathStructure.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractLocalPathStructure.java @@ -3,7 +3,7 @@ import com.dotcms.model.annotation.ValueType; import java.io.File; import java.nio.file.Path; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; import org.immutables.value.Value.Default; import org.immutables.value.Value.Derived; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractRemotePathStructure.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractRemotePathStructure.java index 42a5fe679757..8475ce47fcdb 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractRemotePathStructure.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractRemotePathStructure.java @@ -2,7 +2,7 @@ import com.dotcms.model.annotation.ValueType; import java.nio.file.Path; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; import org.immutables.value.Value.Derived; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/WorkspaceManagerImpl.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/WorkspaceManagerImpl.java index bf57b4e90801..51d90b58c7e2 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/WorkspaceManagerImpl.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/WorkspaceManagerImpl.java @@ -6,6 +6,7 @@ import com.dotcms.model.config.WorkspaceInfo.Builder; import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.arc.DefaultBean; +import jakarta.enterprise.context.ApplicationScoped; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -13,8 +14,7 @@ import java.util.Comparator; import java.util.Optional; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.logging.Logger; @DefaultBean @ApplicationScoped diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Category.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Category.java index f886b8e5ac00..d455cda1a59b 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Category.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Category.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @Value.Immutable diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/CategoryField.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/CategoryField.java index ce969296b783..b5d0c2ebed04 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/CategoryField.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/CategoryField.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @Value.Immutable diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/ColumnField.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/ColumnField.java index 9a7573a6cbde..0c8c479a1da8 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/ColumnField.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/ColumnField.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @Value.Immutable diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Field.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Field.java index 96a54456b91d..b37da36e3e48 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Field.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Field.java @@ -19,7 +19,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; import org.immutables.value.Value.Default; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java index 6177a8a9e5fc..d5e7fb771744 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Date; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @JsonTypeInfo( diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java index f870182e3662..94289cd97719 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @Value.Immutable diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Relationships.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Relationships.java index 29a2ecf5da95..636b8fe728c8 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Relationships.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Relationships.java @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @Value.Immutable @JsonInclude(Include.USE_DEFAULTS) -@Value.Style(passAnnotations = {JsonInclude.class}) +@Value.Style(passAnnotations = {JsonInclude.class}, jakarta = true) @JsonSerialize(as = ImmutableRelationships.class) @JsonDeserialize(as = ImmutableRelationships.class) public interface Relationships { diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RowField.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RowField.java index 0dc955ba46b8..71e41d666cc0 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RowField.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RowField.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @Value.Immutable diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/type/ContentType.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/type/ContentType.java index f88e95e03de8..308874fe8563 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/type/ContentType.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/type/ContentType.java @@ -29,7 +29,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; import org.immutables.value.Value.Default; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/ActionMapping.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/ActionMapping.java index 7ce0630e8a4b..3fc21c6bc60d 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/ActionMapping.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/ActionMapping.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; /** diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/Workflow.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/Workflow.java index 77d579a3166c..6b6b00c6cf3d 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/Workflow.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/Workflow.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Date; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; /** diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/WorkflowAction.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/WorkflowAction.java index fad59f8f55d7..8bbd0b6df1ec 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/WorkflowAction.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/workflow/WorkflowAction.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; /** diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/RestClient.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/RestClient.java index 8f206abe933d..d61e878201c0 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/RestClient.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/RestClient.java @@ -4,9 +4,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; //import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/SecuredPassword.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/SecuredPassword.java index c8a7391a7d5d..87a9a8cfa092 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/SecuredPassword.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/SecuredPassword.java @@ -1,6 +1,6 @@ package com.dotcms.model.annotation; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/ValueType.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/ValueType.java index 4ec57afdcc3a..9a0edf4b7e9b 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/ValueType.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/annotation/ValueType.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.github.jonpeterson.jackson.module.versioning.JsonVersionedModel; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; import org.immutables.value.Value; import org.immutables.value.Value.Style.ImplementationVisibility; @@ -19,6 +19,7 @@ typeImmutable = "*", // Make generated public, leave underscored as package private visibility = ImplementationVisibility.PUBLIC, + jakarta = true, passAnnotations = {JsonVersionedModel.class, QueryParam.class, HeaderParam.class, JsonInclude.class} ) @JsonSerialize() diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/AbstractFolderView.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/AbstractFolderView.java index ab21a90d9dba..9e400c8e9317 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/AbstractFolderView.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/AbstractFolderView.java @@ -7,7 +7,7 @@ import java.time.Instant; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; import org.immutables.value.Value.Auxiliary; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/FileUploadData.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/FileUploadData.java index bd1c44c9cd33..0498f074b4e1 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/FileUploadData.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/asset/FileUploadData.java @@ -2,8 +2,8 @@ import org.jboss.resteasy.annotations.providers.multipart.PartType; -import javax.ws.rs.FormParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.core.MediaType; import java.io.InputStream; public class FileUploadData { diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/authentication/AbstractAPITokenRequest.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/authentication/AbstractAPITokenRequest.java index 820a751ea994..c78f719b1660 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/authentication/AbstractAPITokenRequest.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/authentication/AbstractAPITokenRequest.java @@ -2,7 +2,7 @@ import com.dotcms.model.annotation.ValueType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractCredentialsBean.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractCredentialsBean.java index c238a92ee24c..2c7d81faacc1 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractCredentialsBean.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractCredentialsBean.java @@ -5,7 +5,7 @@ import java.beans.Transient; import java.util.Optional; import java.util.function.Supplier; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractServiceBean.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractServiceBean.java index 3891776ffef9..efdeb6485f7c 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractServiceBean.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractServiceBean.java @@ -3,8 +3,8 @@ import com.dotcms.model.annotation.ValueType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.net.URL; -import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractWorkspace.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractWorkspace.java index 4e4d657b8aa2..1fe95e92de09 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractWorkspace.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/config/AbstractWorkspace.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.nio.file.Path; import java.nio.file.Paths; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractFilterContentTypesRequest.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractFilterContentTypesRequest.java index 81bc8e229e0c..37885e369b13 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractFilterContentTypesRequest.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractFilterContentTypesRequest.java @@ -4,7 +4,7 @@ import com.dotcms.model.annotation.ValueType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractSaveContentTypeRequest.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractSaveContentTypeRequest.java index dcfba8c365f9..5979b805c0dd 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractSaveContentTypeRequest.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractSaveContentTypeRequest.java @@ -6,7 +6,6 @@ import com.dotcms.contenttype.model.workflow.SystemAction; import com.dotcms.contenttype.model.workflow.Workflow; import com.dotcms.model.annotation.ValueType; -import com.dotcms.model.views.CommonViews.ContentTypeExternalView; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; @@ -21,6 +20,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.type.TypeFactory; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import org.immutables.value.Value; diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCopySiteRequest.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCopySiteRequest.java index 5928ca8156c6..066332cceb79 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCopySiteRequest.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCopySiteRequest.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.immutables.value.Value; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; @ValueType @Value.Immutable diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCreateUpdateSiteRequest.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCreateUpdateSiteRequest.java index ad2d6e51884b..df2dc85d1ddf 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCreateUpdateSiteRequest.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractCreateUpdateSiteRequest.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractGetSitesRequest.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractGetSitesRequest.java index ae8cab0f62bd..ba0cdf946039 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractGetSitesRequest.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractGetSitesRequest.java @@ -3,8 +3,8 @@ import com.dotcms.model.annotation.ValueType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import javax.annotation.Nullable; -import javax.ws.rs.QueryParam; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.QueryParam; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSite.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSite.java index 7263a76c94fc..3381accf56cc 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSite.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSite.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.Serializable; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSiteView.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSiteView.java index cd50f56704ec..aad3a9a15ca8 100644 --- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSiteView.java +++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/site/AbstractSiteView.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.Date; import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; @ValueType diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AssetAPIT.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AssetAPIT.java index 644649a9ca67..1dcfc0c23bac 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AssetAPIT.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AssetAPIT.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationAPIT.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationAPIT.java index b082ff25ed8b..f70aa720e7fe 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationAPIT.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationAPIT.java @@ -9,7 +9,7 @@ import java.io.IOException; import java.net.URL; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationContextIT.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationContextIT.java index a3a7454e47b2..9dfbd2259688 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationContextIT.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/AuthenticationContextIT.java @@ -7,7 +7,7 @@ import io.quarkus.test.junit.TestProfile; import java.io.IOException; import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/ContentTypeAPIIT.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/ContentTypeAPIIT.java index 5da6b3d9f3df..da6e8bdbfa3e 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/ContentTypeAPIIT.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/ContentTypeAPIIT.java @@ -39,8 +39,8 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -257,7 +257,7 @@ void Test_Create_Then_Update_Then_Delete_Content_Type() { } } //This should throw 404 but under certain circumstances it does throw 400 - }catch(javax.ws.rs.WebApplicationException e){ + }catch(jakarta.ws.rs.WebApplicationException e){ // Not relevant here } } diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/FolderAPIT.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/FolderAPIT.java index d2787efdc7ad..b9c1dcfe41af 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/FolderAPIT.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/FolderAPIT.java @@ -13,7 +13,7 @@ import java.net.URL; import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/SiteAPIIT.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/SiteAPIIT.java index cd490b761f66..ce00e9a363c2 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/SiteAPIIT.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/SiteAPIIT.java @@ -16,8 +16,8 @@ import java.io.IOException; import java.net.URL; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/RestClientFactoryIT.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/RestClientFactoryIT.java index 8da324c21ce9..a5a5b8742507 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/RestClientFactoryIT.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/RestClientFactoryIT.java @@ -14,7 +14,7 @@ import io.vertx.ext.auth.impl.jose.JWT; import java.io.IOException; import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/ServiceManagerTest.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/ServiceManagerTest.java index 2289f2450216..6c098c8546f8 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/ServiceManagerTest.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/client/model/ServiceManagerTest.java @@ -7,7 +7,7 @@ import java.net.URL; import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/SiteTestHelperService.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/SiteTestHelperService.java index 4048a2982b9b..24ce3487338d 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/SiteTestHelperService.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/SiteTestHelperService.java @@ -8,10 +8,10 @@ import com.dotcms.model.site.GetSiteByNameRequest; import com.dotcms.model.site.SiteView; import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.testcontainers.shaded.org.awaitility.core.ConditionTimeoutException; @ApplicationScoped diff --git a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/WorkspaceManagerTest.java b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/WorkspaceManagerTest.java index 044709983566..ddffa6afbceb 100644 --- a/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/WorkspaceManagerTest.java +++ b/tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/common/WorkspaceManagerTest.java @@ -6,7 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/FileHashCalculatorServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/FileHashCalculatorServiceImpl.java index a85cb14784db..98fce9ccbe1f 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/FileHashCalculatorServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/FileHashCalculatorServiceImpl.java @@ -9,8 +9,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.security.NoSuchAlgorithmException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.logging.Logger; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/HybridServiceManagerImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/HybridServiceManagerImpl.java index 136e2797ecc9..fd97c9d4134f 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/HybridServiceManagerImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/HybridServiceManagerImpl.java @@ -8,8 +8,8 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.quarkus.arc.Unremovable; import org.jboss.logging.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/KeyTarPasswordStoreImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/KeyTarPasswordStoreImpl.java index 4fef6ee32582..5f94cac609d7 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/KeyTarPasswordStoreImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/KeyTarPasswordStoreImpl.java @@ -3,7 +3,7 @@ import com.starxg.keytar.Keytar; import com.starxg.keytar.KeytarException; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * KeyTarPasswordStoreImpl implements the SecurePasswordStore interface to securely store passwords using the system keychain. diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/MapperServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/MapperServiceImpl.java index 652b0d28e0b9..446fbbdc5925 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/MapperServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/MapperServiceImpl.java @@ -8,9 +8,9 @@ import io.quarkus.arc.DefaultBean; import java.io.File; import java.io.IOException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.jboss.logging.Logger; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/PushServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/PushServiceImpl.java index 124b4bdca6e1..8ba76d7f99b8 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/PushServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/PushServiceImpl.java @@ -27,9 +27,9 @@ import java.util.concurrent.ExecutionException; import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; import picocli.CommandLine.ExitCode; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractLocalTraverseParams.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractLocalTraverseParams.java index c38f22bb1211..e5e6e4c9a2fb 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractLocalTraverseParams.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractLocalTraverseParams.java @@ -8,7 +8,7 @@ import org.immutables.value.Value.Default; import org.jboss.logging.Logger; import org.immutables.value.Value; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Just a class to compile all the params shared by various Traverse APIs diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractPushTraverseParams.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractPushTraverseParams.java index 800a5d613524..d7480baece49 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractPushTraverseParams.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/AbstractPushTraverseParams.java @@ -6,7 +6,7 @@ import com.dotcms.common.LocalPathStructure; import com.dotcms.model.annotation.ValueType; import java.io.Serializable; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; import org.immutables.value.Value.Default; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/LocalTraversalServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/LocalTraversalServiceImpl.java index 863a84b3b24a..c487f289c654 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/LocalTraversalServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/LocalTraversalServiceImpl.java @@ -19,10 +19,10 @@ import java.nio.file.Paths; import java.util.List; import java.util.concurrent.CompletionException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceImpl.java index 2a6364b4bbed..aa6d1cecf57c 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceImpl.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletionException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Downloader.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Downloader.java index 60721b81b731..2b92383faa3a 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Downloader.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Downloader.java @@ -8,9 +8,9 @@ import com.dotcms.api.client.model.RestClientFactory; import com.dotcms.model.asset.AssetRequest; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import java.io.InputStream; @ApplicationScoped diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Pusher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Pusher.java index d48d6a8c5d5b..4b6a347c8f12 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Pusher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Pusher.java @@ -24,9 +24,9 @@ import java.nio.file.Files; import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.jboss.logging.Logger; @ApplicationScoped diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Retriever.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Retriever.java index 8e806bed9162..59529ab8c2c2 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Retriever.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/data/Retriever.java @@ -13,9 +13,9 @@ import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; /** * Utility class for retrieving folder and asset information from the remote server using REST calls. diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/AbstractPushTreeNodeTaskParams.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/AbstractPushTreeNodeTaskParams.java index 6448350c0c45..0e414476f264 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/AbstractPushTreeNodeTaskParams.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/AbstractPushTreeNodeTaskParams.java @@ -5,7 +5,7 @@ import com.dotcms.common.LocalPathStructure; import com.dotcms.model.annotation.ValueType; import java.io.Serializable; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.immutables.value.Value; import org.immutables.value.Value.Default; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/LocalFolderTraversalTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/LocalFolderTraversalTask.java index 70bbeb1cc3d7..b1d8e08066c5 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/LocalFolderTraversalTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/LocalFolderTraversalTask.java @@ -29,8 +29,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import javax.enterprise.context.Dependent; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PullTreeNodeTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PullTreeNodeTask.java index f7e3fdbaa03f..4460d487c2a9 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PullTreeNodeTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PullTreeNodeTask.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PushTreeNodeTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PushTreeNodeTask.java index 79e3472b6571..5c2da4040e6d 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PushTreeNodeTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/PushTreeNodeTask.java @@ -21,9 +21,9 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import javax.enterprise.context.Dependent; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/RemoteFolderTraversalTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/RemoteFolderTraversalTask.java index e36bf6c1ddf2..4fd19bcd2a03 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/RemoteFolderTraversalTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/files/traversal/task/RemoteFolderTraversalTask.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/ContentFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/ContentFetcher.java index 8fe6c319c35c..c407539decb2 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/ContentFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/ContentFetcher.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; /** * The ContentFetcher interface provides a contract for classes that can fetch content of type T. diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/GeneralPullHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/GeneralPullHandler.java index 5c90fe3b14c0..a88ce7c67462 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/GeneralPullHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/GeneralPullHandler.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/PullServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/PullServiceImpl.java index 1845458166e5..30a50f2cec7c 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/PullServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/PullServiceImpl.java @@ -11,9 +11,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; import picocli.CommandLine.ExitCode; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypeFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypeFetcher.java index de17660dc0c3..8c3161847336 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypeFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypeFetcher.java @@ -8,10 +8,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.context.ManagedExecutor; @Dependent diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypePullHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypePullHandler.java index 57c88da737fc..793976d74169 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypePullHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/ContentTypePullHandler.java @@ -6,7 +6,7 @@ import com.dotcms.model.pull.PullOptions; import java.text.SimpleDateFormat; import java.util.List; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.apache.commons.lang3.StringUtils; @Dependent diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/HttpRequestTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/HttpRequestTask.java index 6e873d37340b..6eff4c310b5b 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/HttpRequestTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/contenttype/HttpRequestTask.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.context.ManagedExecutor; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FileFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FileFetcher.java index 89a0f915a9a5..e66bf1711887 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FileFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FileFetcher.java @@ -24,10 +24,10 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.jboss.logging.Logger; @Dependent diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FilePullHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FilePullHandler.java index a76e4182a02d..71b58d7ff523 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FilePullHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/FilePullHandler.java @@ -22,9 +22,9 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/Puller.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/Puller.java index 84421179771c..9b95dcd5a247 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/Puller.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/file/Puller.java @@ -14,9 +14,9 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; @ApplicationScoped public class Puller implements Serializable { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguageFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguageFetcher.java index 5a9585e77e91..0b3a1e65c6c5 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguageFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguageFetcher.java @@ -7,10 +7,10 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.apache.commons.lang3.StringUtils; @Dependent diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguagePullHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguagePullHandler.java index 6f8a0a5734fc..c2b92b0e64ec 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguagePullHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguagePullHandler.java @@ -5,7 +5,7 @@ import com.dotcms.model.language.Language; import com.dotcms.model.pull.PullOptions; import java.util.List; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class LanguagePullHandler extends GeneralPullHandler { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/HttpRequestTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/HttpRequestTask.java index 39d3ea0e4c9f..d9ab7a27108c 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/HttpRequestTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/HttpRequestTask.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.context.ManagedExecutor; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SiteFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SiteFetcher.java index 82dde49c5f46..05f4ff6c0515 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SiteFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SiteFetcher.java @@ -12,10 +12,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.context.ManagedExecutor; @Dependent diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SitePullHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SitePullHandler.java index 533fc79a6ff3..dc963cd0068a 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SitePullHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/site/SitePullHandler.java @@ -5,7 +5,7 @@ import com.dotcms.model.pull.PullOptions; import com.dotcms.model.site.SiteView; import java.util.List; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.apache.commons.lang3.BooleanUtils; @Dependent diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/task/PullTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/task/PullTask.java index 6ef9743b08dd..e2b29a38e5b2 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/task/PullTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/task/PullTask.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/FormatStatus.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/FormatStatus.java index 5eadec10dc01..0aaad03d2b48 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/FormatStatus.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/FormatStatus.java @@ -7,8 +7,8 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jboss.logging.Logger; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushAnalysisServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushAnalysisServiceImpl.java index 54cdc7b2e847..f7dd2dcb5fc9 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushAnalysisServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushAnalysisServiceImpl.java @@ -11,9 +11,9 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.jboss.logging.Logger; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushServiceImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushServiceImpl.java index 5a1e1d6b6e00..20431c937c6f 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushServiceImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/PushServiceImpl.java @@ -24,9 +24,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypeFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypeFetcher.java index c0007d2577fb..b6a76254cbe4 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypeFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypeFetcher.java @@ -7,9 +7,9 @@ import com.dotcms.model.ResponseEntityView; import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; @Dependent public class ContentTypeFetcher implements ContentFetcher { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypePushHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypePushHandler.java index d3c3707265d5..cd025048ee6a 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypePushHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypePushHandler.java @@ -12,9 +12,9 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; @Dependent diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageComparator.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageComparator.java index 5da3cc2a07b2..bad9f464498d 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageComparator.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageComparator.java @@ -5,9 +5,9 @@ import java.io.File; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.annotation.Nullable; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; @Dependent public class LanguageComparator implements ContentComparator { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageFetcher.java index 7ff7c1fc95a7..f71bfe0b328c 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageFetcher.java @@ -5,9 +5,9 @@ import com.dotcms.api.client.push.ContentFetcher; import com.dotcms.model.language.Language; import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; @Dependent public class LanguageFetcher implements ContentFetcher { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguagePushHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguagePushHandler.java index 9eb900fd346d..d00e27ebe5be 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguagePushHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguagePushHandler.java @@ -8,9 +8,9 @@ import java.io.File; import java.util.Map; import java.util.Optional; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; @Dependent public class LanguagePushHandler implements PushHandler { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteComparator.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteComparator.java index 113b26546c3f..63700ae984da 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteComparator.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteComparator.java @@ -9,9 +9,9 @@ import java.util.Comparator; import java.util.List; import java.util.Optional; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; @Dependent public class SiteComparator implements ContentComparator { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteFetcher.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteFetcher.java index 76aba9a084e8..467ffdb6c002 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteFetcher.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SiteFetcher.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; @Dependent public class SiteFetcher implements ContentFetcher { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java index 089566a11598..bd750954f463 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java @@ -18,9 +18,9 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.apache.commons.lang3.BooleanUtils; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/task/PushTask.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/task/PushTask.java index 0e544aff8726..071795e323b1 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/task/PushTask.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/task/PushTask.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.context.ManagedExecutor; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/util/ErrorHandlingUtilImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/util/ErrorHandlingUtilImpl.java index 853c70c9b37f..402e33a2641d 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/util/ErrorHandlingUtilImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/util/ErrorHandlingUtilImpl.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import picocli.CommandLine.ExitCode; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/ConfigCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/ConfigCommand.java index 072972214f51..c479e200739a 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/ConfigCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/ConfigCommand.java @@ -20,8 +20,8 @@ import java.util.concurrent.Callable; import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; import picocli.CommandLine; import picocli.CommandLine.ExitCode; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/EntryCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/EntryCommand.java index 92d16462e0a0..b5e875a9657a 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/EntryCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/EntryCommand.java @@ -13,9 +13,11 @@ import com.dotcms.model.annotation.SecuredPassword; import io.quarkus.picocli.runtime.PicocliCommandLineFactory; import io.quarkus.picocli.runtime.annotations.TopCommand; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; import picocli.CommandLine; @TopCommand diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/InstanceCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/InstanceCommand.java index 40bcd69fdece..0812d7c50939 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/InstanceCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/InstanceCommand.java @@ -14,8 +14,8 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; import picocli.CommandLine.ExitCode; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/LoginCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/LoginCommand.java index cc10f428a435..58d8366c2ec6 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/LoginCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/LoginCommand.java @@ -7,8 +7,8 @@ import com.dotcms.cli.common.Prompt; import java.io.IOException; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; import picocli.CommandLine.ExitCode; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PullCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PullCommand.java index ee6e7b5d146c..a84c88df8e5d 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PullCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PullCommand.java @@ -8,9 +8,9 @@ import java.util.Comparator; import java.util.concurrent.Callable; import java.util.stream.Collectors; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import picocli.CommandLine; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushCommand.java index e1d5adedf111..ad9312a3cd7e 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushCommand.java @@ -11,9 +11,9 @@ import java.util.Comparator; import java.util.concurrent.Callable; import java.util.stream.Collectors; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import picocli.CommandLine; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushContextImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushContextImpl.java index 70278b260700..2a4321052587 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushContextImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/PushContextImpl.java @@ -6,9 +6,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Lock; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/StatusCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/StatusCommand.java index 65d3be99eb36..a94bfc16f519 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/StatusCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/StatusCommand.java @@ -14,8 +14,8 @@ import java.net.URL; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; import picocli.CommandLine.ExitCode; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/AbstractContentTypeCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/AbstractContentTypeCommand.java index b7f9e00ce0f5..18f153268840 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/AbstractContentTypeCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/AbstractContentTypeCommand.java @@ -7,10 +7,10 @@ import com.dotcms.cli.common.OutputOptionMixin; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.model.ResponseEntityView; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.text.SimpleDateFormat; import java.util.Optional; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeFind.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeFind.java index 6d968c1a58b3..8e7c4aa549ac 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeFind.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeFind.java @@ -9,8 +9,8 @@ import com.dotcms.model.ResponseEntityView; import java.util.List; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePull.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePull.java index fabf8208d33b..8665b0beaa92 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePull.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePull.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePush.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePush.java index 2a21eaa9ff1f..cb288c169362 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePush.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypePush.java @@ -17,8 +17,8 @@ import java.nio.file.Path; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeRemove.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeRemove.java index 7f546086f8a1..8c469ac222b7 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeRemove.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/contenttype/ContentTypeRemove.java @@ -7,8 +7,8 @@ import com.dotcms.cli.common.Prompt; import com.dotcms.model.ResponseEntityView; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; import picocli.CommandLine.ExitCode; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesCommand.java index 7050985b0575..f95fa02c08b7 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesCommand.java @@ -7,7 +7,7 @@ import com.dotcms.common.WorkspaceManager; import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.logging.Logger; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesListingCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesListingCommand.java index 952fa7397093..f761cd61c5df 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesListingCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/AbstractFilesListingCommand.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesLs.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesLs.java index af86107dd6a8..fecef49dfbdd 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesLs.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesLs.java @@ -3,7 +3,7 @@ import com.dotcms.cli.command.DotCommand; import com.dotcms.cli.common.OutputOptionMixin; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPull.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPull.java index 4773f252e267..95e9d0f7efca 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPull.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPull.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPush.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPush.java index d668a29d5800..cb0366779b47 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPush.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesPush.java @@ -26,8 +26,8 @@ import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.microprofile.context.ManagedExecutor; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesTree.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesTree.java index 589b4118aa1f..e5f8f70c01f4 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesTree.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/files/FilesTree.java @@ -3,7 +3,7 @@ import com.dotcms.cli.command.DotCommand; import com.dotcms.cli.common.OutputOptionMixin; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; /** diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/AbstractLanguageCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/AbstractLanguageCommand.java index 83965802b489..78932fcc4c11 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/AbstractLanguageCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/AbstractLanguageCommand.java @@ -7,8 +7,8 @@ import com.dotcms.cli.common.OutputOptionMixin; import com.dotcms.model.language.Language; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.apache.commons.lang3.StringUtils; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageFind.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageFind.java index 2da98e8fd379..8c29b1bc8967 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageFind.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageFind.java @@ -7,8 +7,8 @@ import com.dotcms.model.language.Language; import java.util.List; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePull.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePull.java index f36a2492d76b..0caa5a3b70fc 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePull.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePull.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePush.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePush.java index d7c1bb0963d1..503dc6c3f6e6 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePush.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguagePush.java @@ -22,8 +22,8 @@ import java.nio.file.Path; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageRemove.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageRemove.java index 8e2593c9a47f..e8c54f170b67 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageRemove.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/language/LanguageRemove.java @@ -7,8 +7,8 @@ import com.dotcms.cli.common.Prompt; import com.dotcms.model.language.Language; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; import picocli.CommandLine.Parameters; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/AbstractSiteCommand.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/AbstractSiteCommand.java index ed74f6364c94..181acff75739 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/AbstractSiteCommand.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/AbstractSiteCommand.java @@ -12,8 +12,8 @@ import org.apache.commons.lang3.BooleanUtils; import picocli.CommandLine; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; public abstract class AbstractSiteCommand { diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteArchive.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteArchive.java index 721706af364c..110b02aeff28 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteArchive.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteArchive.java @@ -6,7 +6,7 @@ import com.dotcms.model.ResponseEntityView; import com.dotcms.model.site.SiteView; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCopy.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCopy.java index fa1e11110d07..8bf6db689b41 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCopy.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCopy.java @@ -8,7 +8,7 @@ import com.dotcms.model.site.CreateUpdateSiteRequest; import com.dotcms.model.site.SiteView; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCreate.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCreate.java index 60ee94918037..e2adf92464bb 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCreate.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteCreate.java @@ -7,7 +7,7 @@ import com.dotcms.model.site.CreateUpdateSiteRequest; import com.dotcms.model.site.SiteView; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteFind.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteFind.java index 592ee7aa05b4..346eabfebe14 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteFind.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteFind.java @@ -9,8 +9,8 @@ import com.dotcms.model.site.Site; import java.util.List; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePull.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePull.java index a9d077710aa8..8a62cb7fff51 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePull.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePull.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePush.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePush.java index 1886b6367b23..6bf5f1dbfd5c 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePush.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SitePush.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteRemove.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteRemove.java index c38a155072bf..15b4b3b853b5 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteRemove.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteRemove.java @@ -8,8 +8,8 @@ import com.dotcms.model.ResponseEntityView; import com.dotcms.model.site.SiteView; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStart.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStart.java index b04bcb402f22..cd8c2b5d77e1 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStart.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStart.java @@ -7,7 +7,7 @@ import com.dotcms.model.site.SiteView; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStop.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStop.java index 5c31f166ef1a..68854eebc680 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStop.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteStop.java @@ -7,7 +7,7 @@ import com.dotcms.model.site.SiteView; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteUnarchive.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteUnarchive.java index ab20867fa41f..33a1b81cacbb 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteUnarchive.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/command/site/SiteUnarchive.java @@ -7,7 +7,7 @@ import com.dotcms.model.site.SiteView; import java.util.Optional; import java.util.concurrent.Callable; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.control.ActivateRequestContext; import picocli.CommandLine; @ActivateRequestContext diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/OutputOptionMixin.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/OutputOptionMixin.java index f206601151aa..7d9f476a0ffd 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/OutputOptionMixin.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/OutputOptionMixin.java @@ -16,8 +16,8 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.specimpl.BuiltResponse; import picocli.CommandLine; import picocli.CommandLine.Help.ColorScheme; diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/PromptImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/PromptImpl.java index 01d54f64149f..202941a4ab29 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/PromptImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/common/PromptImpl.java @@ -3,7 +3,7 @@ import io.quarkus.arc.DefaultBean; import java.io.Console; import java.util.Optional; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import picocli.CommandLine.Help; @DefaultBean diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/exception/ExceptionHandlerImpl.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/exception/ExceptionHandlerImpl.java index 6e32614de3c2..e2ca5939bbab 100644 --- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/exception/ExceptionHandlerImpl.java +++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/cli/exception/ExceptionHandlerImpl.java @@ -5,10 +5,10 @@ import io.quarkus.security.ForbiddenException; import io.quarkus.security.UnauthorizedException; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/FileHashCalculatorServiceTest.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/FileHashCalculatorServiceTest.java index ce3ac7158ca1..985fbeb4e205 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/FileHashCalculatorServiceTest.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/FileHashCalculatorServiceTest.java @@ -5,7 +5,7 @@ import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/HybridServiceManagerTest.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/HybridServiceManagerTest.java index ccc037bef9a3..be5c85efa4c2 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/HybridServiceManagerTest.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/HybridServiceManagerTest.java @@ -9,7 +9,7 @@ import java.net.URL; import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/MockUnsupportedSecurePasswordStoreImpl.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/MockUnsupportedSecurePasswordStoreImpl.java index ea19d810deb6..f38079bf8124 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/MockUnsupportedSecurePasswordStoreImpl.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/MockUnsupportedSecurePasswordStoreImpl.java @@ -1,8 +1,8 @@ package com.dotcms.api.client; -import io.quarkus.arc.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; /** * When running on a non-OSX system, the KeyChain is not always available, so we need to verify if our code can still survive such scenario diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PullServiceIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PullServiceIT.java index e5cb8d7c857a..79fb22b38d44 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PullServiceIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PullServiceIT.java @@ -45,7 +45,7 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PushServiceIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PushServiceIT.java index b53443ec49d3..29325fb3995b 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PushServiceIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/PushServiceIT.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceIT.java index 7471044a0724..2ba8126a52bb 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/api/client/files/traversal/RemoteTraversalServiceIT.java @@ -11,8 +11,8 @@ import java.net.URL; import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/CommandTest.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/CommandTest.java index 4f6089c65146..e2d2ebfd2d9d 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/CommandTest.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/CommandTest.java @@ -17,10 +17,9 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import org.eclipse.microprofile.config.inject.ConfigProperty; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import picocli.CommandLine; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/LoginCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/LoginCommandIT.java index dcc4643f40f8..1c5b42b7f715 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/LoginCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/LoginCommandIT.java @@ -19,7 +19,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PullCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PullCommandIT.java index c2cfa2f5f5a8..6b5365d50f17 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PullCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PullCommandIT.java @@ -21,8 +21,8 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushCommandIT.java index ff36c0ef1417..d24766c47d10 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushCommandIT.java @@ -18,17 +18,16 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; +import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import org.jboss.logging.Logger; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushContextImplIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushContextImplIT.java index 06ca8d381368..0c45a75e04bc 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushContextImplIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/PushContextImplIT.java @@ -5,7 +5,7 @@ import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/RemoteURLIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/RemoteURLIT.java index ab886c9d469d..b41a3840ac31 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/RemoteURLIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/RemoteURLIT.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/StatusCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/StatusCommandIT.java index a3ff25e7b930..d4636b7144f0 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/StatusCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/StatusCommandIT.java @@ -11,7 +11,7 @@ import picocli.CommandLine; import picocli.CommandLine.ExitCode; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/contenttype/ContentTypeCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/contenttype/ContentTypeCommandIT.java index d240161b8131..32d274271880 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/contenttype/ContentTypeCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/contenttype/ContentTypeCommandIT.java @@ -43,8 +43,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesLsCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesLsCommandIT.java index c657a5357c38..995f0b592ece 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesLsCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesLsCommandIT.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPullCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPullCommandIT.java index 4a94370bef58..3f601594f01a 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPullCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPullCommandIT.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPushCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPushCommandIT.java index 28a9b7322368..a4f6f8c973ea 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPushCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesPushCommandIT.java @@ -15,7 +15,7 @@ import java.io.StringWriter; import java.nio.file.Path; import java.util.Collections; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesTreeCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesTreeCommandIT.java index d3714410ff5e..ba298d69b224 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesTreeCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/files/FilesTreeCommandIT.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/language/LanguageCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/language/LanguageCommandIT.java index 002c29fba6b7..eb5185e7b8f6 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/language/LanguageCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/language/LanguageCommandIT.java @@ -23,7 +23,7 @@ import java.nio.file.Path; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/site/SiteCommandIT.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/site/SiteCommandIT.java index 996167b90728..eeef59c1c25e 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/site/SiteCommandIT.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/command/site/SiteCommandIT.java @@ -30,8 +30,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentTypesTestHelperService.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentTypesTestHelperService.java index 49f77cfc1b7a..c795d6d66c2c 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentTypesTestHelperService.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentTypesTestHelperService.java @@ -26,10 +26,10 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.testcontainers.shaded.org.awaitility.core.ConditionTimeoutException; @ApplicationScoped diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentsTestHelperService.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentsTestHelperService.java index b8ca491dc676..adafde99c030 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentsTestHelperService.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ContentsTestHelperService.java @@ -5,8 +5,8 @@ import com.dotcms.model.content.Contentlet; import com.dotcms.model.content.CreateContentRequest; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ContentsTestHelperService { diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ExceptionHandlerTest.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ExceptionHandlerTest.java index bd656466a74c..ccfaa4407678 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ExceptionHandlerTest.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/ExceptionHandlerTest.java @@ -5,15 +5,16 @@ import com.dotcms.cli.exception.ExceptionMappingConfig; import io.quarkus.test.junit.QuarkusTest; import java.util.concurrent.CompletionException; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.NotAllowedException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.NotAllowedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; import org.jboss.resteasy.specimpl.BuiltResponse; import org.junit.Ignore; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/FilesTestHelperService.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/FilesTestHelperService.java index 45f547c5f1ca..ca56502b3e2f 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/FilesTestHelperService.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/FilesTestHelperService.java @@ -24,10 +24,10 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.junit.jupiter.api.Assertions; import org.testcontainers.shaded.org.awaitility.core.ConditionTimeoutException; diff --git a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/SitesTestHelperService.java b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/SitesTestHelperService.java index 0bc0ecf692fa..380a3bcf2790 100644 --- a/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/SitesTestHelperService.java +++ b/tools/dotcms-cli/cli/src/test/java/com/dotcms/cli/common/SitesTestHelperService.java @@ -14,10 +14,10 @@ import java.nio.file.Path; import java.time.Duration; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.junit.jupiter.api.Assertions; import org.testcontainers.shaded.org.awaitility.core.ConditionTimeoutException; diff --git a/tools/dotcms-cli/pom.xml b/tools/dotcms-cli/pom.xml index f8325e82866c..937bb7b5e916 100644 --- a/tools/dotcms-cli/pom.xml +++ b/tools/dotcms-cli/pom.xml @@ -21,8 +21,8 @@ quarkus-bom io.quarkus.platform - 2.16.12.Final - 1.12.0 + 3.5.0 + 1.8.0 3.0.2