This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch jakartaee9 in repository https://gitbox.apache.org/repos/asf/archiva-components.git
commit f6d63b6d74d4450392ffb0b740fc0dfbed080bfc Author: Martin Schreier <[email protected]> AuthorDate: Fri Jan 7 15:51:57 2022 +0100 Package updates for jakarta ee --- .../main/java/org/apache/archiva/components/rest/util/RestUtil.java | 4 ++-- .../apache/archiva/components/cache/builder/DefaultCacheBuilder.java | 4 ++-- .../org/apache/archiva/components/cache/ehcache/EhcacheCache.java | 4 ++-- .../org/apache/archiva/components/cache/hashmap/HashMapCache.java | 2 +- .../org/apache/archiva/components/scheduler/DefaultScheduler.java | 4 ++-- .../components/registry/commons/CommonsConfigurationRegistry.java | 2 +- .../components/taskqueue/execution/ThreadedTaskQueueExecutor.java | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rest-util/src/main/java/org/apache/archiva/components/rest/util/RestUtil.java b/rest-util/src/main/java/org/apache/archiva/components/rest/util/RestUtil.java index da745a6..71056f3 100644 --- a/rest-util/src/main/java/org/apache/archiva/components/rest/util/RestUtil.java +++ b/rest-util/src/main/java/org/apache/archiva/components/rest/util/RestUtil.java @@ -18,8 +18,8 @@ package org.apache.archiva.components.rest.util;/* import org.apache.commons.lang3.StringUtils; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; /** * Central utility class that may be used by service implementations. diff --git a/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/components/cache/builder/DefaultCacheBuilder.java b/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/components/cache/builder/DefaultCacheBuilder.java index 961d439..ec5f9be 100644 --- a/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/components/cache/builder/DefaultCacheBuilder.java +++ b/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/components/cache/builder/DefaultCacheBuilder.java @@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; /** * Ability to obtain cache diff --git a/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/components/cache/ehcache/EhcacheCache.java b/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/components/cache/ehcache/EhcacheCache.java index 4559cf9..1f170d6 100644 --- a/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/components/cache/ehcache/EhcacheCache.java +++ b/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/components/cache/ehcache/EhcacheCache.java @@ -34,8 +34,8 @@ import org.ehcache.expiry.ExpiryPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/components/cache/hashmap/HashMapCache.java b/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/components/cache/hashmap/HashMapCache.java index 7b206ea..720553e 100644 --- a/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/components/cache/hashmap/HashMapCache.java +++ b/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/components/cache/hashmap/HashMapCache.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/DefaultScheduler.java b/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/DefaultScheduler.java index 650c8a1..5804171 100644 --- a/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/DefaultScheduler.java +++ b/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/DefaultScheduler.java @@ -33,8 +33,8 @@ import org.quartz.utils.Key; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.util.Properties; public class DefaultScheduler diff --git a/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/components/registry/commons/CommonsConfigurationRegistry.java b/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/components/registry/commons/CommonsConfigurationRegistry.java index a8f0d55..fa4ac3c 100644 --- a/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/components/registry/commons/CommonsConfigurationRegistry.java +++ b/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/components/registry/commons/CommonsConfigurationRegistry.java @@ -47,7 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.StringReader; import java.nio.file.Files; import java.nio.file.Path; diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java index 017258c..7e0a62f 100644 --- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java +++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java @@ -26,8 +26,8 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService;
