diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java index 5d537ef795..84a783801d 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java @@ -22,16 +22,16 @@ import java.io.Closeable; import java.net.URI; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -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.HEAD; +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.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java b/apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java index 0072ef0db8..3f4909b522 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.net.URI; import java.security.InvalidKeyException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java b/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java index 8d4a563e42..28d8f62009 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java @@ -25,7 +25,7 @@ import static org.jclouds.util.Strings2.toInputStream; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java index dde33aade6..9726f78537 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.atmos.handlers; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java index 3b8c6a3186..f972a07bed 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.atmos.handlers; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java index 2c67a6ace3..48af3db534 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java index e45faa7582..6cea72d118 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.ContextBuilder; import org.jclouds.atmos.config.AtmosHttpApiModule; diff --git a/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java index 63adcb398d..4f7c1be70e 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java +++ b/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java b/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java index 28b2314cbf..1aa6784824 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java +++ b/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java @@ -19,7 +19,7 @@ package org.jclouds.byon.suppliers; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java b/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java index a1a4296629..10253473ef 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java +++ b/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.location.Provider; import org.jclouds.logging.Logger; diff --git a/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java b/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java index 836e1e93f1..0ba98dba2e 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java +++ b/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java @@ -23,15 +23,15 @@ import java.util.List; import java.util.Set; import javax.inject.Named; -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.jclouds.Constants; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java b/apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java index 9a744a33e5..2490d3cc6e 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java +++ b/apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Set; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.rest.binders.BindToStringPayload; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java b/apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java index 4bd5821f3e..7cbea20cc0 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java +++ b/apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java @@ -17,7 +17,7 @@ package org.jclouds.chef.binders; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.rest.binders.BindToStringPayload; diff --git a/apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java b/apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java index 3624ddd1ed..84b4eaa98a 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java +++ b/apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java @@ -19,14 +19,14 @@ package org.jclouds.chef.features; import java.util.Set; import javax.inject.Named; -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.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.core.MediaType; import org.jclouds.Constants; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java b/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java index ab2cf3c43d..edc4260735 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java +++ b/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.security.PrivateKey; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java b/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java index 3b4da4a353..33c2555a5b 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java +++ b/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java @@ -18,7 +18,7 @@ package org.jclouds.chef.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java b/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java index 85f9129b1f..e88b02f9bd 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java +++ b/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.chef.handlers; import static org.jclouds.util.Closeables2.closeQuietly; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java b/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java index f80456eccf..5ca2030916 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java +++ b/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java @@ -24,7 +24,7 @@ import java.io.InputStream; import java.security.PrivateKey; import java.util.concurrent.ExecutorService; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java index 46c765b0b0..500fcacaad 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java @@ -26,7 +26,7 @@ import static org.jclouds.chef.util.ChefUtils.fromOhaiTime; import java.util.Calendar; import java.util.Date; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java index 7dabd06db0..35ea5b1441 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java index ffdd3ecd91..237b9e573b 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java @@ -24,7 +24,7 @@ import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java index 212d8b715a..74e7bf09a1 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java @@ -24,7 +24,7 @@ import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java index 105be2ff74..9fbc9e85f2 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java @@ -24,7 +24,7 @@ import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java index d1090389fa..34534703b7 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java @@ -25,7 +25,7 @@ import org.jclouds.chef.domain.CookbookVersion; import org.jclouds.chef.strategy.ListCookbookVersions; import org.jclouds.logging.Logger; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; import java.util.concurrent.ExecutorService; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java index a7142dc5ef..74d800e50d 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java @@ -18,7 +18,7 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.collect.Iterables.transform; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java index 0ed792ec5e..c8eef342cb 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java @@ -24,7 +24,7 @@ import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java index 8d95965f2b..82013d8bee 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java @@ -16,7 +16,7 @@ */ package org.jclouds.chef.strategy.internal; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java index 58ecaaaf20..4217f03695 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java @@ -16,7 +16,7 @@ */ package org.jclouds.chef.strategy.internal; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java index a6dcac2b57..e59cefc139 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java index f1e1820b40..2299c46919 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java +++ b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java index 1bf308b70f..f8aeb3e787 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertTrue; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.chef.config.ChefHttpApiModule; import org.jclouds.chef.domain.CookbookDefinition; diff --git a/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java b/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java index 76487323a9..9c01cca8ba 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import java.io.File; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.jclouds.chef.ChefApiMetadata; import org.jclouds.chef.config.ChefParserModule; diff --git a/apis/chef/src/test/java/org/jclouds/chef/features/OrganizationApiExpectTest.java b/apis/chef/src/test/java/org/jclouds/chef/features/OrganizationApiExpectTest.java index 36736392a1..a40ff9d0cb 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/features/OrganizationApiExpectTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/features/OrganizationApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.apis.ApiMetadata; import org.jclouds.chef.BaseChefApiExpectTest; diff --git a/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java b/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java index 73888d0dd1..f734c324cc 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.security.PrivateKey; import javax.inject.Provider; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.jclouds.ContextBuilder; import org.jclouds.chef.ChefApiMetadata; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java index 2009e6d650..489bf342ea 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java index 0d173175fa..b2a5e088de 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.compute.functions; import static com.google.common.collect.Iterables.transform; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java index fbcdc186c4..1881c1ca1a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.compute.functions; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java index 9abb7dad3d..4c2faa954b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java index 81d51d83ac..b9b6f84059 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.compute.loaders; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java index 93f32a918b..6daf2dcb22 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java @@ -19,7 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java index e0ed1977b4..48f5c0d662 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java @@ -28,7 +28,7 @@ import static org.jclouds.cloudstack.predicates.TemplatePredicates.isReady; import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityGroups; import static org.jclouds.ssh.SshKeys.fingerprintPrivateKey; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java index b5eaaf59f2..0818a104b8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java index 36a6c79cdf..45492db0ad 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java index 26867cd200..b22485b328 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java index 2ca59e3372..630516ad26 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java @@ -17,9 +17,9 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.cloudstack.domain.Capabilities; import org.jclouds.cloudstack.filters.AuthenticationFilter; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java index 161789a8c7..79379e3a81 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java @@ -17,10 +17,10 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.cloudstack.domain.Account; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java index 30c697ae78..b2f6ccd928 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java index 39579553cc..85952a5cca 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java @@ -17,9 +17,9 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.cloudstack.binders.ResourceLimitToQueryParams; import org.jclouds.cloudstack.domain.ResourceLimit; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java index 41e39b8496..06f831bbce 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java index 2ab4d73001..39cf0943e2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java @@ -19,9 +19,9 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.cloudstack.domain.Event; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java index 4c6ad7318b..5b490bb276 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java index 7612b73059..0e7838333b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java @@ -17,10 +17,10 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.cloudstack.domain.Account; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java index c71ef17383..a4adcaadc2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java @@ -19,9 +19,9 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.cloudstack.domain.Alert; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java index eb0d0fa547..dfe84be6a6 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java @@ -19,9 +19,9 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.cloudstack.domain.Capacity; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java index 1d9b5b878e..56f2f8b054 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java index fabfc41fce..dae4af19cd 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java @@ -17,10 +17,10 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java index 2255d71682..65b2bfb7d4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.cloudstack.domain.Cluster; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java index 793f277d49..c86cdf8f67 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java @@ -17,10 +17,10 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.cloudstack.domain.DiskOffering; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java index d76abaaf3b..05dc1c3a98 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java index 6fa00eac6e..a3c24bbdbb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java @@ -19,9 +19,9 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.cloudstack.domain.StoragePool; import org.jclouds.cloudstack.filters.AuthenticationFilter; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java index acc8d91cd5..9214c0ad74 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java @@ -20,10 +20,10 @@ import java.util.Date; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.cloudstack.domain.JobResult; import org.jclouds.cloudstack.domain.UsageRecord; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java index 430b292434..c06cc5f051 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java @@ -17,10 +17,10 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.cloudstack.domain.ApiKeyPair; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java index f5b0b87289..e17b2c1c2f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java index 37f1805091..44561769cb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java @@ -17,10 +17,10 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java index 9d43b014fd..f657fcb895 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java @@ -20,10 +20,10 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java index 1b132feb20..b6464acda3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java @@ -19,8 +19,8 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.cloudstack.filters.AuthenticationFilter; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java index 241e28608d..ab508a86b8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java index c07ccb2b4c..0c32fa34ba 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java @@ -19,9 +19,9 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.cloudstack.domain.ResourceLimit; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java index f91c405b01..cc04c04d3f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java index 015c2bac97..153c0aeb2d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java index 9784b41931..dbba9e5c92 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java index 4baf0f6051..3408950c58 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java index f426cdf0f7..f327348f2b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java index 6ab8e53c9f..2daf7fde27 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java index 3f53b8fe3b..4660097e69 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java index 0dae2daad2..7f1e2952f9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java @@ -17,10 +17,10 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java index de93bbf4bf..a0facd8b6f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java index 96e9f36662..f9aef7129f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java @@ -17,9 +17,9 @@ package org.jclouds.cloudstack.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import java.util.Set; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java index 7a3d4900f1..bf62cc057e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java index bf2be0d854..23a1b7e64d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java index f98ee9d051..5140c2827b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java index 6a49c40776..fca5567f5a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java index d7e8ff3b97..12f8231e78 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java @@ -19,10 +19,10 @@ package org.jclouds.cloudstack.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java index 04610cc444..6e38aeb1ac 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java index dd15e195c4..faaff05a1f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java index dd09f77d22..ed1ba0ff68 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java index 8360977b76..49211da8fd 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java @@ -23,7 +23,7 @@ import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityG import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java index 0082ea82ce..7a1f1fdd3f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java index 7ea19b2d1b..322d2102e3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java @@ -27,7 +27,7 @@ import static org.jclouds.compute.reference.ComputeServiceConstants.COMPUTE_LOGG import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java index 82bc0dfe92..21c166535a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java index 6c6f886ec5..913fe13e94 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.handlers; import java.io.IOException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.http.HttpCommand; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java index 119e6b5d9d..f95e21bf7f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.handlers; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.jclouds.cloudstack.domain.LoginResponse; import org.jclouds.cloudstack.features.SessionApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java index 3e45521db4..240332e8f2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.cloudstack.AsyncJobException; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java index 7d7abc993c..87ac0d35c1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java index 7548e15c96..335183cd73 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java index daf3943d74..f44e77d9d0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java index fe2c37eb81..4bdf9f97ff 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java index 83008b8aaa..3b885b86a8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.strategy; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java index 8f65ab1f5e..e4836069f1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.cloudstack.CloudStackApi; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java index 91801d6e31..7d790d513c 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java @@ -26,7 +26,7 @@ import static org.testng.AssertJUnit.assertTrue; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.Snapshot; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TagApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TagApiLiveTest.java index 4f58a1eb82..7ee5eb1eea 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TagApiLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TagApiLiveTest.java @@ -21,7 +21,7 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertTrue; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Set; import com.google.common.collect.ImmutableMap; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java index 7ffc3b4c39..87a1024107 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java @@ -26,7 +26,7 @@ import static org.testng.AssertJUnit.assertTrue; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.AsyncCreateResponse; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java index 81ad59af7f..e388c61685 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.cloudstack.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java index c45784f056..c00fd0d105 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java @@ -17,9 +17,9 @@ package org.jclouds.cloudwatch.features; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import com.google.common.annotations.Beta; import com.google.common.collect.FluentIterable; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java index a5f0ec4f77..f44db98ff5 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java @@ -17,9 +17,9 @@ package org.jclouds.cloudwatch.features; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java index f030d9ac1b..1c1d5cce4a 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java @@ -18,7 +18,7 @@ package org.jclouds.docker.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.domain.Image; diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java b/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java index a29f160130..7147c3ec0a 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java index fb592c8597..b11663b7dd 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java @@ -20,14 +20,14 @@ import java.io.InputStream; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java index c93c322ca5..f58280491c 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java @@ -20,14 +20,14 @@ import java.io.InputStream; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java index 5df5d04b95..5992b88fcd 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java @@ -19,12 +19,12 @@ package org.jclouds.docker.features; import java.io.InputStream; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.Exec; import org.jclouds.docker.domain.ExecCreateParams; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java index 79671cc61e..3283f3b1e6 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java @@ -19,13 +19,13 @@ package org.jclouds.docker.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java b/apis/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java index a31901469e..e2fd987a86 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java +++ b/apis/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.Closeables2.closeQuietly; import java.io.IOException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/apis/docker/src/test/java/org/jclouds/docker/features/MiscApiMockTest.java b/apis/docker/src/test/java/org/jclouds/docker/features/MiscApiMockTest.java index 0678966fc1..556cff1b03 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/features/MiscApiMockTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/features/MiscApiMockTest.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; diff --git a/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java b/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java index a273ebc4b3..56c2a23a24 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java @@ -16,15 +16,15 @@ */ package org.jclouds.docker.internal; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; import java.io.IOException; import java.util.Properties; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerParseTest.java index 291fa13232..4dc2b6a186 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerParseTest.java @@ -19,8 +19,8 @@ package org.jclouds.docker.parse; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.docker.domain.Config; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerVersionMajor1Minor21.java b/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerVersionMajor1Minor21.java index 8bca8c83cf..d1ab2cb1ed 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerVersionMajor1Minor21.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/ContainerVersionMajor1Minor21.java @@ -19,8 +19,8 @@ package org.jclouds.docker.parse; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.docker.domain.Config; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/ContainersParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/ContainersParseTest.java index 39565bf63b..53d8cf53ed 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/ContainersParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/ContainersParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.docker.parse; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.ContainerSummary; import org.jclouds.docker.domain.Port; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/HistoryParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/HistoryParseTest.java index a92a69b348..ded20b21b2 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/HistoryParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/HistoryParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.docker.parse; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.ImageHistory; import org.jclouds.docker.internal.BaseDockerParseTest; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/ImageParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/ImageParseTest.java index 038be863a0..46ea14b645 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/ImageParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/ImageParseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.docker.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.docker.domain.Config; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/ImagesParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/ImagesParseTest.java index 1042da0890..17e2890ceb 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/ImagesParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/ImagesParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.docker.parse; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.ImageSummary; import org.jclouds.docker.internal.BaseDockerParseTest; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/Info2ParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/Info2ParseTest.java index 949acc7aa8..4501d7dc89 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/Info2ParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/Info2ParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.docker.parse; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.Info; import org.jclouds.docker.internal.BaseDockerParseTest; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/InfoParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/InfoParseTest.java index 87d149cb21..413abb36b8 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/InfoParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/InfoParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.docker.parse; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.Info; import org.jclouds.docker.internal.BaseDockerParseTest; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/NetworkParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/NetworkParseTest.java index 9b4815c6e5..e1536261d5 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/NetworkParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/NetworkParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.docker.parse; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.Network; import org.jclouds.docker.internal.BaseDockerParseTest; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/NetworksParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/NetworksParseTest.java index d9053f8789..1c5742ec74 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/NetworksParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/NetworksParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.docker.parse; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.Network; import org.jclouds.docker.internal.BaseDockerParseTest; diff --git a/apis/docker/src/test/java/org/jclouds/docker/parse/VersionParseTest.java b/apis/docker/src/test/java/org/jclouds/docker/parse/VersionParseTest.java index 2d9781bc47..0b37c64748 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/parse/VersionParseTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/parse/VersionParseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.docker.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.docker.domain.Version; import org.jclouds.docker.internal.BaseDockerParseTest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java index 03c18d7428..ab33270f1e 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java index 37f4c1588f..f602a621af 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java index fc8b184860..9370ccfbdd 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java index ae3b5b5f1c..8c5881c79d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java index 93ea29e4a5..ed34f67c21 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java @@ -24,7 +24,7 @@ import static org.jclouds.util.Predicates2.retry; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java index b3410079df..58892afb1f 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java index e0f5e9573d..fde40b4f25 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java @@ -28,7 +28,7 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.collect.Memoized; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java index 191f965d28..72d2393b0f 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.compute.loaders; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java index c28d0c51fa..90d129d98f 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java @@ -20,7 +20,7 @@ import static org.jclouds.ec2.options.DescribeImagesOptions.Builder.imageIds; import java.util.concurrent.ExecutionException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java index 788ce018f3..6dbef139c1 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java index 9640e4b05a..77bb6e901b 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java @@ -26,7 +26,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java index 35a7aa59ea..c66a3b6415 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java @@ -26,7 +26,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_R import static org.jclouds.compute.functions.DefaultCredentialsFromImageOrOverridingCredentials.overrideDefaultCredentialsWithOptionsIfPresent; import static org.jclouds.ec2.compute.util.EC2ComputeUtils.getZoneFromLocationOrNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java index b8a1b5c0e8..e53ad7a736 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.ExecutionException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java index 1baec6394b..0c2a40bb75 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java @@ -30,7 +30,7 @@ import static com.google.common.collect.Multimaps.transformValues; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java index 4fd4d6caf9..8c3377e858 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java index 71e513a6f2..41b2b75ec5 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java index eae60e2e6a..6a3f5d0c18 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java index 0da808b76c..54a17174bf 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java index 89e0230f51..eacd705f5c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java index 830773dc9e..5726feb79c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java index ee9209ed56..0cce30ff89 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java index b44290f02d..23b73a57a1 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java index e4a773c51e..21b06e42f0 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java @@ -19,8 +19,8 @@ package org.jclouds.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; import javax.inject.Named; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java index 05ac06aaf2..476be18554 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java @@ -21,8 +21,8 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java index 4cb7147638..1802128888 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java index 5cddf6b316..38f225dbbb 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.predicates; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.aws.AWSResponseException; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java index e1f5f18d9e..5d4dd9a5fd 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.predicates; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java index 16c8d54f9e..42484df718 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.predicates; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.domain.InstanceState; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java index 20195fd397..dbbb6265ac 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.predicates; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java index 9ec5a03501..33711b87ed 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.predicates; import static org.jclouds.ec2.options.DescribeSnapshotsOptions.Builder.snapshotIds; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.domain.Snapshot; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java index bfed24b2ce..87d8b4ca10 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.predicates; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.domain.Attachment; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java index 051531c2e5..c1e1e4ff1f 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.predicates; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.ec2.domain.Volume; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java index c166de21c9..c45bdab7eb 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.predicates; import static com.google.common.collect.Iterables.getLast; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.Volume; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/AllocateAddressResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/AllocateAddressResponseHandler.java index d1510de2f3..ad82323d7d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/AllocateAddressResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/AllocateAddressResponseHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.xml; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.http.functions.ParseSax.HandlerWithResult; import org.jclouds.logging.Logger; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java index b14e2b7c76..f1c284990d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Date; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.aws.util.AWSUtils; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java index 1d4470df3f..3a74fa41a4 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java @@ -21,7 +21,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.aws.util.AWSUtils; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java index c09cc67ed6..77cf6d07e7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.ec2.domain.AvailabilityZoneInfo; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java index 69b5b6891a..5fcdaadfa2 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.xml; import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import java.util.Map; import java.util.Set; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java index aeb736525a..1abd871550 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.xml; import java.net.URI; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.http.functions.ParseSax; import org.jclouds.logging.Logger; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceExpectTest.java index 6de7d27bba..9b9c4975d1 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceExpectTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.util.Set; import com.google.common.collect.ImmutableMap; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionExpectTest.java index 11c968a339..04a02f26c1 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionExpectTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionExpectTest.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.compute.extensions; import static org.testng.Assert.assertEquals; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.ImageTemplate; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionExpectTest.java index 733edbf9fe..d0def56968 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionExpectTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.compute.domain.SecurityGroup; import org.jclouds.compute.domain.SecurityGroupBuilder; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/BaseEC2ComputeServiceExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/BaseEC2ComputeServiceExpectTest.java index eb7e397ec2..6c6fc2a2b2 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/BaseEC2ComputeServiceExpectTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/BaseEC2ComputeServiceExpectTest.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.compute.internal; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.util.Properties; import org.jclouds.compute.ComputeService; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java index 5bc811ed5f..aa67f262ac 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.internal; import static com.google.common.base.Throwables.propagate; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java index d4cb9ecec7..3b798af003 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.internal; import java.util.Map; import java.util.TimeZone; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.aws.filters.FormSigner; import org.jclouds.date.DateService; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java index 9810f3107a..29ba80034c 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java @@ -19,13 +19,13 @@ package org.jclouds.elasticstack; import java.io.Closeable; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -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.GET; +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.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java index ced12e0b2f..f056a1c110 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java @@ -22,7 +22,7 @@ import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.elasticstack.domain.DriveData; import org.jclouds.elasticstack.functions.ListOfMapsToListOfKeyValuesDelimitedByBlankLines; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java index 3b030669bf..8ed85ce36e 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java @@ -22,7 +22,7 @@ import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.elasticstack.domain.Drive; import org.jclouds.elasticstack.functions.ListOfMapsToListOfKeyValuesDelimitedByBlankLines; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java index 1ec59e6f16..c2f0217258 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java @@ -22,7 +22,7 @@ import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.elasticstack.domain.Server; import org.jclouds.elasticstack.functions.ListOfMapsToListOfKeyValuesDelimitedByBlankLines; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java index 7bc00c7d3a..f3b27be087 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java @@ -26,7 +26,7 @@ import static org.jclouds.elasticstack.util.Servers.small; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java index 530dfc7ecb..628dc92d16 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java @@ -23,7 +23,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.groupFromMapOrName; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java index 93915d6e32..74235a4ce0 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java @@ -22,7 +22,7 @@ import static java.util.Arrays.asList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java index d31b4244d8..0dc14ee5ac 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java @@ -19,7 +19,7 @@ package org.jclouds.elasticstack.functions; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.elasticstack.domain.ClaimType; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java index 7732b0b571..a7aa9d3eb5 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java @@ -19,7 +19,7 @@ package org.jclouds.elasticstack.functions; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.elasticstack.domain.ClaimType; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java index 1402b0a9bd..3bd6ff21a8 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java index 83ac0a3791..ec57535997 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java @@ -22,7 +22,7 @@ import static org.jclouds.util.Strings2.toStringAndClose; import java.io.IOException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.http.HttpCommand; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java index 1ffad105d2..f0e0e53b93 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java @@ -18,7 +18,7 @@ package org.jclouds.elasticstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java index 90bddd9030..23771dba6e 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java index f0bee408b2..892437d88c 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java @@ -25,7 +25,7 @@ import java.io.IOException; import java.util.Properties; import java.util.Set; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.MockResponse; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java index d60a5fd47b..65672a03ae 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.elasticstack.domain.ClaimType; import org.jclouds.elasticstack.domain.Drive; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java index 40aafc78c7..a3f7855ac6 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.elasticstack.domain.ClaimType; import org.jclouds.elasticstack.domain.CreateDriveRequest; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java index 3d5c38ed8f..100b8cb1dd 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.elasticstack.domain.IDEDevice; import org.jclouds.elasticstack.domain.Model; diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index 40e9537e6d..fa99ed9751 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -57,7 +57,7 @@ import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java index 45f88d0193..196d806e69 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java @@ -27,7 +27,7 @@ import java.util.Properties; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import com.google.common.collect.ImmutableSet; import org.jclouds.blobstore.domain.Blob; diff --git a/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java b/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java index 65577cfddc..1e0f78cc91 100644 --- a/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java +++ b/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java @@ -23,12 +23,12 @@ import java.net.URI; import java.util.Map; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.blobstore.attr.BlobScope; diff --git a/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java b/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java index e530903c56..6c3cfed494 100644 --- a/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java +++ b/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java @@ -18,7 +18,7 @@ package org.jclouds.glacier.filters; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java index 50c6668ac0..57cfa3c3d7 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java @@ -16,14 +16,14 @@ */ package org.jclouds.oauth.v2; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.io.Closeable; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; import org.jclouds.javax.annotation.Nullable; import org.jclouds.oauth.v2.OAuthFallbacks.AuthorizationExceptionOn4xx; diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java index f75585228c..ab18ec9618 100644 --- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java +++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java @@ -19,7 +19,7 @@ package org.jclouds.oauth.v2; import static com.google.common.base.Charsets.UTF_8; import static com.google.common.io.BaseEncoding.base64Url; import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import static org.jclouds.oauth.v2.config.CredentialType.P12_PRIVATE_KEY_CREDENTIALS; import static org.jclouds.oauth.v2.config.CredentialType.CLIENT_CREDENTIALS_SECRET; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/extensions/AvailabilityZoneApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/extensions/AvailabilityZoneApi.java index 1594419b9c..5b2256d833 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/extensions/AvailabilityZoneApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/extensions/AvailabilityZoneApi.java @@ -28,10 +28,10 @@ import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.SelectJson; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; /** * Provides access to the OpenStack Block Storage (Cinder) Availability Zone Extension API. diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java index 14fa57c6df..7f9c73112f 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java @@ -17,11 +17,11 @@ package org.jclouds.openstack.cinder.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java index 28c3e8bfe5..b9bed910ff 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.cinder.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java index c9f98202b9..42b0a741a1 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.cinder.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java index 2ee062ec4f..56d43e0f52 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java @@ -17,11 +17,11 @@ package org.jclouds.openstack.cinder.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java index 11ecca1d26..cbe29d4c68 100644 --- a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java +++ b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java index d309f2d478..b252d1e15b 100644 --- a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java +++ b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java index e4ab869b96..2310754282 100644 --- a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java +++ b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.internal; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java index 015f470142..034862fa41 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java @@ -24,8 +24,8 @@ import static org.jclouds.openstack.keystone.config.KeystoneProperties.SCOPE; import static org.jclouds.openstack.keystone.config.KeystoneProperties.TENANT_ID; import static org.jclouds.openstack.keystone.config.KeystoneProperties.TENANT_NAME; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; import org.jclouds.domain.Credentials; import org.jclouds.logging.Logger; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java index 23ef7a10aa..9a3f202936 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.auth.handlers; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/LocationIdToURIFromServiceEndpointsForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/LocationIdToURIFromServiceEndpointsForTypeAndVersion.java index aabfec2e83..226b17d544 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/LocationIdToURIFromServiceEndpointsForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/LocationIdToURIFromServiceEndpointsForTypeAndVersion.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.Logger; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java index 9cca4777d9..6715d52c68 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java @@ -19,9 +19,9 @@ package org.jclouds.openstack.keystone.v2_0; import java.io.Closeable; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/auth/V2AuthenticationApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/auth/V2AuthenticationApi.java index a5c222007e..7d87aa75e0 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/auth/V2AuthenticationApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/auth/V2AuthenticationApi.java @@ -18,10 +18,10 @@ package org.jclouds.openstack.keystone.v2_0.auth; import java.io.Closeable; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.openstack.keystone.auth.AuthenticationApi; import org.jclouds.openstack.keystone.auth.domain.ApiAccessKeyCredentials; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java index 913b0b5cd5..b256823e0c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java @@ -23,7 +23,7 @@ import static org.jclouds.openstack.keystone.catalog.ServiceEndpoint.Interface.P import java.net.URI; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java index f5ced864a9..e11a0aae19 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.keystone.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java index 2bba9fab97..aeb28f5ead 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java @@ -17,13 +17,13 @@ package org.jclouds.openstack.keystone.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java index f3dec87f17..b2ffa99c50 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.keystone.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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.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.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java index 7102fca5a2..56e2898006 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java @@ -17,13 +17,13 @@ package org.jclouds.openstack.keystone.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java index 0836318b50..009ecd5456 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java @@ -19,10 +19,10 @@ package org.jclouds.openstack.keystone.v2_0.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TenantApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TenantApi.java index 1136a2f715..dce9bef9c7 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TenantApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TenantApi.java @@ -16,12 +16,12 @@ */ package org.jclouds.openstack.keystone.v2_0.features; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -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.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java index a6d39614e8..cd6d85584c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java @@ -19,12 +19,12 @@ package org.jclouds.openstack.keystone.v2_0.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java index 11d1ac0b5b..9e3a6ab26d 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java @@ -19,12 +19,12 @@ package org.jclouds.openstack.keystone.v2_0.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -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.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java index cac54f34ab..42da7616df 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/auth/V3AuthenticationApi.java @@ -18,10 +18,10 @@ package org.jclouds.openstack.keystone.v3.auth; import java.io.Closeable; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.openstack.keystone.auth.AuthenticationApi; import org.jclouds.openstack.keystone.auth.domain.PasswordCredentials; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java index 0e86f2bc25..e1c1f7cb73 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v3.catalog; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java index 845c738c01..7fb3e1ae47 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java @@ -17,12 +17,12 @@ package org.jclouds.openstack.keystone.v3.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java index c29f29933e..67bc8d637a 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java @@ -19,10 +19,10 @@ package org.jclouds.openstack.keystone.v3.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java index 494e851793..456f774562 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java @@ -20,15 +20,15 @@ import java.util.List; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.HEAD; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java index c21716f3f4..cbd0bcdbe0 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java @@ -19,13 +19,13 @@ package org.jclouds.openstack.keystone.v3.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java index 1617b51c9f..f7107b656e 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java @@ -19,13 +19,13 @@ package org.jclouds.openstack.keystone.v3.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java index 466bcc97c8..2d3bfeda52 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java @@ -19,11 +19,11 @@ package org.jclouds.openstack.v2_0.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java index a11c7de08a..fbc6bad9de 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java @@ -32,9 +32,9 @@ import java.util.Properties; import javax.inject.Qualifier; import javax.inject.Singleton; -import javax.ws.rs.HEAD; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.apis.ApiMetadata; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java index d51e2be405..2499b41a7a 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.testng.Assert.assertEquals; import org.jclouds.http.HttpRequest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java index 22ca9943f2..cc0539c534 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java index 0f930d3936..0ae9eb26f7 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java index 87e15d5a7c..bb43e7fe4c 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java index 18fee196a8..9d9a33c595 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java index 1f19d96197..2f46a4d4b5 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java @@ -20,7 +20,7 @@ import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_T import java.util.Properties; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.apis.ApiMetadata; import org.jclouds.http.HttpRequest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java index 7c0dc1197e..ed76003042 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java @@ -28,8 +28,8 @@ import org.jclouds.openstack.keystone.v2_0.domain.User; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import static org.jclouds.openstack.v2_0.ServiceType.BLOCK_STORAGE; import static org.jclouds.openstack.v2_0.ServiceType.COMPUTE; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAdminAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAdminAccessTest.java index f710b364de..ea8aa10766 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAdminAccessTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAdminAccessTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java index 1c8622fe8d..c28250be5d 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseMinimalAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseMinimalAccessTest.java index 7b170a5fdd..6d44ca1867 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseMinimalAccessTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseMinimalAccessTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceAccessTest.java index a1e08f56a2..a8447745f6 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceAccessTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceAccessTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java index 6fc6988545..a61e047faf 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceCryptoTokenAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceCryptoTokenAccessTest.java index 06394e3afb..2ce8ab6e7f 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceCryptoTokenAccessTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceCryptoTokenAccessTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRandomEndpointVersionAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRandomEndpointVersionAccessTest.java index 000811f7e4..e5682fc9b2 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRandomEndpointVersionAccessTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRandomEndpointVersionAccessTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java index e7863d2a70..bc86f3769e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.neutron.v2; import java.io.Closeable; import java.util.Set; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.jclouds.location.Region; import org.jclouds.openstack.neutron.v2.features.FloatingIPApi; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java index a4f45dbc3b..86a3bc61b0 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.neutron.v2.extensions; import javax.inject.Named; -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.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.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java index 383c70e727..835b7eeede 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.neutron.v2.extensions; import javax.inject.Named; -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.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.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java index f67c6e3754..cd4e198abf 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java @@ -17,15 +17,15 @@ package org.jclouds.openstack.neutron.v2.extensions.lbaas.v1; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java index 43d7b3ca8c..1421473cc2 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.neutron.v2.features; import javax.inject.Named; -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.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.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java index af908fcf85..b735a76535 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java @@ -17,15 +17,15 @@ package org.jclouds.openstack.neutron.v2.features; import javax.inject.Named; -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.jclouds.Fallbacks; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java index 3cd0e35cd0..f33ff86db4 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java @@ -19,14 +19,14 @@ package org.jclouds.openstack.neutron.v2.features; import java.util.List; import javax.inject.Named; -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.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.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java index 3646c1780b..6549ddaed5 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.neutron.v2.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java index 62fa7bb148..6af8308e29 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java @@ -19,15 +19,15 @@ package org.jclouds.openstack.neutron.v2.features; import java.util.List; import javax.inject.Named; -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.jclouds.Fallbacks; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java index bf0a35e86c..21c09399d7 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java @@ -19,9 +19,9 @@ package org.jclouds.openstack.nova.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.aws.filters.FormSigner; import org.jclouds.ec2.domain.KeyPair; diff --git a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java index 6878df93a8..323de94886 100644 --- a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java +++ b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.ec2.internal; import java.net.URI; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java index b2e18c8cbb..7142d49074 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java @@ -29,7 +29,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.metadataAndTagsAsComm import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java index dae8af790c..c7a3f1e1db 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java @@ -24,7 +24,7 @@ import static com.google.common.collect.Iterables.transform; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Context; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java index 9e12d97bf3..26f36e03fe 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java index 80663ab16a..3a7d6c2cfd 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java @@ -25,8 +25,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nullable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import com.google.common.collect.Sets; @@ -34,6 +33,7 @@ import org.jclouds.Context; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadataBuilder; import org.jclouds.compute.reference.ComputeServiceConstants; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.Logger; import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.domain.Network; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java index 3e215bb549..f579bb549c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java @@ -21,7 +21,7 @@ import static org.jclouds.openstack.nova.v2_0.compute.strategy.ApplyNovaTemplate import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java index 3faa490379..cae54cae37 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java @@ -23,8 +23,7 @@ import static org.jclouds.openstack.nova.v2_0.predicates.SecurityGroupPredicates import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; @@ -33,6 +32,7 @@ import org.jclouds.Context; import org.jclouds.compute.domain.SecurityGroup; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.Logger; import org.jclouds.net.domain.IpProtocol; import org.jclouds.openstack.neutron.v2.NeutronApi; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java index c521d2fdd3..ad8bc87ddd 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java @@ -29,6 +29,7 @@ import java.util.NoSuchElementException; import java.util.regex.Matcher; import java.util.regex.Pattern; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; @@ -53,7 +54,7 @@ public class ImageToOperatingSystem implements Function // Windows Server 2008 R2 x64 public static final Pattern WINDOWS_PATTERN = Pattern.compile("Windows (.*) (x[86][64])"); - @javax.annotation.Resource + @Resource @Named(ComputeServiceConstants.COMPUTE_LOGGER) protected Logger logger = Logger.NULL; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java index 0a6ffbc409..67c31e9078 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java @@ -22,12 +22,12 @@ import com.google.inject.assistedinject.Assisted; import org.jclouds.compute.domain.SecurityGroup; import org.jclouds.compute.domain.SecurityGroupBuilder; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.net.domain.IpPermission; import org.jclouds.net.domain.IpProtocol; import org.jclouds.openstack.neutron.v2.domain.Rule; import org.jclouds.openstack.neutron.v2.domain.RuleDirection; -import javax.annotation.Nullable; import javax.inject.Inject; import static com.google.common.collect.Iterables.filter; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java index f39da8faf1..189d4f9786 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java @@ -24,7 +24,7 @@ import static com.google.common.collect.Iterables.transform; import java.util.Collection; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java index 8739f60b59..9e200528bb 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java @@ -19,8 +19,7 @@ package org.jclouds.openstack.nova.v2_0.compute.functions; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; -import javax.annotation.Nullable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; @@ -28,6 +27,7 @@ import org.jclouds.compute.domain.SecurityGroup; import org.jclouds.compute.domain.SecurityGroupBuilder; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.Logger; import org.jclouds.net.domain.IpPermission; import org.jclouds.openstack.nova.v2_0.domain.SecurityGroupRule; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java index 8161443a50..232a01ab18 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import com.google.common.base.Supplier; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java index 5054f6ea8b..aabb7169a4 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java index 119b08aa00..8811d9c61f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java @@ -18,14 +18,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java index e3abe74d64..c42d2a5b9c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java @@ -17,10 +17,10 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java index a4d4127c9b..9a05f51d2e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java @@ -17,12 +17,12 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -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.jclouds.fallbacks.MapHttp4xxCodesToExceptions; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java index d935763dd1..474ded88ec 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java @@ -19,15 +19,15 @@ package org.jclouds.openstack.nova.v2_0.extensions; import java.util.Map; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyMapOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java index 003e66bfb9..d801155373 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java index 5bf56255f9..d42fe917fc 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java @@ -16,10 +16,10 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java index 5eadc486cd..01ce2fadf0 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java @@ -17,13 +17,13 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -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.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java index 18ad082f95..54dbbc5c1c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java @@ -19,14 +19,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java index 9e443f6166..17cf5dd0db 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java @@ -17,10 +17,10 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java index 34074d1e08..65754a1d37 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java index 59a5dd5ab3..8ac25f88d9 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java @@ -17,13 +17,13 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -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.GET; +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.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java index 9d3ed0ff3e..68150e74d1 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java index b489b2a525..2aa4b6814f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java @@ -17,12 +17,12 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -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.jclouds.fallbacks.MapHttp4xxCodesToExceptions; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java index e17ca690a4..67c08144d1 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java @@ -17,11 +17,11 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java index f88b48068a..e8e08f2280 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java @@ -17,11 +17,11 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java index f484cff574..f9b5553234 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java @@ -17,11 +17,11 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java index 185c8077e7..c69f0ae91f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java index 8d329f1b94..d9456673db 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java index 05dafac0fa..5408d03355 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java @@ -19,15 +19,15 @@ package org.jclouds.openstack.nova.v2_0.extensions; import java.util.Map; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyMapOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java index 98d1d9f7ad..bde7068115 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java @@ -17,14 +17,14 @@ package org.jclouds.openstack.nova.v2_0.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java index 3dc9907210..a2ab10f980 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java @@ -19,15 +19,15 @@ package org.jclouds.openstack.nova.v2_0.features; import java.util.Map; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyMapOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java index 555d4e431d..8ea38b96b8 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java @@ -22,15 +22,15 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -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.jclouds.Fallbacks; import org.jclouds.Fallbacks.AbsentOn403Or404Or500; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java index a52a0d2211..f6ec1afa16 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.json.Json; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java index 67a4930d9e..29e735c4c4 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java @@ -24,7 +24,7 @@ import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java index cc1ddd38d8..7e7e91a38e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.logging.Logger; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java index 05ddded16b..bc7e52b718 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.compute.extensions; import java.util.Properties; import java.util.concurrent.ExecutionException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import com.google.common.base.Optional; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java index 69ae0431ea..a923e91de8 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java @@ -25,7 +25,7 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.ComputeService; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java index ae59b3b055..afa59d275d 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java @@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java index 7d8b9075ea..7c2114d702 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiExpectTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java index 13928d32b2..79fc6580f5 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java index dc1de3f6d2..c2428b8a19 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java index f6772ff0cf..64178d624d 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java index a382d95501..b77fcc67b8 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java index 564faacf71..d8421c7da7 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java index 89a47fbd69..3b071239a8 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java index 37804a4ba8..730b00bab3 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.features; import static org.testng.Assert.assertEquals; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java index e4dc191226..8befefbd26 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.internal; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseComputeServiceTypicalSecurityGroupTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseComputeServiceTypicalSecurityGroupTest.java index 16843ae482..716c2f55bc 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseComputeServiceTypicalSecurityGroupTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseComputeServiceTypicalSecurityGroupTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java index 0ad50b2fdb..346f3a5230 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.nova.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java index 0cfda1a2b0..4a0de718ef 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListNormalTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListNormalTest.java index 8a65a29be2..11fc5f1545 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListNormalTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListNormalTest.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseSetParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListTest.java index e42b036f5d..5702667356 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionListTest.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseSetParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionTest.java index cfef3075f1..87e603bab7 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseExtensionTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java index 3351c64916..16466d67fc 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java index 69b4ead151..643cf04bf8 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPListTest.java index 80a85690fe..9bb72946c0 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPListTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPPoolListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPPoolListTest.java index 599338fe4b..7af35e4b81 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPPoolListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPPoolListTest.java @@ -26,8 +26,8 @@ import org.jclouds.openstack.nova.v2_0.domain.FloatingIPPool; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import java.util.Set; @Test(groups = "unit", testName = "ParseFloatingIPPoolListTest") diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPTest.java index fb1921a9bf..7ad5b252fd 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFloatingIPTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.nova.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java index ef5d74584d..fdc3103f07 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java index 3f93dd54a4..95b9019b71 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairListTest.java index 6d7a0c9aff..da549a0efa 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairListTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.nova.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairTest.java index 02dac16a02..5cdc4fa325 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseKeyPairTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.nova.v2_0.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataItemTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataItemTest.java index 613ca7d172..7d40f61774 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataItemTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataItemTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataListTest.java index 730840ec53..536aebd09e 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataListTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataUpdateTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataUpdateTest.java index a518dfe7ac..5fa3e5c82d 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataUpdateTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseMetadataUpdateTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseNOVNCConsoleTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseNOVNCConsoleTest.java index 9f0d925b55..c651461051 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseNOVNCConsoleTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseNOVNCConsoleTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseRDPConsoleTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseRDPConsoleTest.java index 9c80a1c4a4..1ec9a957b0 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseRDPConsoleTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseRDPConsoleTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSPICEConsoleTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSPICEConsoleTest.java index f8eb47f978..0417d24626 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSPICEConsoleTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSPICEConsoleTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupListTest.java index ba5aa78179..7d36bc1fb5 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupListTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupTest.java index 0854b28392..29f7c23386 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseSecurityGroupTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java index 4f151d9b86..e1dfa91be3 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseSetParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsStatesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsStatesTest.java index 81e6fd3b2b..108b38f909 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsStatesTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsStatesTest.java @@ -22,8 +22,8 @@ import com.google.inject.Guice; import com.google.inject.Injector; import java.net.URI; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java index ad2811efbd..fe3b3cec63 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java index 34932f3f68..ecded3e81c 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java @@ -21,8 +21,8 @@ import static org.jclouds.openstack.nova.v2_0.domain.Address.createV6; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAddressExtensionsTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAddressExtensionsTest.java index d20c091353..b934f76d6c 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAddressExtensionsTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAddressExtensionsTest.java @@ -34,8 +34,8 @@ import org.jclouds.openstack.v2_0.domain.Resource; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import java.net.URI; @Test(groups = "unit", testName = "ParseServerWithAddressExtensionsTest") diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAllExtensionsTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAllExtensionsTest.java index 013bf9b809..c1d11b47c7 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAllExtensionsTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithAllExtensionsTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java index 77230aaac0..c9cc6aba30 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java index 83c748b528..6cb1b23be1 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java @@ -33,8 +33,8 @@ import org.jclouds.openstack.v2_0.domain.Resource; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import java.net.URI; import static org.jclouds.openstack.nova.v2_0.domain.Address.createV4; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseXVPVNCConsoleTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseXVPVNCConsoleTest.java index 5a38829cf0..4bd9044af9 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseXVPVNCConsoleTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseXVPVNCConsoleTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java index ee55926e33..71717f69c9 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java index 76a8e9ffbf..d8dde17068 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.swift.v1; import java.io.Closeable; import java.util.Set; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java index b5fefdcd34..c61058a9a2 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java @@ -25,7 +25,7 @@ import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_DELET import java.util.Date; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest.Builder; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java index c7d338caf5..a7e0c7d20e 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java @@ -45,7 +45,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java index a32276a94c..6fd0bf72cc 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java @@ -31,8 +31,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; import org.jclouds.ContextBuilder; import org.jclouds.domain.Credentials; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java index 6db8d7b7e9..0df5252926 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java @@ -16,16 +16,16 @@ */ package org.jclouds.openstack.swift.v1.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.ACCOUNT_TEMPORARY_URL_KEY; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.HEAD; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java index ebf1e5b68a..002acf2740 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java @@ -18,16 +18,16 @@ package org.jclouds.openstack.swift.v1.features; import static com.google.common.collect.Iterables.transform; import static com.google.common.net.UrlEscapers.urlFragmentEscaper; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java index e942e716ec..af09b495c2 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java @@ -16,19 +16,19 @@ */ package org.jclouds.openstack.swift.v1.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java index de4c61d437..4f912d9cec 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java @@ -16,15 +16,15 @@ */ package org.jclouds.openstack.swift.v1.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; import org.jclouds.openstack.swift.v1.binders.BindMetadataToHeaders.BindObjectMetadataToHeaders; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java index 41cbeb6025..77408e691d 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java @@ -17,22 +17,22 @@ package org.jclouds.openstack.swift.v1.features; import static com.google.common.net.HttpHeaders.EXPECT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_COPY_FRESH_METADATA; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_COPY_FROM; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +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 org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java index 78cef14c1a..7fdb2c52e6 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java @@ -16,18 +16,18 @@ */ package org.jclouds.openstack.swift.v1.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java index e639772534..63419a9e41 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.swift.v1; import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.testng.Assert.assertEquals; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java index 579c635e17..16e2e2eb24 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.trove.v1; import java.io.Closeable; import java.util.Set; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java index ef0fe27f57..543e34ae0b 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java @@ -17,13 +17,13 @@ package org.jclouds.openstack.trove.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java index 904f2a32bd..7536f840bb 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java @@ -17,11 +17,11 @@ package org.jclouds.openstack.trove.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java index 443b02d96e..3303f04509 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java @@ -17,13 +17,13 @@ package org.jclouds.openstack.trove.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java index 3753c54880..f00549e5b7 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java @@ -20,14 +20,14 @@ import java.util.List; import java.util.Set; import javax.inject.Named; -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.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.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/utils/TroveUtils.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/utils/TroveUtils.java index c8de0969ad..fc47131d3d 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/utils/TroveUtils.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/utils/TroveUtils.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.openstack.trove.v1.TroveApi; import org.jclouds.openstack.trove.v1.domain.Instance; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java index e00d90a13d..13a5b60d4e 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.trove.v1.internal.BaseTroveApiExpectTest; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java index 2f79ba34eb..361ed98073 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.trove.v1.domain.Instance; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java index 1586b9fa17..23187c1c81 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.List; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.trove.v1.domain.User; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java index 55150da11b..89c5225095 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.trove.v1.internal; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.keystone.v2_0.internal.KeystoneFixture; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java index 0d9c52cfbf..c46bebc8ff 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.trove.v1.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.Uris; import org.jclouds.json.BaseSetParserTest; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java index 87333bccea..bda25d64af 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.trove.v1.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.Uris; import org.jclouds.json.BaseSetParserTest; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java index 2beba0e78e..0d8e001a1a 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java @@ -17,8 +17,8 @@ package org.jclouds.openstack.trove.v1.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.json.BaseSetParserTest; import org.jclouds.openstack.trove.v1.domain.User; import org.jclouds.rest.annotations.SelectJson; diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java index 912b2313ef..dfaf98acf0 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.net.URI; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java index e8b8f8f042..eb11085af3 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java @@ -16,15 +16,15 @@ */ package org.jclouds.rackspace.clouddns.v1; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.io.Closeable; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java index fe4866aca1..c9ce7d6c92 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.Map; import javax.inject.Inject; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java index a496024fa7..567d3b2988 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java index a3734c79fb..3827f981f3 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import javax.inject.Inject; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java index 7ae67f63d7..b3d754ea50 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java @@ -21,16 +21,16 @@ import java.util.List; import java.util.Set; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java index 6e62054329..128f1517b0 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java @@ -17,10 +17,10 @@ package org.jclouds.rackspace.clouddns.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; import org.jclouds.openstack.v2_0.domain.Limits; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java index 9752b96a67..060fd300e4 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java @@ -20,15 +20,15 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -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.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.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java index 4b2aa09edb..0c8b2eec8e 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java @@ -21,16 +21,16 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/DomainApiExpectTest.java b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/DomainApiExpectTest.java index 90058832d8..3b0d3a42ea 100644 --- a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/DomainApiExpectTest.java +++ b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/DomainApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.rackspace.clouddns.v1.features; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.SimpleTimeZone; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; import org.jclouds.rackspace.clouddns.v1.CloudDNSApi; diff --git a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/LimitApiExpectTest.java b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/LimitApiExpectTest.java index 3573524336..74b06e1215 100644 --- a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/LimitApiExpectTest.java +++ b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/LimitApiExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.clouddns.v1.features; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import java.net.URI; diff --git a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/RecordApiExpectTest.java b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/RecordApiExpectTest.java index 067e01d7f4..08a99b7e23 100644 --- a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/RecordApiExpectTest.java +++ b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/RecordApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.rackspace.clouddns.v1.features; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; import org.jclouds.rackspace.clouddns.v1.CloudDNSApi; diff --git a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApiExpectTest.java b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApiExpectTest.java index 9014b98bfe..10582dcde4 100644 --- a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApiExpectTest.java +++ b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApiExpectTest.java @@ -16,10 +16,10 @@ */ package org.jclouds.rackspace.clouddns.v1.features; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; import org.jclouds.rackspace.clouddns.v1.CloudDNSApi; diff --git a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/internal/BaseCloudDNSApiExpectTest.java b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/internal/BaseCloudDNSApiExpectTest.java index 9395b62fae..47c8751486 100644 --- a/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/internal/BaseCloudDNSApiExpectTest.java +++ b/apis/rackspace-clouddns/src/test/java/org/jclouds/rackspace/clouddns/v1/internal/BaseCloudDNSApiExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.clouddns.v1.internal; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java index 8dd7c6cf2d..c4ab5ffcfb 100644 --- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java +++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudfiles.v1.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.rackspace.cloudfiles.v1.reference.CloudFilesHeaders.CDN_ENABLED; import static org.jclouds.rackspace.cloudfiles.v1.reference.CloudFilesHeaders.CDN_TTL; @@ -24,15 +24,15 @@ import java.io.Closeable; import java.net.URI; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java index db462b6976..edfc52291f 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java @@ -17,10 +17,10 @@ package org.jclouds.rackspace.cloudidentity.v2_0; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.openstack.keystone.auth.AuthenticationApi; import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java index 325cc4d8ff..5f19165704 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java @@ -19,8 +19,8 @@ package org.jclouds.rackspace.cloudloadbalancers.v1; import java.io.Closeable; import java.util.Set; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java index f862cf139e..f22eceab97 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java @@ -17,14 +17,14 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java index 318f56ccab..dbd5c30bf0 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java @@ -17,13 +17,13 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -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.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr422; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java index ad623f2557..4cf687f2ba 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java @@ -17,12 +17,12 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java index bcc749be45..13f7e45f9e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java @@ -17,13 +17,13 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -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.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java index 5c4e095ee8..35ee5d0c43 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java @@ -17,12 +17,12 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr422; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java index 37328139b9..01d59b2e74 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java @@ -19,16 +19,16 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Map; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyMapOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java index ceedc48645..abc5300c9c 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java @@ -20,16 +20,16 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyMapOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java index b3c363d86d..cd701c60d8 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java @@ -19,12 +19,12 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Date; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -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.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.collect.IterableWithMarker; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java index cd7c1ff8a4..338159e440 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java @@ -17,12 +17,12 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr422; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java index 350bf209c1..926b2fefd9 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java @@ -17,13 +17,13 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -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.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java index a85505d1a1..3f151866f8 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java @@ -17,14 +17,14 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java index 7e40ec1ffa..7bc286f362 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import java.net.URI; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.logging.Logger; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java index c48e74e4b8..03630caac5 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.http.HttpCommand; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java index f795c6d053..41d3256913 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java index dd5e7da699..5d9be6c394 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java index 03452767fb..8ae15cb19f 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java @@ -16,10 +16,10 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java index c0e437a936..2d1554e447 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java @@ -16,10 +16,10 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java index a7b22b0580..471374dbfb 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java @@ -15,8 +15,8 @@ * limitations under the License. */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertTrue; import java.net.URI; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java index 4c45857918..71f1640c64 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java index 90d2b58306..59c88dfc71 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java @@ -16,10 +16,10 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java index b42a811ebf..7291002f80 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java @@ -16,13 +16,13 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java index 1aa054e37f..d8835749c6 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java @@ -16,12 +16,12 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiExpectTest.java index 4de08ba60c..56350ade8c 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiExpectTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import java.net.URI; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiExpectTest.java index 5a057285c6..4ca8fe55c5 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiExpectTest.java @@ -16,12 +16,12 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiExpectTest.java index 4f346f9cf0..5df74aef68 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiExpectTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiExpectTest.java index d8bdedf8af..f70f0bfcbc 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiExpectTest.java @@ -16,10 +16,10 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.MediaType.WILDCARD; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import java.net.URI; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java index 14ba504d65..bb00fd955b 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java @@ -15,8 +15,8 @@ * limitations under the License. */ package org.jclouds.rackspace.cloudloadbalancers.v1.handlers; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import java.net.URI; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancerApiExpectTest.java index d53a4534a6..583c60c2bf 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancerApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancerApiExpectTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.internal; import static com.google.common.net.HttpHeaders.ACCEPT; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java b/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java index 0ea5bdda07..c5adae4390 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java +++ b/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java @@ -19,9 +19,9 @@ package org.jclouds.route53; import java.io.Closeable; import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java b/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java index a5441163b0..0fcc5c79e4 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java +++ b/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java @@ -16,16 +16,16 @@ */ package org.jclouds.route53.features; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; import javax.inject.Named; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.collect.IterableWithMarker; diff --git a/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java b/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java index 501b450679..c8a90ce664 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java +++ b/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java @@ -16,13 +16,13 @@ */ package org.jclouds.route53.features; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.collect.PagedIterable; diff --git a/apis/route53/src/test/java/org/jclouds/route53/Route53ApiExpectTest.java b/apis/route53/src/test/java/org/jclouds/route53/Route53ApiExpectTest.java index de705aa13b..49e9c5a6c6 100644 --- a/apis/route53/src/test/java/org/jclouds/route53/Route53ApiExpectTest.java +++ b/apis/route53/src/test/java/org/jclouds/route53/Route53ApiExpectTest.java @@ -18,8 +18,8 @@ package org.jclouds.route53; import static com.google.common.net.HttpHeaders.DATE; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiExpectTest.java b/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiExpectTest.java index 5e8ec8e4e3..5f12e5f732 100644 --- a/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiExpectTest.java +++ b/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiExpectTest.java @@ -17,9 +17,9 @@ package org.jclouds.route53.features; import static com.google.common.net.HttpHeaders.DATE; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/apis/route53/src/test/java/org/jclouds/route53/features/ResourceRecordSetApiExpectTest.java b/apis/route53/src/test/java/org/jclouds/route53/features/ResourceRecordSetApiExpectTest.java index b141ef0dea..1ba3b41544 100644 --- a/apis/route53/src/test/java/org/jclouds/route53/features/ResourceRecordSetApiExpectTest.java +++ b/apis/route53/src/test/java/org/jclouds/route53/features/ResourceRecordSetApiExpectTest.java @@ -17,10 +17,10 @@ package org.jclouds.route53.features; import static com.google.common.net.HttpHeaders.DATE; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import org.jclouds.http.HttpRequest; diff --git a/apis/route53/src/test/java/org/jclouds/route53/handlers/Route53ErrorHandlerTest.java b/apis/route53/src/test/java/org/jclouds/route53/handlers/Route53ErrorHandlerTest.java index 53629a4a2c..3bb56cd312 100644 --- a/apis/route53/src/test/java/org/jclouds/route53/handlers/Route53ErrorHandlerTest.java +++ b/apis/route53/src/test/java/org/jclouds/route53/handlers/Route53ErrorHandlerTest.java @@ -18,8 +18,8 @@ package org.jclouds.route53.handlers; import static com.google.common.base.Throwables.propagate; import static com.google.common.net.HttpHeaders.DATE; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.jclouds.rest.internal.BaseRestApiExpectTest.payloadFromStringWithContentType; import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; diff --git a/apis/route53/src/test/java/org/jclouds/route53/internal/BaseRoute53ExpectTest.java b/apis/route53/src/test/java/org/jclouds/route53/internal/BaseRoute53ExpectTest.java index 7e80c06c8b..0f411d204f 100644 --- a/apis/route53/src/test/java/org/jclouds/route53/internal/BaseRoute53ExpectTest.java +++ b/apis/route53/src/test/java/org/jclouds/route53/internal/BaseRoute53ExpectTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.route53.internal; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import org.jclouds.date.DateService; import org.jclouds.http.HttpResponse; diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java index 1e30777c23..a849d5e5aa 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java @@ -24,16 +24,16 @@ import java.util.Map; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -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.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +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.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.blobstore.BlobStoreFallbacks.FalseOnContainerNotFound; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java index 9ce6a9ff16..21c4d6e3cd 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java @@ -23,7 +23,7 @@ import static org.jclouds.s3.binders.XMLHelper.elem; import static org.jclouds.s3.binders.XMLHelper.elemWithText; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java index 0e41899fb3..77008d482b 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java @@ -24,7 +24,7 @@ import static org.jclouds.s3.binders.XMLHelper.elemWithText; import java.util.Collection; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java index ce2dd848c9..722339c762 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java @@ -25,7 +25,7 @@ import static org.jclouds.s3.binders.XMLHelper.createDocument; import static org.jclouds.s3.binders.XMLHelper.elem; import static org.jclouds.s3.binders.XMLHelper.elemWithText; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java index 16794c79ca..c011e5eaa5 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Map.Entry; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java index 750d99f33a..36102ec3a1 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java index 90fdf3e4e3..d88aae0e9a 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java index 786e81815e..f53e361893 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java @@ -23,7 +23,7 @@ import static org.jclouds.location.predicates.LocationPredicates.idEquals; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java index caee79b186..abd1c0f4cd 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java index 732ff659f9..25ebc77fac 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java @@ -21,10 +21,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.location.Region; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java b/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java index 8860eb1255..bd057156ee 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java @@ -18,7 +18,7 @@ package org.jclouds.s3.functions; import java.util.concurrent.ExecutionException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/s3/src/test/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequestTest.java b/apis/s3/src/test/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequestTest.java index 218f562e72..5de1c261a5 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequestTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequestTest.java @@ -18,7 +18,7 @@ package org.jclouds.s3.binders; import static org.testng.Assert.assertEquals; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; diff --git a/apis/s3/src/test/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequestTest.java b/apis/s3/src/test/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequestTest.java index fde3e29f3f..5e64fa803b 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequestTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequestTest.java @@ -18,7 +18,7 @@ package org.jclouds.s3.binders; import static org.testng.Assert.assertEquals; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.binders.BindMapToHeadersWithPrefix; import org.jclouds.http.HttpRequest; diff --git a/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java b/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java index 6946100720..3e2054ef54 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java @@ -24,7 +24,7 @@ import static org.testng.Assert.assertEquals; import java.util.Date; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpResponse; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java index a5d88b5682..f67bf0f2f4 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java @@ -22,9 +22,9 @@ import static org.jclouds.sqs.reference.SQSParameters.VERSION; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Constants; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java index 27752c5310..b51749a4ed 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java @@ -20,9 +20,9 @@ import static org.jclouds.sqs.reference.SQSParameters.ACTION; import static org.jclouds.sqs.reference.SQSParameters.VERSION; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Constants; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java index 0557691800..7d8e716a22 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java @@ -23,9 +23,9 @@ import java.net.URI; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Constants; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java index b8a7f31cda..2b3bf63434 100644 --- a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java @@ -24,8 +24,8 @@ import static org.testng.Assert.assertEquals; import java.io.Closeable; import java.net.URI; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.ContextBuilder; import org.jclouds.concurrent.config.ExecutorServiceModule; diff --git a/apis/sts/src/main/java/org/jclouds/aws/filters/FormSigner.java b/apis/sts/src/main/java/org/jclouds/aws/filters/FormSigner.java index b63f5a9ae1..0d54499f8d 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/filters/FormSigner.java +++ b/apis/sts/src/main/java/org/jclouds/aws/filters/FormSigner.java @@ -39,7 +39,7 @@ import static org.jclouds.util.Strings2.toInputStream; import java.util.Comparator; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java b/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java index 2ebe0d300c..32a95fc006 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java +++ b/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java @@ -22,7 +22,7 @@ import static org.jclouds.http.HttpUtils.releasePayload; import java.io.IOException; import java.nio.charset.StandardCharsets; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java b/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java index 235e90fc02..ae49d2974f 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java +++ b/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java @@ -24,7 +24,7 @@ import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import java.util.Collection; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/sts/src/main/java/org/jclouds/sts/STSApi.java b/apis/sts/src/main/java/org/jclouds/sts/STSApi.java index f49cb08647..dce6ab879e 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/STSApi.java +++ b/apis/sts/src/main/java/org/jclouds/sts/STSApi.java @@ -19,9 +19,9 @@ package org.jclouds.sts; import java.io.Closeable; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.aws.domain.SessionCredentials; import org.jclouds.aws.filters.FormSigner; diff --git a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV2Test.java b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV2Test.java index 71fa8f96fc..49fc0f4057 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV2Test.java +++ b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV2Test.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.filters; -import static javax.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.GET; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import static org.jclouds.providers.AnonymousProviderMetadata.forApiOnEndpoint; import static org.testng.Assert.assertEquals; diff --git a/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java b/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java index 0f87624753..b28edcff77 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java +++ b/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ package org.jclouds.aws.handlers; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.Response.Status.CONFLICT; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.Response.Status.CONFLICT; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandlerTest.java b/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandlerTest.java index ea5cb51bc0..4bd85d032f 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandlerTest.java +++ b/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandlerTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ package org.jclouds.aws.handlers; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/apis/sts/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java b/apis/sts/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java index ea7c671ae3..66d2cdd8cb 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java +++ b/apis/sts/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ package org.jclouds.aws.handlers; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.CONFLICT; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.CONFLICT; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java b/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java index 821fa5c3d3..fb20d1f842 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java +++ b/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ package org.jclouds.aws.util; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java b/apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java index f8ab204bf0..0f28d2416e 100644 --- a/apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java +++ b/apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.sts; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.jclouds.sts.options.AssumeRoleOptions.Builder.externalId; import static org.jclouds.sts.options.FederatedUserOptions.Builder.policy; import static org.jclouds.sts.options.SessionCredentialsOptions.Builder.serialNumber; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java index 5691a3143c..d1d915169c 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java @@ -41,7 +41,7 @@ import java.util.SortedSet; import java.util.UUID; import java.util.concurrent.ExecutorService; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java index 0f8b6cabf4..bd01c319cc 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java index 535856dfd9..de47a6bf03 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java @@ -24,7 +24,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import com.google.common.util.concurrent.Futures; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java index 158c390a3b..c4ac90bad1 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java @@ -20,7 +20,7 @@ import static org.jclouds.concurrent.FutureIterables.transformParallel; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java index 849522726d..239ef83ab2 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java index 92ee96cacb..4a6c2936dc 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java @@ -19,7 +19,7 @@ package org.jclouds.blobstore.strategy.internal; import static com.google.common.base.Preconditions.checkArgument; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.blobstore.reference.BlobStoreConstants; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java index 7a6cef2b0b..4fb4641ead 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java b/blobstore/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java index b1f9245af9..7ab5078556 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import java.io.File; import java.io.IOException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.ContextBuilder; import org.jclouds.blobstore.domain.Blob; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java index 59863ee1e2..145d9f3e46 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java @@ -22,7 +22,7 @@ import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import javax.inject.Provider; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.config.BlobStoreObjectModule; import org.jclouds.blobstore.domain.Blob; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java index 47a27c224e..273659887b 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java @@ -19,7 +19,7 @@ package org.jclouds.blobstore.functions; import static org.testng.Assert.assertEquals; import javax.inject.Provider; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.MutableBlobMetadata; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientContainerIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientContainerIntegrationTest.java index c676b23196..745e5a0534 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientContainerIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientContainerIntegrationTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.domain.Blob; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java index b681f0d08d..809867fa37 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.assertj.core.api.Fail; import org.jclouds.blobstore.BlobStore; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java index 7adbab703c..c5f9175ca9 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java @@ -33,7 +33,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import com.google.common.util.concurrent.Uninterruptibles; import org.jclouds.apis.BaseViewLiveTest; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java index f13ad6ce6c..a93d2e75a9 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java @@ -40,7 +40,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.attr.ConsistencyModel; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java b/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java index 98780d5037..7477a79a74 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java @@ -24,7 +24,7 @@ import static org.jclouds.openstack.reference.AuthHeaders.AUTH_TOKEN; import java.net.URI; import java.util.Map.Entry; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java b/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java index 19ce4a3736..dde0c6c4a8 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.handlers; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/internal/OpenStackAuthClient.java b/common/openstack/src/main/java/org/jclouds/openstack/internal/OpenStackAuthClient.java index 34355ce1f7..a18d962ad0 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/internal/OpenStackAuthClient.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/internal/OpenStackAuthClient.java @@ -17,10 +17,10 @@ package org.jclouds.openstack.internal; import java.io.Closeable; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import org.jclouds.Constants; import org.jclouds.openstack.domain.AuthenticationResponse; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationClient.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationClient.java index 6e470afdf0..33e140299e 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationClient.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationClient.java @@ -18,10 +18,10 @@ package org.jclouds.openstack.keystone.v1_1; import java.io.Closeable; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.openstack.keystone.v1_1.binders.BindCredentialsToJsonPayload; import org.jclouds.openstack.keystone.v1_1.domain.Auth; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java index e03926f3d2..c5b1623aa3 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v1_1.handlers; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/parse/ParseAuthTest.java b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/parse/ParseAuthTest.java index 7c2d3c384d..631f1c4d03 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/parse/ParseAuthTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/parse/ParseAuthTest.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.v1_1.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; diff --git a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java index 9c5f9b98b2..9af7f3e729 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java +++ b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.Constants; import org.jclouds.compute.domain.ExecResponse; diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java index f1830c2b41..dfe70c7c01 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java +++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java @@ -19,7 +19,7 @@ package org.jclouds.compute.callables; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.domain.ExecResponse; diff --git a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java index 07f7687be1..94cfc37af7 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java +++ b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java @@ -19,7 +19,7 @@ package org.jclouds.compute.callables; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.domain.ExecResponse; diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java index 6099c1fcc6..48d749888d 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java @@ -46,7 +46,7 @@ import org.jclouds.compute.suppliers.ImageCacheSupplier; import org.jclouds.domain.Location; import org.jclouds.logging.Logger; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java b/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java index 8e26316f51..c3888325b1 100644 --- a/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java +++ b/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java @@ -18,7 +18,7 @@ package org.jclouds.compute.extensions.internal; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java b/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java index a36d3ed020..cbe5a5f564 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java +++ b/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java index c8c4c1f704..9aef0cfac8 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java +++ b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java @@ -39,7 +39,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java b/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java index cbe21eeadf..9770b5c3f1 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java @@ -16,7 +16,7 @@ */ package org.jclouds.compute.predicates; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.compute.domain.ExecResponse; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java index c7220c0cda..b49828f165 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java @@ -22,7 +22,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.formatStatus; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.compute.domain.ComputeMetadataIncludingStatus; import org.jclouds.logging.Logger; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/internal/TrueIfNullOrDeletedRefreshAndDoubleCheckOnFalse.java b/compute/src/main/java/org/jclouds/compute/predicates/internal/TrueIfNullOrDeletedRefreshAndDoubleCheckOnFalse.java index df3cb0629b..0d80306256 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/internal/TrueIfNullOrDeletedRefreshAndDoubleCheckOnFalse.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/internal/TrueIfNullOrDeletedRefreshAndDoubleCheckOnFalse.java @@ -21,7 +21,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.formatStatus; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.compute.domain.ComputeMetadataIncludingStatus; import org.jclouds.logging.Logger; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java index 2bb383c41b..f553ce2ab5 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java @@ -27,7 +27,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.callables.RunScriptOnNode; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java index a9bbb0f85e..c92a43f0b3 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java @@ -23,7 +23,7 @@ import static com.google.common.base.Throwables.getRootCause; import java.util.Map; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.callables.RunScriptOnNode; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java index c5be4025a8..465de3f371 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java @@ -27,7 +27,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.formatStatus; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java index f93cee0b7e..1d5380a044 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java b/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java index d2d111d630..96b9009640 100644 --- a/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java +++ b/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.domain.Image; diff --git a/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java b/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java index e8ea9e5284..00d62b1adc 100644 --- a/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java +++ b/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java @@ -32,7 +32,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java index d382587b97..76ffcce013 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java @@ -22,7 +22,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.net.URI; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Provider; diff --git a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java index ca337d5dc4..47132ea697 100644 --- a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java @@ -26,7 +26,7 @@ import static org.testng.Assert.assertTrue; import java.util.NoSuchElementException; import java.util.concurrent.ExecutionException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.ComputeService; diff --git a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java index 5c39bcb783..e28047b705 100644 --- a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.Set; import java.util.concurrent.ExecutionException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.ComputeService; diff --git a/core/pom.xml b/core/pom.xml index ecad81b75b..35d137aa8b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -54,12 +54,12 @@ guice-assistedinject - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api com.sun.xml.bind diff --git a/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java b/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java index c42c959293..1321d470c1 100644 --- a/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java +++ b/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java @@ -27,7 +27,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java b/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java index 48597a69a5..d71ba2d91c 100644 --- a/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java +++ b/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.events.handlers; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/http/HttpUtils.java b/core/src/main/java/org/jclouds/http/HttpUtils.java index eb36a50c12..7909a2e591 100644 --- a/core/src/main/java/org/jclouds/http/HttpUtils.java +++ b/core/src/main/java/org/jclouds/http/HttpUtils.java @@ -48,7 +48,7 @@ import java.util.Map.Entry; import javax.inject.Named; import javax.inject.Singleton; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.jclouds.Constants; import org.jclouds.io.ContentMetadata; diff --git a/core/src/main/java/org/jclouds/http/config/SSLModule.java b/core/src/main/java/org/jclouds/http/config/SSLModule.java index f2ce7c14c1..52fb7d7fba 100644 --- a/core/src/main/java/org/jclouds/http/config/SSLModule.java +++ b/core/src/main/java/org/jclouds/http/config/SSLModule.java @@ -20,7 +20,7 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; import javax.net.ssl.HostnameVerifier; diff --git a/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java b/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java index b046070d9c..5d06131cd0 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.http.HttpResponse; import org.jclouds.json.internal.GsonWrapper; diff --git a/core/src/main/java/org/jclouds/http/functions/ParseJson.java b/core/src/main/java/org/jclouds/http/functions/ParseJson.java index 7a9f96a4cd..414b38625d 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseJson.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseJson.java @@ -23,7 +23,7 @@ import java.io.InputStream; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/http/functions/ParseSax.java b/core/src/main/java/org/jclouds/http/functions/ParseSax.java index a277922937..84270b9ecc 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseSax.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseSax.java @@ -27,7 +27,7 @@ import java.io.InputStream; import java.io.StringReader; import java.nio.charset.StandardCharsets; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java b/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java index 54f603402f..4ea3496e89 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java @@ -21,7 +21,7 @@ import static org.jclouds.http.HttpUtils.releasePayload; import java.io.IOException; import java.io.InputStream; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java b/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java index dd63d8de30..fbb8d59a5f 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java +++ b/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java @@ -18,7 +18,7 @@ package org.jclouds.http.functions; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java index f765c81ec3..0312a3befa 100644 --- a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java @@ -21,7 +21,7 @@ import static java.lang.Math.max; import java.io.IOException; import java.util.Random; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java index e5fda773dd..9cf13cf660 100644 --- a/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java @@ -19,7 +19,7 @@ package org.jclouds.http.handlers; import static org.jclouds.Constants.PROPERTY_MAX_RATE_LIMIT_WAIT; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.http.HttpCommand; diff --git a/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java index c7512e1980..31df2ef0bd 100644 --- a/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java @@ -23,7 +23,7 @@ import static org.jclouds.http.Uris.uriBuilder; import java.net.URI; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java index f39ab2a8f6..a2d5ea08a3 100644 --- a/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.net.ProtocolException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/core/src/main/java/org/jclouds/http/internal/HttpWire.java b/core/src/main/java/org/jclouds/http/internal/HttpWire.java index e8aba2e744..57cec86992 100644 --- a/core/src/main/java/org/jclouds/http/internal/HttpWire.java +++ b/core/src/main/java/org/jclouds/http/internal/HttpWire.java @@ -22,7 +22,7 @@ import org.jclouds.Constants; import org.jclouds.logging.Logger; import org.jclouds.logging.internal.Wire; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; public class HttpWire extends Wire { diff --git a/core/src/main/java/org/jclouds/http/internal/SignatureWire.java b/core/src/main/java/org/jclouds/http/internal/SignatureWire.java index 173b3a9d86..71e1331bb7 100644 --- a/core/src/main/java/org/jclouds/http/internal/SignatureWire.java +++ b/core/src/main/java/org/jclouds/http/internal/SignatureWire.java @@ -16,7 +16,7 @@ */ package org.jclouds.http.internal; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java b/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java index 242bc5e393..2b0c41c86f 100644 --- a/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java +++ b/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java @@ -31,7 +31,7 @@ import java.util.Date; import java.util.List; import java.util.Map.Entry; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.date.DateCodec; import org.jclouds.date.DateCodecFactory; diff --git a/core/src/main/java/org/jclouds/lifecycle/BaseLifeCycle.java b/core/src/main/java/org/jclouds/lifecycle/BaseLifeCycle.java index b7096e9717..ba27d8b08c 100644 --- a/core/src/main/java/org/jclouds/lifecycle/BaseLifeCycle.java +++ b/core/src/main/java/org/jclouds/lifecycle/BaseLifeCycle.java @@ -20,9 +20,9 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/lifecycle/LifeCycle.java b/core/src/main/java/org/jclouds/lifecycle/LifeCycle.java index 998d64b120..c17f5a82c1 100644 --- a/core/src/main/java/org/jclouds/lifecycle/LifeCycle.java +++ b/core/src/main/java/org/jclouds/lifecycle/LifeCycle.java @@ -16,8 +16,8 @@ */ package org.jclouds.lifecycle; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; /** * // TODO: Adrian: Document this! diff --git a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java index e978c248d6..fb7b831b3d 100644 --- a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java +++ b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java @@ -30,8 +30,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.Collection; import java.util.concurrent.ScheduledExecutorService; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import javax.inject.Named; import org.jclouds.lifecycle.Closer; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java index f0a5a1b192..78c4d67e63 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java index 339216a6e1..b126c9dbd3 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java index 9f2195af4a..cf60336d43 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java @@ -22,7 +22,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.config.ValueOfConfigurationKeyOrNull; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java index 029fed4f2f..4ec416a496 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java @@ -21,7 +21,7 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java index 52926ea0c1..1a287f6b02 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java @@ -18,7 +18,7 @@ package org.jclouds.location.suppliers.fromconfig; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; diff --git a/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java b/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java index 11040910fe..c7459cfe27 100644 --- a/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java +++ b/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java @@ -23,7 +23,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; @@ -41,7 +41,7 @@ import com.google.inject.spi.TypeListener; /** * TypeListener that will bind {@link org.jclouds.logging.Logger} to members annotated with - * {@link javax.annotation.Resource} + * {@link jakarta.annotation.Resource} *

* This class is a TypeListener so that it can create a logger whose category is * the same as the name of the injected instance's class. diff --git a/core/src/main/java/org/jclouds/logging/internal/Wire.java b/core/src/main/java/org/jclouds/logging/internal/Wire.java index 9b88cf232a..03db0b25ae 100644 --- a/core/src/main/java/org/jclouds/logging/internal/Wire.java +++ b/core/src/main/java/org/jclouds/logging/internal/Wire.java @@ -24,7 +24,7 @@ import org.jclouds.io.Payload; import org.jclouds.io.PayloadEnclosing; import org.jclouds.logging.Logger; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java b/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java index 85217bf7f7..da7c96c98e 100644 --- a/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java +++ b/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java @@ -24,7 +24,7 @@ import java.net.Proxy; import java.net.Socket; import java.net.URI; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/rest/HttpClient.java b/core/src/main/java/org/jclouds/rest/HttpClient.java index f982a6607a..a034a80dab 100644 --- a/core/src/main/java/org/jclouds/rest/HttpClient.java +++ b/core/src/main/java/org/jclouds/rest/HttpClient.java @@ -20,11 +20,11 @@ import java.io.Closeable; import java.io.InputStream; import java.net.URI; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/core/src/main/java/org/jclouds/rest/annotations/PATCH.java b/core/src/main/java/org/jclouds/rest/annotations/PATCH.java index 4e68a79937..1344852f95 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/PATCH.java +++ b/core/src/main/java/org/jclouds/rest/annotations/PATCH.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; /** * Implements the PATCH HTTP request type diff --git a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java index 2f4ffc867b..4a4fd6603c 100644 --- a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java +++ b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/rest/internal/GetAcceptHeaders.java b/core/src/main/java/org/jclouds/rest/internal/GetAcceptHeaders.java index 34564420dc..4500c97017 100644 --- a/core/src/main/java/org/jclouds/rest/internal/GetAcceptHeaders.java +++ b/core/src/main/java/org/jclouds/rest/internal/GetAcceptHeaders.java @@ -18,7 +18,7 @@ package org.jclouds.rest.internal; import java.util.Set; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.reflect.Invocation; diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java index 8594bf5f63..126de876d3 100644 --- a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java +++ b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java @@ -23,7 +23,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.http.HttpCommand; diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java index 1af047abb2..cd93983d1d 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java @@ -54,15 +54,15 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; -import javax.ws.rs.Encoded; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Encoded; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Constants; import org.jclouds.domain.Credentials; diff --git a/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java b/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java index 6337a66215..f39d09f59e 100644 --- a/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java +++ b/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java @@ -17,8 +17,8 @@ package org.jclouds.rest.internal; import static com.google.inject.util.Types.newParameterizedType; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; import java.io.InputStream; import java.lang.reflect.ParameterizedType; diff --git a/core/src/main/java/org/jclouds/suppliers/SupplyKeyMatchingValueOrNull.java b/core/src/main/java/org/jclouds/suppliers/SupplyKeyMatchingValueOrNull.java index 1ddf6c198b..6a152ca4ed 100644 --- a/core/src/main/java/org/jclouds/suppliers/SupplyKeyMatchingValueOrNull.java +++ b/core/src/main/java/org/jclouds/suppliers/SupplyKeyMatchingValueOrNull.java @@ -19,7 +19,7 @@ package org.jclouds.suppliers; import java.util.Collection; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/util/Predicates2.java b/core/src/main/java/org/jclouds/util/Predicates2.java index d0c6487325..be94c0f00c 100644 --- a/core/src/main/java/org/jclouds/util/Predicates2.java +++ b/core/src/main/java/org/jclouds/util/Predicates2.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.logging.Logger; diff --git a/core/src/test/java/org/jclouds/http/IntegrationTestClient.java b/core/src/test/java/org/jclouds/http/IntegrationTestClient.java index 433240ac02..8ef755fa7c 100644 --- a/core/src/test/java/org/jclouds/http/IntegrationTestClient.java +++ b/core/src/test/java/org/jclouds/http/IntegrationTestClient.java @@ -23,14 +23,14 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.http.functions.ParseSax; diff --git a/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java b/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java index 3753edc955..a12fc76cd3 100644 --- a/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java +++ b/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java @@ -23,7 +23,7 @@ import java.io.Closeable; import java.io.IOException; import java.util.concurrent.CountDownLatch; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import static org.easymock.EasyMock.createStrictMock; import static org.easymock.EasyMock.expectLastCall; diff --git a/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java b/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java index a848445b31..ea07a9cae2 100644 --- a/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java +++ b/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; import java.lang.reflect.Field; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java index 61f2c5f93c..97c8a65047 100644 --- a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java +++ b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java @@ -19,8 +19,8 @@ package org.jclouds.rest; import static org.jclouds.providers.AnonymousProviderMetadata.forApiOnEndpoint; import static org.jclouds.reflect.Reflection2.method; -import javax.ws.rs.POST; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PathParam; import org.jclouds.ContextBuilder; import org.jclouds.http.HttpRequest; diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java index 03dacecece..88ede64908 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java @@ -19,11 +19,11 @@ package org.jclouds.rest.annotationparsing; import static org.jclouds.providers.AnonymousProviderMetadata.forApiOnEndpoint; import static org.testng.Assert.assertTrue; -import javax.ws.rs.FormParam; -import javax.ws.rs.HEAD; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.http.HttpRequest; diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java index 20446bf65a..086680ced4 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java @@ -22,10 +22,10 @@ import static org.testng.Assert.assertTrue; import java.io.Closeable; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.http.HttpRequest; diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java index eaec4cfdf0..42005e860b 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.Closeable; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java b/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java index b8c359534d..49e01952f4 100644 --- a/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java +++ b/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.File; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.PathParam; import org.jclouds.http.HttpRequest; import org.jclouds.reflect.Invocation; diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java index 5ace972bef..ad8bc95964 100644 --- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java @@ -18,8 +18,8 @@ package org.jclouds.rest.internal; import static com.google.common.base.Charsets.UTF_8; import static com.google.common.base.Preconditions.checkNotNull; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.io.Payloads.newInputStreamPayload; @@ -57,19 +57,19 @@ import java.util.concurrent.ExecutionException; import javax.inject.Named; import javax.inject.Qualifier; import javax.inject.Singleton; -import javax.ws.rs.Consumes; -import javax.ws.rs.Encoded; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.HttpMethod; -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.Encoded; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.HttpMethod; +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.jclouds.Constants; import org.jclouds.ContextBuilder; @@ -493,7 +493,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest { @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) - @javax.ws.rs.HttpMethod("FOO") + @jakarta.ws.rs.HttpMethod("FOO") public @interface FOO { } diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java index c1c5f22659..e410c2a171 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import javax.inject.Singleton; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java index 7f319d0d61..6f084b12c9 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java @@ -37,8 +37,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.ConnectException; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.domain.ExecChannel; diff --git a/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java b/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java index 23cd3a2390..cdd8a2d482 100644 --- a/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java +++ b/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java @@ -18,7 +18,7 @@ package org.jclouds.logging.log4j.config; import static org.testng.Assert.assertEquals; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.logging.Logger; import org.jclouds.logging.log4j.Log4JLogger; diff --git a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java index c9167028ea..861adacc4d 100644 --- a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java +++ b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java @@ -29,7 +29,6 @@ import java.net.Proxy; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; import javax.inject.Named; import javax.net.ssl.SSLSocketFactory; @@ -59,6 +58,7 @@ import org.jclouds.http.internal.HttpWire; import org.jclouds.io.ContentMetadataCodec; import org.jclouds.io.MutableContentMetadata; import org.jclouds.io.Payload; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.proxy.internal.GuiceProxyConfig; import com.google.common.base.Function; diff --git a/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java b/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java index bf67b0b200..3e18d89099 100644 --- a/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java +++ b/drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java @@ -28,9 +28,9 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import okhttp3.ConnectionSpec; import okhttp3.OkHttpClient; diff --git a/drivers/slf4j/src/test/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModuleTest.java b/drivers/slf4j/src/test/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModuleTest.java index 0392bc1fc2..74d732182b 100644 --- a/drivers/slf4j/src/test/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModuleTest.java +++ b/drivers/slf4j/src/test/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModuleTest.java @@ -18,7 +18,7 @@ package org.jclouds.logging.slf4j.config; import static org.testng.Assert.assertEquals; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.logging.Logger; import org.jclouds.logging.slf4j.SLF4JLogger; diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java index 35bddb2cc6..ba66b19c3e 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import net.schmizz.sshj.SSHClient; diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java index 2c55635a06..d64c9154b1 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java @@ -37,8 +37,8 @@ import java.net.ConnectException; import java.net.SocketTimeoutException; import java.util.concurrent.TimeUnit; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import javax.inject.Named; import net.schmizz.sshj.SSHClient; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java index 44049592df..8cf33d1214 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java @@ -26,7 +26,7 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/project/pom.xml b/project/pom.xml index 556afc771d..c6933a5a2e 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -231,7 +231,6 @@ 1.4.1 9.4.46.v20220331 - 2.1.1 1.8.0 @@ -307,16 +306,17 @@ jetty-security ${jetty.version} + - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} + jakarta.ws.rs + jakarta.ws.rs-api + 3.0.0 - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + 2.0.0 diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java index 1b2b0337a4..c78f744b98 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java @@ -22,7 +22,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.getPortRangesFromList import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java index dee02681bd..de61f8808c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java index 9dd5245035..86fa6d0552 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java @@ -23,7 +23,7 @@ import java.util.NoSuchElementException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java index 694e1dbb04..2496bd9d72 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java @@ -22,7 +22,7 @@ import static com.google.common.base.Predicates.or; import java.util.Set; import java.util.concurrent.ConcurrentMap; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java index 78a53c6b9c..e46027fd47 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java @@ -29,7 +29,7 @@ import static org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_CC_REGI import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java index 49d25e22b4..49952c7ebc 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java @@ -23,7 +23,7 @@ import static org.jclouds.aws.ec2.options.AWSDescribeImagesOptions.Builder.filte import java.util.Map.Entry; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java index 45f7f615cd..902509e2c1 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.aws.ec2.xml.ProductCodesHandler; import org.jclouds.aws.filters.FormSigner; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java index 186b47316b..cdc640abd4 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.aws.ec2.domain.AWSRunningInstance; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java index 0fb7bdfff1..330aea01c9 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java @@ -19,9 +19,9 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.aws.filters.FormSigner; import org.jclouds.ec2.domain.KeyPair; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java index ef998e809f..62714d247e 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java index f11699bd79..1f349e5c32 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java @@ -19,9 +19,9 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks; import org.jclouds.aws.ec2.options.CreateSubnetOptions; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java index 8bbd1f00c7..c1b0e4202a 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java @@ -19,9 +19,9 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java index dbe2dde972..69fac02073 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.aws.ec2.domain.MonitoringState; import org.jclouds.aws.ec2.xml.MonitoringStateHandler; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java index e165509554..7103343029 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java index 3190e60ee7..fffc7fc318 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java @@ -19,9 +19,9 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks; import org.jclouds.aws.ec2.binders.BindRouteTableIdsToIndexedFormParams; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java index d69ba25713..18687e649a 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java @@ -21,9 +21,9 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java index 1f69b26d7f..b5705fb41a 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java @@ -19,9 +19,9 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; import javax.inject.Named; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java index dc627ae10a..d276ffe658 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java index 9155b7ab11..efe00d1e79 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.functions; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.ssh.SshKeys.fingerprintPublicKey; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java index 72844f87a3..5fda399e51 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.predicates; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java index 9db4eec63b..8363dd671c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.predicates; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java index 8c483ef5f3..04bba04a0b 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.predicates; import java.util.NoSuchElementException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/BaseAWSReservationHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/BaseAWSReservationHandler.java index 099f860fe1..ea9dd50451 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/BaseAWSReservationHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/BaseAWSReservationHandler.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.aws.ec2.domain.AWSRunningInstance; import org.jclouds.aws.ec2.domain.MonitoringState; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java index e316c1c7f3..147e3ebf64 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.xml; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.aws.ec2.domain.LaunchSpecification; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/InternetGatewayApiMockTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/InternetGatewayApiMockTest.java index 4733fb3ac1..e46e1524b5 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/InternetGatewayApiMockTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/InternetGatewayApiMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.features; -import static javax.ws.rs.core.Response.Status.PRECONDITION_FAILED; +import static jakarta.ws.rs.core.Response.Status.PRECONDITION_FAILED; import static org.jclouds.aws.ec2.options.InternetGatewayOptions.Builder.dryRun; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/RouteTableApiMockTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/RouteTableApiMockTest.java index e8eb5db093..9d2243b787 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/RouteTableApiMockTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/RouteTableApiMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.features; -import static javax.ws.rs.core.Response.Status.PRECONDITION_FAILED; +import static jakarta.ws.rs.core.Response.Status.PRECONDITION_FAILED; import static org.jclouds.aws.ec2.options.RouteOptions.Builder.destinationCidrBlock; import static org.jclouds.aws.ec2.options.RouteOptions.Builder.gatewayId; import static org.jclouds.aws.ec2.options.RouteTableOptions.Builder.dryRun; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java index b84235eb91..a6188868b6 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java @@ -20,7 +20,7 @@ import static com.google.common.base.Throwables.propagate; import static com.google.common.net.HttpHeaders.AUTHORIZATION; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java index cfa2d4997e..06caac3dc3 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java index fadc772618..8bb3cdc99b 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java @@ -18,7 +18,7 @@ package org.jclouds.azure.storage.handlers; import java.io.ByteArrayInputStream; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.Constants; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java index ece8176401..c149172743 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java @@ -21,7 +21,7 @@ import static org.jclouds.http.HttpUtils.releasePayload; import java.io.IOException; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.azure.storage.AzureStorageResponseException; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java index 38d3a47994..457869b39f 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java @@ -24,14 +24,14 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.TrueOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/azureblob/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java b/providers/azureblob/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java index e34965ea22..d60675bbc3 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.net.URI; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.jclouds.ContextBuilder; import org.jclouds.http.HttpRequest; diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java index 69ef7f61c8..bdc58905ae 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java @@ -19,7 +19,7 @@ package org.jclouds.azureblob.blobstore.integration; import java.io.IOException; import java.util.concurrent.ExecutionException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeApi.java index dc37478509..cbafac4282 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeApi.java @@ -17,7 +17,7 @@ package org.jclouds.azurecompute.arm; import java.io.Closeable; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.PathParam; import org.jclouds.azurecompute.arm.domain.ServicePrincipal; import org.jclouds.azurecompute.arm.features.ActivityLogAlertApi; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java index fbb1d7497f..e2323644ad 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java @@ -38,7 +38,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeImageExtension.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeImageExtension.java index 6cba2c4020..2ec4fba9df 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeImageExtension.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeImageExtension.java @@ -26,7 +26,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_S import java.net.URI; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.Constants; import org.jclouds.azurecompute.arm.AzureComputeApi; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java index 59fec2b3d2..3f8dfae833 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java @@ -30,7 +30,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java index 10b31743cd..bdf70347d1 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java @@ -16,7 +16,7 @@ */ package org.jclouds.azurecompute.arm.compute.functions; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java index 7359ace752..fb703c7823 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkArgument; import java.util.HashMap; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java index cc9de6cfd2..d313e1dbb4 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java @@ -30,7 +30,7 @@ import static org.jclouds.location.predicates.LocationPredicates.idEquals; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java index baba6f9767..196e319abf 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java index 7caec25e90..6e09de48c7 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.compute.loaders; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java index df6cfd2a6b..7a8e5daf91 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java index eba69c0de5..a4fab49939 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java @@ -28,7 +28,7 @@ import static org.jclouds.azurecompute.arm.domain.Subnet.extractVirtualNetwork; import java.util.Arrays; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java index 2faba3f134..4747dd0a22 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java @@ -19,8 +19,7 @@ package org.jclouds.azurecompute.arm.domain; import java.util.Date; import java.util.List; -import javax.annotation.Nullable; - +import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; import com.google.auto.value.AutoValue; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java index d0e9c80f98..284ab12882 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java @@ -21,13 +21,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.azurecompute.arm.domain.ActivityLogAlert; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java index 33c987aae2..9bd83fca15 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java @@ -19,13 +19,13 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java index cf5116c38b..5d0ea20110 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java @@ -22,13 +22,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java index 1ff43deeba..bbd7ab7874 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java @@ -20,15 +20,15 @@ import java.net.URI; import java.util.List; import javax.inject.Named; -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.jclouds.Fallbacks; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java index 407b8df4ea..5eedbf56d2 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java @@ -21,13 +21,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/GraphRBACApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/GraphRBACApi.java index 38de117392..e16503dca9 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/GraphRBACApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/GraphRBACApi.java @@ -16,10 +16,10 @@ */ package org.jclouds.azurecompute.arm.features; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.azurecompute.arm.config.GraphRBAC; import org.jclouds.azurecompute.arm.config.OAuthResource; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java index 96caa4029c..eebd0955a4 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java @@ -20,13 +20,13 @@ import java.net.URI; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/JobApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/JobApi.java index a854fed657..78ec8b155c 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/JobApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/JobApi.java @@ -20,9 +20,9 @@ import java.io.Closeable; import java.net.URI; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.azurecompute.arm.domain.ResourceDefinition; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java index b1673ce299..15bc4ad0ce 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java @@ -20,13 +20,13 @@ import java.net.URI; import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java index 4d8af399ee..df482e52cc 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java @@ -22,13 +22,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java index 257293ceae..1fe8d14a54 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java @@ -19,11 +19,11 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.azurecompute.arm.domain.Location; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java index 0f887b73ca..27321197b2 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java @@ -21,13 +21,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.azurecompute.arm.domain.MetricAlert; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java index ba62a28ecf..f92e2bec60 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java @@ -18,11 +18,11 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -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.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.azurecompute.arm.domain.MetricDefinition; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java index 03d19a193b..c5bc0bc1e0 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java @@ -18,11 +18,11 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -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.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.azurecompute.arm.domain.Metric; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java index 78c4547073..bb4c409f90 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java @@ -20,13 +20,13 @@ import java.net.URI; import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java index 7d2ad6a06f..8d81992b8f 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java @@ -20,13 +20,13 @@ import java.net.URI; import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java index 7404234c43..0b6a908704 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java @@ -20,13 +20,13 @@ import java.net.URI; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java index 32b3ccc38e..56781adcbf 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java @@ -19,10 +19,10 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.azurecompute.arm.domain.Offer; @@ -34,7 +34,7 @@ import org.jclouds.oauth.v2.filters.OAuthFilter; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.RequestFilters; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; /** * The Azure Resource Management API includes operations for managing the OS images in your subscription. diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java index 55d1cd6dcc..d041e953c7 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java @@ -19,13 +19,13 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java index 7c516216ea..0c075f3390 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java @@ -22,13 +22,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java index 56dd0d4bf9..8f7985a659 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java @@ -20,11 +20,11 @@ import java.io.Closeable; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.arm.domain.ResourceProviderMetaData; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java index 0c9399cfdd..b179fa19bc 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java @@ -21,15 +21,15 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -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.jclouds.Fallbacks; import org.jclouds.azurecompute.arm.domain.Availability; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java index 8f30d6cb08..7245d97fe3 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java @@ -19,13 +19,13 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java index b5917ce400..3495dc2795 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java @@ -19,10 +19,10 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.azurecompute.arm.domain.VMSize; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java index 3165b17932..66ee15b0be 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java @@ -20,14 +20,14 @@ import java.net.URI; import java.util.List; import java.util.Map; import javax.inject.Named; -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.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.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java index 76cb872d0a..0aaadd2bdd 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java @@ -20,15 +20,15 @@ import java.net.URI; import java.util.List; import java.util.Map; import javax.inject.Named; -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.jclouds.Fallbacks; import org.jclouds.azurecompute.arm.domain.Plan; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java index f6a237f4f4..bb51fdc9ca 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java @@ -34,13 +34,13 @@ import org.jclouds.rest.annotations.ResponseParser; import org.jclouds.rest.binders.BindToJsonPayload; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import java.io.Closeable; import java.net.URI; import java.util.List; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java index a5691740f1..9fbbf6c80b 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java @@ -19,14 +19,14 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java index 0fb62c35ce..a71f3ace8d 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java @@ -22,13 +22,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java index 3daaa9746e..7ca2a7b3dc 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java @@ -22,13 +22,13 @@ import java.util.List; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java index 07f7b5dcc7..bed03c5d50 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.handlers; import static org.jclouds.azurecompute.arm.handlers.AzureRateLimitRetryHandler.isRateLimitError; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java index 6c4de0857c..9f8b2e68d5 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java @@ -16,12 +16,12 @@ */ package org.jclouds.b2.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.b2.domain.Authorization; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java index 39e83ae6eb..47ee476564 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java @@ -16,15 +16,15 @@ */ package org.jclouds.b2.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.blobstore.attr.BlobScope; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java index bc8b235abd..975177d5fa 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.b2.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; @@ -24,11 +24,11 @@ import java.util.Collection; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jclouds.blobstore.attr.BlobScope; import org.jclouds.io.Payload; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java index 97dc13541d..b5ead4ad6b 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java @@ -16,19 +16,19 @@ */ package org.jclouds.b2.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.blobstore.attr.BlobScope; diff --git a/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java b/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java index 341506143c..6321897997 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java +++ b/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java @@ -19,7 +19,7 @@ package org.jclouds.b2.filters; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import org.jclouds.b2.B2Api; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java index b8f34ae750..cf7cae7e19 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java @@ -30,7 +30,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_T import java.util.List; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java index 62d15c0e5e..5a2c79e9f0 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java @@ -23,7 +23,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_R import java.util.NoSuchElementException; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java index 11594f8998..566645db4c 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java @@ -23,7 +23,7 @@ import static org.jclouds.digitalocean2.compute.internal.ImageInRegion.encodeId; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java index bc304b78eb..4ecc25cd36 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java index 4a7a8bd1b9..e1233b82ce 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java @@ -23,11 +23,11 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java index c2d9b71ad9..cd8353b4fd 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java @@ -23,14 +23,14 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java index 9803ac354a..1684d004ae 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java @@ -23,12 +23,12 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java index 4889c5d254..96bd43c83f 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java @@ -23,15 +23,15 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -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.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java index 9fb71280ec..081e8f4c07 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java @@ -23,10 +23,10 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java index 91658091f0..e6f74d53b7 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java @@ -23,10 +23,10 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404; import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java index b960c533c8..6b6168eddf 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java @@ -16,15 +16,15 @@ */ package org.jclouds.dynect.v3; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.io.Closeable; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.dynect.v3.domain.Job; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java index 471b39f0ac..f53b7fddba 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java @@ -17,9 +17,9 @@ package org.jclouds.dynect.v3.features; import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.dynect.v3.DynECTExceptions.JobStillRunningException; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java index 1392a6a350..6fb024d30f 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java @@ -17,9 +17,9 @@ package org.jclouds.dynect.v3.features; import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.dynect.v3.DynECTExceptions.JobStillRunningException; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java index f83c843c79..6620f7e9fd 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java @@ -16,18 +16,18 @@ */ package org.jclouds.dynect.v3.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Map; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java index 5997240fdc..536a5c00bc 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java @@ -17,11 +17,11 @@ package org.jclouds.dynect.v3.features; import javax.inject.Named; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jclouds.dynect.v3.DynECTFallbacks.FalseOn400; import org.jclouds.dynect.v3.domain.Session; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java index 122165410d..438c0337ec 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java @@ -16,17 +16,17 @@ */ package org.jclouds.dynect.v3.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.dynect.v3.DynECTExceptions.JobStillRunningException; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/AlwaysAddContentType.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/AlwaysAddContentType.java index 5f55af4cb1..2db97f266f 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/AlwaysAddContentType.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/AlwaysAddContentType.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.filters; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.http.HttpRequest.NON_PAYLOAD_METHODS; import org.jclouds.http.HttpException; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/SessionManager.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/SessionManager.java index 7a6aa69c10..6e72c97c6c 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/SessionManager.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/filters/SessionManager.java @@ -19,8 +19,8 @@ package org.jclouds.dynect.v3.filters; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; import org.jclouds.domain.Credentials; import org.jclouds.dynect.v3.domain.Session; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java index 47a6c48722..8239584f44 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.handlers; import static com.google.common.net.HttpHeaders.LOCATION; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java index a5672cd84f..3dc55c1f7f 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3; import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import java.io.IOException; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiExpectTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiExpectTest.java index c2b7fc5ccc..7780e0d1ef 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiExpectTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiExpectTest.java @@ -17,9 +17,9 @@ package org.jclouds.dynect.v3.features; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import org.jclouds.dynect.v3.DynECTApi; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiExpectTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiExpectTest.java index ab1037569f..aec9dce355 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiExpectTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiExpectTest.java @@ -17,9 +17,9 @@ package org.jclouds.dynect.v3.features; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import org.jclouds.dynect.v3.DynECTApi; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java index 70efad55f2..2be1f6be60 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java @@ -17,11 +17,11 @@ package org.jclouds.dynect.v3.features; import static com.google.common.net.HttpHeaders.ACCEPT; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.jclouds.dynect.v3.domain.RecordId.recordIdBuilder; import static org.jclouds.dynect.v3.domain.rdata.AData.a; import static org.testng.Assert.assertEquals; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/SessionApiExpectTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/SessionApiExpectTest.java index cb1cacddb9..8aad3ab5bc 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/SessionApiExpectTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/SessionApiExpectTest.java @@ -16,10 +16,10 @@ */ package org.jclouds.dynect.v3.features; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java index 34eff59f03..4b2193b1a1 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java @@ -17,12 +17,12 @@ package org.jclouds.dynect.v3.features; import static com.google.common.net.HttpHeaders.ACCEPT; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.HttpMethod.DELETE; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.DELETE; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java index 3f666af6a6..c03b9bdc06 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java @@ -17,9 +17,9 @@ package org.jclouds.dynect.v3.filters; import static com.google.common.io.Resources.getResource; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandlerExpectTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandlerExpectTest.java index bb59b736d1..abe9467fa1 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandlerExpectTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandlerExpectTest.java @@ -18,10 +18,10 @@ package org.jclouds.dynect.v3.handlers; import static com.google.common.net.HttpHeaders.ACCEPT; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.net.HttpHeaders.LOCATION; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.HttpMethod.PUT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.TEMPORARY_REDIRECT; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.PUT; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.TEMPORARY_REDIRECT; import org.jclouds.dynect.v3.DynECTApi; import org.jclouds.dynect.v3.internal.BaseDynECTApiExpectTest; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/internal/BaseDynECTExpectTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/internal/BaseDynECTExpectTest.java index bedad1c7d5..97afad5489 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/internal/BaseDynECTExpectTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/internal/BaseDynECTExpectTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ package org.jclouds.dynect.v3.internal; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; import org.jclouds.dynect.v3.config.DynECTHttpApiModule; import org.jclouds.http.HttpRequest; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/CreateSessionResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/CreateSessionResponseTest.java index def5fab923..cb3866591d 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/CreateSessionResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/CreateSessionResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Session; import org.jclouds.dynect.v3.internal.BaseDynECTParseTest; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java index 09546eb721..b0c3fda86e 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Job; import org.jclouds.dynect.v3.internal.BaseDynECTParseTest; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java index 9508f7ac93..61c5399911 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Job; import org.jclouds.dynect.v3.internal.BaseDynECTParseTest; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetAAAARecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetAAAARecordResponseTest.java index 25fbc0d164..821637b9b5 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetAAAARecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetAAAARecordResponseTest.java @@ -17,8 +17,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.rdata.AAAAData.aaaa; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.AAAAData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetARecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetARecordResponseTest.java index d4c3c61353..0a2f3445f2 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetARecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetARecordResponseTest.java @@ -17,8 +17,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.rdata.AData.a; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.AData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetCNAMERecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetCNAMERecordResponseTest.java index 4522e7c1b2..cc29786e9a 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetCNAMERecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetCNAMERecordResponseTest.java @@ -17,8 +17,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.rdata.CNAMEData.cname; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.CNAMEData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoRegionGroupResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoRegionGroupResponseTest.java index 7cf9471cda..05eb8ae0c1 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoRegionGroupResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoRegionGroupResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.RecordSet; import org.jclouds.dynect.v3.domain.RecordSet.Value; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoServiceResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoServiceResponseTest.java index 1b65e40d9d..1a926f115d 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoServiceResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoServiceResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.GeoService; import org.jclouds.dynect.v3.domain.Node; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetMXRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetMXRecordResponseTest.java index 51dcfb610e..75dd67c6aa 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetMXRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetMXRecordResponseTest.java @@ -17,8 +17,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.rdata.MXData.mx; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.MXData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetNSRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetNSRecordResponseTest.java index f388820344..9f9654b0cf 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetNSRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetNSRecordResponseTest.java @@ -17,8 +17,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.rdata.NSData.ns; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.NSData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetPTRRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetPTRRecordResponseTest.java index 17eaf4950c..9d5883eb29 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetPTRRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetPTRRecordResponseTest.java @@ -17,8 +17,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.rdata.PTRData.ptr; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.PTRData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java index 4865e9e150..f6622ea755 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java @@ -18,8 +18,8 @@ package org.jclouds.dynect.v3.parse; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.internal.BaseDynECTParseTest; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java index 35b2a27c95..4ceab50965 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java @@ -18,8 +18,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.Zone.SerialStyle.INCREMENT; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.SOARecord; import org.jclouds.dynect.v3.domain.rdata.SOAData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java index bcdc88c6c5..fdf2bc6a72 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.SPFData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java index 591f1a7b3e..8c92c7922b 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.SRVData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java index e2fb9e4ebd..28c5d53402 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.SSHFPData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetTXTRecordResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetTXTRecordResponseTest.java index 3250f667c6..63b873a8cd 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetTXTRecordResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetTXTRecordResponseTest.java @@ -17,8 +17,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.rdata.TXTData.txt; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Record; import org.jclouds.dynect.v3.domain.rdata.TXTData; diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetZoneResponseTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetZoneResponseTest.java index 5b8ed5ffcd..28f61440ab 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetZoneResponseTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetZoneResponseTest.java @@ -19,8 +19,8 @@ package org.jclouds.dynect.v3.parse; import static org.jclouds.dynect.v3.domain.Zone.SerialStyle.INCREMENT; import static org.jclouds.dynect.v3.domain.Zone.Type.PRIMARY; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.dynect.v3.domain.Zone; import org.jclouds.dynect.v3.internal.BaseDynECTParseTest; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java index 3e014d554c..53df537126 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java index 004af72c01..de777415b7 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java index a141ef3485..5ab90d5802 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java @@ -17,12 +17,12 @@ package org.jclouds.glesys.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.glesys.domain.Archive; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java index 6d96869ce8..7138d475eb 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java @@ -19,11 +19,11 @@ package org.jclouds.glesys.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.glesys.domain.Domain; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java index 41633c4242..c884395874 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java @@ -17,11 +17,11 @@ package org.jclouds.glesys.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.glesys.domain.EmailAccount; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java index bd5971cd1e..297873e5c9 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java @@ -17,13 +17,13 @@ package org.jclouds.glesys.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.glesys.domain.IpDetails; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java index ac20ce4ae1..7c033c2aac 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java @@ -20,12 +20,12 @@ import java.util.Map; import java.util.SortedMap; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/DomainApiExpectTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/DomainApiExpectTest.java index a0746373c1..64272602ce 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/features/DomainApiExpectTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/DomainApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.glesys.domain.Domain; import org.jclouds.glesys.domain.DomainRecord; diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java index de39e030be..ff65a69084 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.glesys.domain.EmailAccount; import org.jclouds.glesys.domain.EmailAlias; diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/IpApiExpectTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/IpApiExpectTest.java index c22324397e..059a4811d9 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/features/IpApiExpectTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/IpApiExpectTest.java @@ -19,7 +19,7 @@ package org.jclouds.glesys.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.glesys.domain.Cost; import org.jclouds.glesys.domain.IpDetails; diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiExpectTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiExpectTest.java index 0e48976064..f0ba4cd9a8 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiExpectTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiExpectTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.glesys.domain.AllowedArguments; import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java index 41448177a9..52b991ff4c 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.glesys.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.glesys.config.GleSYSParserModule; import org.jclouds.glesys.domain.Cost; diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java index 130508c3d0..87d0ffe684 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java @@ -18,8 +18,8 @@ package org.jclouds.glesys.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.glesys.config.GleSYSParserModule; import org.jclouds.json.BaseSetParserTest; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java index 5f80e74fb3..c21934b87f 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java index 1ca728645f..18cd90dc80 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java index 69cd599225..a618afbe66 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java @@ -22,7 +22,7 @@ import static org.jclouds.util.Predicates2.retry; import java.security.SecureRandom; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java index 3782f7d105..31ee542c36 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java @@ -26,9 +26,9 @@ import static org.jclouds.gogrid.reference.GoGridQueryParams.SERVER_ID_OR_NAME_K import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks; import org.jclouds.gogrid.binders.BindIdsToQueryParams; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java index 0b5e81fe51..2d3e1c0a84 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java @@ -23,8 +23,8 @@ import static org.jclouds.gogrid.reference.GoGridQueryParams.LOOKUP_LIST_KEY; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jclouds.gogrid.domain.Ip; import org.jclouds.gogrid.domain.Option; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java index 4f200c0c1b..8e6de02627 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java @@ -20,8 +20,8 @@ import static org.jclouds.gogrid.reference.GoGridHeaders.VERSION; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jclouds.gogrid.binders.BindIdsToQueryParams; import org.jclouds.gogrid.binders.BindObjectNameToGetJobsRequestQueryParams; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java index 6495aaef57..a192c713f6 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java @@ -24,9 +24,9 @@ import static org.jclouds.gogrid.reference.GoGridQueryParams.NAME_KEY; import java.util.List; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.jclouds.gogrid.binders.BindIdsToQueryParams; import org.jclouds.gogrid.binders.BindNamesToQueryParams; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java index 48da01bf39..360e7254b6 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java @@ -29,9 +29,9 @@ import static org.jclouds.gogrid.reference.GoGridQueryParams.SERVER_RAM_KEY; import java.util.Map; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks; import org.jclouds.domain.Credentials; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java index 65b4bf9565..8141db9544 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java @@ -21,7 +21,7 @@ import static com.google.common.hash.Hashing.md5; import static com.google.common.io.BaseEncoding.base16; import static java.lang.String.format; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java index 730f6225ca..fef51e8b8d 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java @@ -19,7 +19,7 @@ package org.jclouds.gogrid.predicates; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.gogrid.options.GetJobListOptions.Builder.latestJobForObjectByName; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.gogrid.domain.Job; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java index 4cfde590ae..2537f8b6ab 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java @@ -19,7 +19,7 @@ package org.jclouds.gogrid.predicates; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.gogrid.options.GetJobListOptions.Builder.latestJobForObjectByName; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Singleton; import org.jclouds.gogrid.domain.Job; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/GoogleCloudStorageApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/GoogleCloudStorageApi.java index eec52942f7..b1e3c33366 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/GoogleCloudStorageApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/GoogleCloudStorageApi.java @@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage; import java.io.Closeable; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.jclouds.googlecloudstorage.features.BucketAccessControlsApi; import org.jclouds.googlecloudstorage.features.BucketApi; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/binders/MultipartUploadBinder.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/binders/MultipartUploadBinder.java index 848b8c61a2..295eed772e 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/binders/MultipartUploadBinder.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/binders/MultipartUploadBinder.java @@ -17,8 +17,8 @@ package org.jclouds.googlecloudstorage.binders; import static com.google.common.base.Preconditions.checkNotNull; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Map; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java index 11deb80abc..88ec7954ad 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java @@ -26,7 +26,7 @@ import java.security.Signature; import java.security.SignatureException; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Provider; import org.jclouds.Constants; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java index 8bad4defb4..73c1cf4c31 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java @@ -16,19 +16,19 @@ */ package org.jclouds.googlecloudstorage.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java index 8636625b38..38f4b740f7 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java @@ -16,18 +16,18 @@ */ package org.jclouds.googlecloudstorage.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java index 8ec7e6ac27..922b827e6a 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java @@ -16,20 +16,20 @@ */ package org.jclouds.googlecloudstorage.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java index 32b5e7c13a..008d42d380 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java @@ -16,21 +16,21 @@ */ package org.jclouds.googlecloudstorage.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.Encoded; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Encoded; +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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java index b75040661d..020b445157 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java @@ -16,19 +16,19 @@ */ package org.jclouds.googlecloudstorage.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.Encoded; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Encoded; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +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 org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java index 9ec41ab6c4..14c820aa99 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java @@ -16,17 +16,17 @@ */ package org.jclouds.googlecloudstorage.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.googlecloudstorage.binders.UploadBinder; import org.jclouds.googlecloudstorage.domain.ResumableUpload; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java index 013071455d..9842328ea9 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java @@ -17,7 +17,7 @@ package org.jclouds.googlecloudstorage.handlers; import javax.inject.Singleton; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java index 4a48b58f9d..ad00dcfba8 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java @@ -26,7 +26,7 @@ import java.io.File; import java.io.IOException; import java.util.Properties; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.domain.Blob; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java index 119bd18231..de65519721 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.util.Properties; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.PageSet; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java index 79f96f6489..87b7510a87 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java @@ -20,7 +20,7 @@ package org.jclouds.googlecloudstorage.features; import static org.testng.Assert.assertEquals; import static org.testng.AssertJUnit.assertNull; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; import org.jclouds.googlecloudstorage.domain.templates.BucketAccessControlsTemplate; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java index 5c42617cea..77abe85729 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java @@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.AssertJUnit.assertNull; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java index 42804bee2b..6918e1c02b 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java @@ -20,7 +20,7 @@ package org.jclouds.googlecloudstorage.features; import static org.testng.Assert.assertEquals; import static org.testng.AssertJUnit.assertNull; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java index abf60100bb..4c57a7a84e 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java @@ -21,7 +21,7 @@ import static org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Obj import static org.testng.Assert.assertEquals; import static org.testng.AssertJUnit.assertNull; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.templates.ObjectAccessControlsTemplate; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageApiExpectTest; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java index 46a5f1800f..7e9e7b4acb 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.Bucket; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.DestinationPredefinedAcl; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java index a371af6a07..df2549d1e8 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java @@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertFalse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.RecordedRequest; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java index 441c255da1..dd15f26265 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.features; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java index f9e953c696..c7a9977157 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java @@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage.internal; import static com.google.common.base.Throwables.propagate; import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.googlecloud.config.GoogleCloudProperties.CREDENTIAL_TYPE; import static org.jclouds.googlecloud.config.GoogleCloudProperties.PROJECT_NAME; import static org.jclouds.oauth.v2.config.CredentialType.BEARER_TOKEN_CREDENTIALS; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java index dd3c644f00..6a790e9e10 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java @@ -42,7 +42,7 @@ import java.security.spec.InvalidKeySpecException; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.crypto.Crypto; import org.jclouds.googlecloudstorage.GoogleCloudStorageProviderMetadata; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java index 4544128c56..f4dcff6b92 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java index d7cac85903..52e6c6bf74 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java index 3f6a0d43f0..abd7346309 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecloudstorage.parse; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java index b3548f270f..e0a339706b 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java index df28169e99..716f0223ef 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloudstorage.domain.Bucket; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java index 0183d719cb..9a1232040b 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java index c449c429dd..79136d435a 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java index afc66aec16..c24677f134 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java @@ -19,8 +19,8 @@ package org.jclouds.googlecloudstorage.parse; import java.util.Arrays; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java index 0f155e3e7b..e9d6e22068 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecloudstorage.parse; import java.util.Arrays; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloudstorage.domain.Bucket; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java index 84d644a728..fb37059c29 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecloudstorage.parse; import java.util.Arrays; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloud.domain.ForwardingListPage; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java index 5e93f4fafc..4570f1f38d 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloudstorage.domain.Bucket; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java index 0cef68ed32..86cccf8b2f 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java index b4ccfa2c85..164eaccad4 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java index 426da0d4ca..b4954cbb2a 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java @@ -19,8 +19,8 @@ package org.jclouds.googlecloudstorage.parse; import java.util.Arrays; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java index 205622e512..241ea0e9c8 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObject.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObject.java index 811a928a84..29bc924d14 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObject.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObject.java @@ -18,8 +18,8 @@ package org.jclouds.googlecloudstorage.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; import org.jclouds.googlecloudstorage.domain.Owner; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObjectListTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObjectListTest.java index 081da69f0d..96b4876c25 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObjectListTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseGoogleCloudStorageObjectListTest.java @@ -19,8 +19,8 @@ package org.jclouds.googlecloudstorage.parse; import java.net.URI; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; import org.jclouds.googlecloudstorage.domain.ListPageWithPrefixes; diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseObjectRewriteResponse.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseObjectRewriteResponse.java index 2b4a2e3bb9..f79b1704a3 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseObjectRewriteResponse.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ParseObjectRewriteResponse.java @@ -18,8 +18,8 @@ package org.jclouds.googlecloudstorage.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; import org.jclouds.googlecloudstorage.domain.Owner; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java index 57fca7b0b9..38523d592d 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine; import java.io.Closeable; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.googlecloud.config.CurrentProject; import org.jclouds.googlecomputeengine.features.AddressApi; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java index 7fbef6d7c0..1adeddeeef 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java @@ -38,7 +38,7 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java index 010093ccf8..0ca39577d3 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java @@ -16,14 +16,14 @@ */ package org.jclouds.googlecomputeengine.compute.functions; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import java.net.URI; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java index 470cd9eb7c..07d532c05f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecomputeengine.compute.loaders; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; import java.net.URI; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java index ba4b6fdac1..e07caa4413 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java index 1525d1f214..09ec60c0fd 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.config; import static com.google.common.base.Suppliers.compose; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import static org.jclouds.googlecloud.config.GoogleCloudProperties.PROJECT_NAME; import static org.jclouds.rest.config.BinderUtils.bindHttpApi; @@ -29,10 +29,10 @@ import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.domain.Credentials; import org.jclouds.googlecloud.config.CurrentProject; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java index 801fb41684..d41f48fb71 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java @@ -16,20 +16,20 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java index f21d051d9b..09fb096e26 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java @@ -16,16 +16,16 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.jclouds.googlecloud.domain.ListPage; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java index 629a342a88..270ed9bbaf 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java @@ -16,22 +16,22 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java index ce826d0bce..c67e2b7c27 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java @@ -16,20 +16,20 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java index c4a6d60ae4..2738043343 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java @@ -16,17 +16,17 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java index 6627d53451..734b7f7b6d 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java @@ -16,22 +16,22 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java index 220dbdc389..b871022004 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java @@ -16,21 +16,21 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java index 17be6788e2..4631a55c04 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java @@ -16,21 +16,21 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java index 58d206eeb8..5de4026ab6 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java @@ -16,21 +16,21 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.config.CurrentProject; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java index 7391490200..81c281d4b0 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java @@ -16,20 +16,20 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java index 9301fc55fa..49d9ffc046 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java @@ -16,13 +16,13 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecomputeengine.domain.License; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java index 7515ad192a..921df1a2fb 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java @@ -16,17 +16,17 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java index 532c20781a..77c91c1e2b 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java @@ -16,20 +16,20 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java index 2ec289ed72..07cefde54f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java @@ -16,19 +16,19 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java index c33aceddc2..925563dff8 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java @@ -16,14 +16,14 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jclouds.googlecomputeengine.GoogleComputeEngineFallbacks.NullOn400or404; import org.jclouds.googlecomputeengine.domain.Metadata; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java index 6d9d2797b5..53ca499db8 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java @@ -16,17 +16,17 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java index e6cbbb3ae5..cba032c90b 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java @@ -16,21 +16,21 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java index 13c1a35824..3db2db4e5e 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java @@ -16,18 +16,18 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java index 576c36f6ba..e6366e6f52 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java @@ -16,20 +16,20 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java index 97c45d4704..e58d8adca9 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java @@ -21,15 +21,15 @@ import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java index 6d2c3ccf13..5f0049aa75 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java @@ -16,20 +16,20 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java index 6d57086295..a7b90b07e4 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; @@ -24,14 +24,14 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java index d77c542447..cbe9294bf6 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java @@ -16,22 +16,22 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -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 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 org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java index 0a5ec67086..7497a96240 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java @@ -16,17 +16,17 @@ */ package org.jclouds.googlecomputeengine.features; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java index f5d82538d3..548f4a912c 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.internal; import static com.google.common.base.Throwables.propagate; import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED; import static org.jclouds.googlecloud.config.GoogleCloudProperties.CREDENTIAL_TYPE; import static org.jclouds.googlecloud.config.GoogleCloudProperties.PROJECT_NAME; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java index 59b5e1f1c3..6d8343b66e 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java @@ -19,7 +19,7 @@ package org.jclouds.googlecomputeengine.internal; import static com.google.common.base.Charsets.UTF_8; import static com.google.common.base.Throwables.propagate; import static com.google.common.io.BaseEncoding.base64Url; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.googlecloud.config.GoogleCloudProperties.PROJECT_NAME; import static org.jclouds.oauth.v2.config.OAuthProperties.JWS_ALG; import static org.jclouds.util.Strings2.toStringAndClose; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java index 50d58edce7..6477b32c2a 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressTest.java index 454822cfb7..e13120efa7 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Address; import org.jclouds.googlecomputeengine.domain.Address.Status; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceListTest.java index 992d446ba7..f1354a429f 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.BackendService; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceTest.java index dc99239fb2..8814c935b0 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseBackendServiceTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.BackendService; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java index 2f6ca3deaf..0f406c124b 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java index d7784bb468..6f4bd17fee 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Disk; import org.jclouds.googlecomputeengine.domain.Disk.Status; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java index b7961862ad..c8c2bf9062 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeTest.java index 564977ea62..ec48cc9905 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.DiskType; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java index 0fa6737d3a..4963af7034 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java index 4a20dc7630..fefe9225f3 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Firewall; import org.jclouds.googlecomputeengine.domain.Firewall.Rule; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java index 9e17644952..1376b6a62d 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleTest.java index ce21f9b717..5d27001462 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.ForwardingRule; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleListTest.java index 45b615993c..10aacab30f 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleTest.java index d79737859b..8cf750eb8d 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalForwardingRuleTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.ForwardingRule; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java index 1a837ea529..17d484f751 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationTest.java index 2d12ba93cb..6765076847 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHealthStatusTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHealthStatusTest.java index b425db99a9..f347a10baf 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHealthStatusTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHealthStatusTest.java @@ -16,10 +16,10 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.HealthStatus; import org.jclouds.googlecomputeengine.domain.HealthStatus.HealthStatusInternal; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java index 360bc2befe..6e6863d59f 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckTest.java index 2e655f7fb5..cb55454429 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.HttpHealthCheck; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java index 16c66e5544..2d07ef211b 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java index 761ae0c66e..6743086718 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Deprecated; import org.jclouds.googlecomputeengine.domain.Deprecated.State; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java index 67acdc5c5b..2e4681ced8 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java index 254df8cef0..b16bb8ed95 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Instance.SerialPortOutput; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java index 59a65342e1..186e3ab470 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import java.net.URI; import com.google.common.collect.ImmutableList; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseLicenseTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseLicenseTest.java index 519c4d50da..786e13bdc6 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseLicenseTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseLicenseTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.License; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java index 2d5977e47e..033e86915c 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java index 942cf1c5af..4c7c10ef93 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.MachineType; import org.jclouds.googlecomputeengine.domain.MachineType.ScratchDisk; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMetadataTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMetadataTest.java index 3a43b9e66f..9334ece38b 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMetadataTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMetadataTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Metadata; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java index f6d92fadd0..3b11edb8c1 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java index 7592c82235..f4fa86e405 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java @@ -16,12 +16,12 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Collections; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Network; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java index 8d138a978c..5594289ff4 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.KeyValuePair; import org.jclouds.googlecomputeengine.domain.Operation; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java index fcc3e0016c..71953bc780 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.Metadata; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java index 31c563b5ad..efbf9bd891 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Quota; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java index e24bf4c65c..5ce1dceb6e 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java index 77dcfe91d8..4999213837 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java index 611c794217..02d0e3ac28 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Quota; import org.jclouds.googlecomputeengine.domain.Region; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java index e447e4e13a..9c50de3c0d 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java index 4f952c15ac..52bfda0295 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.KeyValuePair; import org.jclouds.googlecomputeengine.domain.Route; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java index b3c0f666ff..7e840f0373 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java index 6f922c46e7..c8de4d8cbf 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Snapshot; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java index a978ade635..51c455d651 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java index cac3badd65..899ecd4524 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Subnetwork; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyListTest.java index 4c0a3d2f20..8a5625d386 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyListTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloud.domain.ForwardingListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyTest.java index 47ce80b457..455b948120 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetHttpProxyTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.TargetHttpProxy; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceListTest.java index 694dd0bde1..87a1ee036f 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceTest.java index ab78036eac..2fd9d38c0d 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetInstanceTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.TargetInstance; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java index b53f805574..a039ff7907 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java index febd33c5ad..fc70dac6e9 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.googlecomputeengine.domain.TargetPool; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java index a5b30c4ad3..1a5d69c439 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloud.domain.ForwardingListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java index f266f6ddb7..2e97150849 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java @@ -19,8 +19,8 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.UrlMap; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java index 06fdc6b9d8..bdf4caf468 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java @@ -17,9 +17,9 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.UrlMapValidateResult; import org.jclouds.googlecomputeengine.domain.UrlMapValidateResult.UrlMapValidateResultInternal.TestFailure; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java index 9bd0930036..3dd3db114e 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecloud.domain.ForwardingListPage; import org.jclouds.googlecloud.domain.ListPage; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java index 3a3b935ccd..f8ad673c8d 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java index 7bfd66c08e..6590d56c10 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java @@ -16,11 +16,11 @@ */ package org.jclouds.googlecomputeengine.parse; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Zone; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; diff --git a/providers/packet/src/main/java/org/jclouds/packet/PacketApi.java b/providers/packet/src/main/java/org/jclouds/packet/PacketApi.java index e5f84e33f2..e5f9935c64 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/PacketApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/PacketApi.java @@ -18,7 +18,7 @@ package org.jclouds.packet; import java.io.Closeable; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.PathParam; import org.jclouds.packet.features.DeviceApi; import org.jclouds.packet.features.FacilityApi; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java b/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java index 3672b14125..16951f88d1 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java @@ -19,7 +19,7 @@ package org.jclouds.packet.compute; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java index ec222fc40b..08bdc05d0f 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java @@ -18,7 +18,7 @@ package org.jclouds.packet.compute.functions; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java b/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java index 09f0e90260..e14c0cb52a 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java index cae9305068..b11ebd1409 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java @@ -21,14 +21,14 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java index bde989858d..2c5ff66e98 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java @@ -21,10 +21,10 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.collect.IterableWithMarker; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java index 401b1e9ff2..527392d3d7 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java @@ -21,10 +21,10 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.collect.IterableWithMarker; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java index 7ed5c3ac2b..6182aa77f3 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java @@ -21,10 +21,10 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.collect.IterableWithMarker; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java index 9da50d0f16..bd07ec7713 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java @@ -21,10 +21,10 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.collect.IterableWithMarker; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java index cd221078c0..ca3fc979fe 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java @@ -21,14 +21,14 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.DELETE; +import jakarta.ws.rs.GET; +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.jclouds.Fallbacks; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/binder/BaseProfitBricksRequestBinder.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/binder/BaseProfitBricksRequestBinder.java index 2b842fff43..80e9a70a7e 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/binder/BaseProfitBricksRequestBinder.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/binder/BaseProfitBricksRequestBinder.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java index c92c6a0758..4018595763 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java @@ -28,7 +28,7 @@ import static org.jclouds.profitbricks.config.ProfitBricksComputeProperties.POLL import java.util.List; import java.util.concurrent.Callable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningManager.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningManager.java index 820cafeb4e..8685e9310a 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningManager.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningManager.java @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.jclouds.concurrent.config.WithSubmissionTrace; import org.jclouds.logging.Logger; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java index f7db219005..328e0a3928 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java @@ -23,7 +23,7 @@ import static org.jclouds.profitbricks.config.ProfitBricksComputeProperties.POLL import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java index f6607303fb..733615278b 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java @@ -19,10 +19,10 @@ package org.jclouds.profitbricks.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java index 70f70a0526..5553aadfff 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java @@ -17,10 +17,10 @@ package org.jclouds.profitbricks.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.profitbricks.binder.drive.AddRomDriveToServerRequestBinder; import org.jclouds.profitbricks.domain.Drive; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java index f0aefb94be..660101f0cf 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java @@ -19,10 +19,10 @@ package org.jclouds.profitbricks.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java index 95d27c41f7..22b1981219 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java @@ -19,10 +19,10 @@ package org.jclouds.profitbricks.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java index ca9841d8ad..209b729cb0 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java @@ -19,10 +19,10 @@ package org.jclouds.profitbricks.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java index 6cf8e23206..91dafa9900 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java @@ -17,10 +17,10 @@ package org.jclouds.profitbricks.features; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java index c9459352a3..a0cf45594a 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java @@ -33,10 +33,10 @@ import org.jclouds.rest.annotations.MapBinder; import org.jclouds.rest.annotations.PayloadParam; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.POST; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.POST; import java.util.List; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java index 344797d085..3b9de69eb8 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java @@ -18,10 +18,10 @@ package org.jclouds.profitbricks.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.profitbricks.binder.server.CreateServerRequestBinder; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java index 3faa3868af..ee735a516d 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java @@ -19,10 +19,10 @@ package org.jclouds.profitbricks.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java index 0589af627c..6641befc32 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java @@ -19,10 +19,10 @@ package org.jclouds.profitbricks.features; import java.util.List; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java index aaea69acb1..9846bcf035 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java @@ -24,8 +24,8 @@ import java.net.URL; import java.util.Properties; import java.util.Set; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java index c435352e4b..782e93e83f 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java @@ -19,7 +19,7 @@ package org.jclouds.softlayer.compute.functions; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java index 5a5b3cc509..f9972f08f3 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java @@ -18,7 +18,7 @@ package org.jclouds.softlayer.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java index 0a76c700f4..58132fdcc3 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java index cb64c65c82..b4b7ef523c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java index f8c883f8ca..26e7ea175e 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java @@ -19,10 +19,10 @@ package org.jclouds.softlayer.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java index 646b8e5383..3b3b210d02 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java @@ -18,11 +18,11 @@ package org.jclouds.softlayer.features; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java index a05e00e71f..75d58f8043 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java @@ -27,16 +27,16 @@ import org.jclouds.softlayer.domain.Network; import org.jclouds.softlayer.domain.Subnet; import javax.inject.Named; -import javax.ws.rs.Path; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.PathParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.DELETE; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.io.Closeable; import java.util.List; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/SoftwareDescriptionApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/SoftwareDescriptionApi.java index fdbc1ca6c2..4e41774ea3 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/SoftwareDescriptionApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/SoftwareDescriptionApi.java @@ -18,10 +18,10 @@ package org.jclouds.softlayer.features; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.MediaType; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java index 2d5ecf3ffe..0afea22776 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java @@ -19,14 +19,14 @@ package org.jclouds.softlayer.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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.GET; +import jakarta.ws.rs.POST; +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.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java index ee2c0acf42..5055e15156 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java @@ -19,11 +19,11 @@ package org.jclouds.softlayer.features; import java.util.Set; import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.PathParam; +import jakarta.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java index d9e2f51121..76b7de6c24 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java @@ -19,7 +19,7 @@ package org.jclouds.softlayer.compute; import static org.testng.Assert.assertEquals; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import org.jclouds.compute.RunNodesException; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/internal/BaseSoftLayerMockTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/internal/BaseSoftLayerMockTest.java index 0eecb0a6df..4a7f74a064 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/internal/BaseSoftLayerMockTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/internal/BaseSoftLayerMockTest.java @@ -24,8 +24,8 @@ import static org.jclouds.util.Strings2.toStringAndClose; import java.io.IOException; import java.util.Properties; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java index 90601dc1dd..026b4a568f 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.softlayer.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.softlayer.domain.VirtualGuest; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacenterParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacenterParseTest.java index 2aa5bf63e1..dbe12dc96d 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacenterParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacenterParseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.softlayer.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.softlayer.domain.Address; import org.jclouds.softlayer.domain.Datacenter; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java index c7ab6630de..47261e166f 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.softlayer.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.softlayer.domain.Datacenter; import org.jclouds.softlayer.internal.BaseSoftLayerParseTest; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java index 1945c4f6ca..ec4d4946a9 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java @@ -27,8 +27,8 @@ import org.jclouds.softlayer.domain.VirtualGuestBlockDevice; import org.jclouds.softlayer.domain.VirtualGuestNetworkComponent; import org.jclouds.softlayer.internal.BaseSoftLayerParseTest; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; public class GetCreateObjectOptionsParseTest extends BaseSoftLayerParseTest { diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java index 2d3a47f357..ccdf254f9c 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.softlayer.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.softlayer.domain.SoftwareDescription; import org.jclouds.softlayer.domain.VirtualDiskImage; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java index a28988f962..e7b5fdce38 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.softlayer.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.softlayer.domain.SoftwareDescription; import org.jclouds.softlayer.internal.BaseSoftLayerParseTest; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupParseTest.java index babdc88ba1..c5ad3a4973 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupParseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.softlayer.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.softlayer.domain.SoftwareDescription; import org.jclouds.softlayer.domain.VirtualDiskImage; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupsParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupsParseTest.java index e8d5069f52..d6a8a6c2f3 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupsParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestBlockDeviceTemplateGroupsParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.softlayer.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.softlayer.domain.SoftwareDescription; import org.jclouds.softlayer.domain.VirtualDiskImage; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestFilteredParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestFilteredParseTest.java index 8d4c57afad..a7a25931fe 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestFilteredParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestFilteredParseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.softlayer.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.softlayer.domain.NetworkVlan; import org.jclouds.softlayer.domain.VirtualGuest; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestParseTest.java index dccdc62637..7fb4306a8e 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestParseTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.softlayer.parse; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.softlayer.domain.VirtualGuest; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestsParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestsParseTest.java index 792e08edde..60963336b5 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestsParseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/VirtualGuestsParseTest.java @@ -18,8 +18,8 @@ package org.jclouds.softlayer.parse; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.softlayer.domain.VirtualGuest; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java index 7e63c46920..9e57b46ea1 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java @@ -19,7 +19,7 @@ package org.jclouds.ultradns.ws; import java.io.Closeable; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.Payload; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java index 9685d2b20a..2616be361d 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.features; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java index aa0c6c4a26..b738aabb4a 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java @@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.features; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java index b3cdfbc166..578bb548d2 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.features; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.rest.ResourceNotFoundException; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java index b12a30e98e..a232bb42af 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.features; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.rest.ResourceNotFoundException; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java index e3e54a6d41..bc3b23b826 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.features; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java index ddca1d9f4a..b175d16db5 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.features; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java index ba41f10b93..f3628feb35 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.features; import javax.inject.Named; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/UltraDNSWSApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/UltraDNSWSApiExpectTest.java index 80d51ecbad..f235b71a1f 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/UltraDNSWSApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/UltraDNSWSApiExpectTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.ultradns.ws; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import org.jclouds.http.HttpRequest; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiExpectTest.java index 2b57e54aaf..322133c9c0 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiExpectTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.ultradns.ws.features; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import org.jclouds.http.HttpRequest; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalPoolApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalPoolApiExpectTest.java index 6307996a7c..21b6a6b44a 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalPoolApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalPoolApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.ultradns.ws.features; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.jclouds.ultradns.ws.domain.DirectionalPool.RecordType.IPV4; import static org.testng.Assert.assertEquals; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ResourceRecordApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ResourceRecordApiExpectTest.java index 455ca32f11..dd58102dc4 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ResourceRecordApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ResourceRecordApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.ultradns.ws.features; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.jclouds.ultradns.ws.domain.ResourceRecord.rrBuilder; import static org.testng.Assert.assertEquals; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApiExpectTest.java index c8617aaab7..c0d5966194 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.ultradns.ws.features; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.jclouds.ultradns.ws.domain.RoundRobinPool.RecordType.A; import static org.jclouds.ultradns.ws.domain.RoundRobinPool.RecordType.AAAA; import static org.testng.Assert.assertEquals; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TaskApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TaskApiExpectTest.java index eb8c22485b..e956b775aa 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TaskApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TaskApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.ultradns.ws.features; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiExpectTest.java index 3107d9fced..09c4ab0e7f 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.ultradns.ws.features; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.jclouds.ultradns.ws.domain.TrafficControllerPool.RecordType.IPV4; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ZoneApiExpectTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ZoneApiExpectTest.java index f062e93734..b7585ed890 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ZoneApiExpectTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/ZoneApiExpectTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.ultradns.ws.features; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandlerTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandlerTest.java index 4540cf256f..b05945456e 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandlerTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandlerTest.java @@ -17,8 +17,8 @@ package org.jclouds.ultradns.ws.handlers; import static com.google.common.base.Throwables.propagate; import static com.google.common.net.HttpHeaders.HOST; -import static javax.ws.rs.HttpMethod.POST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.jclouds.rest.internal.BaseRestApiExpectTest.payloadFromStringWithContentType; import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java index c76c6abcfa..3f9e2f36c2 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java @@ -16,7 +16,7 @@ */ package org.jclouds.servermanager.compute.functions; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton;