You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2022/01/07 14:52:16 UTC
[archiva-components] branch jakartaee9 created (now f6d63b6)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch jakartaee9
in repository https://gitbox.apache.org/repos/asf/archiva-components.git.
at f6d63b6 Package updates for jakarta ee
This branch includes the following new commits:
new 9db7384 Adding changes for jakarta EE 9
new f6d63b6 Package updates for jakarta ee
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[archiva-components] 01/02: Adding changes for jakarta EE 9
Posted by ma...@apache.org.
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 9db7384bbed984ef383b40239edf11bf19dad07e
Author: Martin Schreier <ma...@apache.org>
AuthorDate: Fri Jan 7 15:33:08 2022 +0100
Adding changes for jakarta EE 9
---
expression-evaluator/pom.xml | 4 ++--
graph/pom.xml | 2 +-
pom.xml | 15 +++++++++++++--
rest-util/pom.xml | 2 +-
spring-apacheds/pom.xml | 4 ++--
.../apache/archiva/components/apacheds/ApacheDsTest.java | 2 +-
spring-cache/pom.xml | 4 ++--
spring-cache/spring-cache-api/pom.xml | 2 +-
.../components/cache/builder/DefaultCacheBuilder.java | 2 +-
spring-cache/spring-cache-providers/pom.xml | 2 +-
.../spring-cache-providers/spring-cache-ehcache/pom.xml | 2 +-
.../components/cache/ehcache/EhCacheDiskPathTest.java | 4 ++--
.../components/cache/ehcache/EhcacheCacheTest.java | 4 ++--
.../spring-cache-providers/spring-cache-hashmap/pom.xml | 2 +-
.../components/cache/hashmap/HashMapCacheTest.java | 6 +++---
spring-cache/spring-cache-test/pom.xml | 2 +-
.../cache/test/examples/wine/AbstractTestWineService.java | 4 ++--
.../cache/test/examples/wine/DefaultWineService.java | 2 +-
spring-quartz/pom.xml | 4 ++--
.../scheduler/configuration/SchedulerConfiguration.java | 2 +-
.../components/scheduler/CronExpressionValidatorTest.java | 2 +-
.../archiva/components/scheduler/SchedulerTest.java | 2 +-
spring-registry/pom.xml | 4 ++--
spring-registry/spring-registry-api/pom.xml | 2 +-
spring-registry/spring-registry-commons/pom.xml | 2 +-
.../components/registry/test/AbstractRegistryTest.java | 2 +-
spring-taskqueue/pom.xml | 4 ++--
.../archiva/components/taskqueue/TaskQueueTest.java | 4 ++--
.../taskqueue/execution/TaskQueueExecutorTest.java | 4 ++--
29 files changed, 54 insertions(+), 43 deletions(-)
diff --git a/expression-evaluator/pom.xml b/expression-evaluator/pom.xml
index 0c98640..941946a 100644
--- a/expression-evaluator/pom.xml
+++ b/expression-evaluator/pom.xml
@@ -25,10 +25,10 @@
<parent>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<artifactId>archiva-components-expression-evaluator</artifactId>
<name>Archiva Components :: Expression Evaluator</name>
<description>Small module that provides interface and implementation for variable expansion in texts</description>
diff --git a/graph/pom.xml b/graph/pom.xml
index 3d265f2..7248ca6 100644
--- a/graph/pom.xml
+++ b/graph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>archiva-components</artifactId>
<groupId>org.apache.archiva.components</groupId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-components-graph</artifactId>
diff --git a/pom.xml b/pom.xml
index ed6b3e5..724f638 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-parent</artifactId>
- <version>19-SNAPSHOT</version>
+ <version>19.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Archiva Components :: Parent</name>
@@ -99,6 +99,17 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>spring.milestone</id>
+ <name>Repository for SPRING milestone releases</name>
+ <url>https://repo.spring.io/milestone</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
diff --git a/rest-util/pom.xml b/rest-util/pom.xml
index ecc9f78..ea8d8c5 100644
--- a/rest-util/pom.xml
+++ b/rest-util/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>archiva-components</artifactId>
<groupId>org.apache.archiva.components</groupId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Archiva Components :: REST Utility</name>
diff --git a/spring-apacheds/pom.xml b/spring-apacheds/pom.xml
index a37c88d..5bace84 100644
--- a/spring-apacheds/pom.xml
+++ b/spring-apacheds/pom.xml
@@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<artifactId>archiva-components-spring-apacheds</artifactId>
<name>Archiva Components :: Spring Apache DS LDAP Tools</name>
diff --git a/spring-apacheds/src/test/java/org/apache/archiva/components/apacheds/ApacheDsTest.java b/spring-apacheds/src/test/java/org/apache/archiva/components/apacheds/ApacheDsTest.java
index 073e2d3..42fca42 100644
--- a/spring-apacheds/src/test/java/org/apache/archiva/components/apacheds/ApacheDsTest.java
+++ b/spring-apacheds/src/test/java/org/apache/archiva/components/apacheds/ApacheDsTest.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
diff --git a/spring-cache/pom.xml b/spring-cache/pom.xml
index 0d594af..27a5ff1 100644
--- a/spring-cache/pom.xml
+++ b/spring-cache/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache</artifactId>
<name>Archiva Components :: Spring Cache</name>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Cache API with various implementations : simple HashMap, ehcache. Based on Spring container.
diff --git a/spring-cache/spring-cache-api/pom.xml b/spring-cache/spring-cache-api/pom.xml
index 5b90938..84d7d29 100644
--- a/spring-cache/spring-cache-api/pom.xml
+++ b/spring-cache/spring-cache-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-components-spring-cache-api</artifactId>
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 15bcf3c..961d439 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
@@ -19,6 +19,7 @@ package org.apache.archiva.components.cache.builder;
* under the License.
*/
+import jakarta.inject.Inject;
import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.components.cache.impl.NoCacheCache;
import org.slf4j.Logger;
@@ -28,7 +29,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.inject.Inject;
/**
* Ability to obtain cache
diff --git a/spring-cache/spring-cache-providers/pom.xml b/spring-cache/spring-cache-providers/pom.xml
index 76ab972..c498402 100644
--- a/spring-cache/spring-cache-providers/pom.xml
+++ b/spring-cache/spring-cache-providers/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-components-spring-cache-providers</artifactId>
<name>Archiva Components :: Spring Cache Providers</name>
diff --git a/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml b/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
index 30146ee..788d617 100644
--- a/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
+++ b/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-providers</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
diff --git a/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhCacheDiskPathTest.java b/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhCacheDiskPathTest.java
index ba9471a..0f3fc75 100644
--- a/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhCacheDiskPathTest.java
+++ b/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhCacheDiskPathTest.java
@@ -25,8 +25,8 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.File;
/**
diff --git a/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhcacheCacheTest.java b/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhcacheCacheTest.java
index 8d64a29..1cdb02c 100644
--- a/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhcacheCacheTest.java
+++ b/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/components/cache/ehcache/EhcacheCacheTest.java
@@ -21,8 +21,8 @@ import org.apache.archiva.components.cache.test.AbstractCacheTestCase;
import org.apache.archiva.components.cache.test.examples.wine.Wine;
import org.springframework.test.annotation.DirtiesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* EhcacheCacheTest
diff --git a/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml b/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
index 11ce26d..f969acb 100644
--- a/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
+++ b/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-providers</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-components-spring-cache-hashmap</artifactId>
diff --git a/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/components/cache/hashmap/HashMapCacheTest.java b/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/components/cache/hashmap/HashMapCacheTest.java
index d31bd13..7dd72c3 100644
--- a/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/components/cache/hashmap/HashMapCacheTest.java
+++ b/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/components/cache/hashmap/HashMapCacheTest.java
@@ -20,8 +20,8 @@ import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.components.cache.test.AbstractCacheTestCase;
import org.apache.archiva.components.cache.test.examples.wine.Wine;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* HashMapCacheTest
@@ -86,4 +86,4 @@ public class HashMapCacheTest
return HashMapCache.class;
}
-}
\ No newline at end of file
+}
diff --git a/spring-cache/spring-cache-test/pom.xml b/spring-cache/spring-cache-test/pom.xml
index b5c293c..7975363 100644
--- a/spring-cache/spring-cache-test/pom.xml
+++ b/spring-cache/spring-cache-test/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-components-spring-cache-test</artifactId>
<name>Archiva Components :: Spring Cache Tests</name>
diff --git a/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/AbstractTestWineService.java b/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/AbstractTestWineService.java
index 482eb6f..6983401 100644
--- a/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/AbstractTestWineService.java
+++ b/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/AbstractTestWineService.java
@@ -26,8 +26,8 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* @author Olivier Lamy
diff --git a/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/DefaultWineService.java b/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/DefaultWineService.java
index 39e2353..49c809b 100644
--- a/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/DefaultWineService.java
+++ b/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/components/cache/test/examples/wine/DefaultWineService.java
@@ -22,7 +22,7 @@ package org.apache.archiva.components.cache.test.examples.wine;
import org.apache.archiva.components.cache.builder.CacheBuilder;
import org.springframework.stereotype.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Olivier Lamy
diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml
index 6e25fec..1c8f26a 100644
--- a/spring-quartz/pom.xml
+++ b/spring-quartz/pom.xml
@@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<artifactId>archiva-components-spring-quartz</artifactId>
<name>Archiva Components :: Spring Quartz</name>
diff --git a/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/configuration/SchedulerConfiguration.java b/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/configuration/SchedulerConfiguration.java
index e9fcdec..bd2c323 100644
--- a/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/configuration/SchedulerConfiguration.java
+++ b/spring-quartz/src/main/java/org/apache/archiva/components/scheduler/configuration/SchedulerConfiguration.java
@@ -23,7 +23,7 @@ import org.apache.archiva.components.scheduler.Scheduler;
import org.quartz.impl.StdSchedulerFactory;
import org.springframework.stereotype.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Class to represent the configuration file for the proxy
diff --git a/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/CronExpressionValidatorTest.java b/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/CronExpressionValidatorTest.java
index af07896..d67ff2c 100644
--- a/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/CronExpressionValidatorTest.java
+++ b/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/CronExpressionValidatorTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath:/spring-context.xml"} )
diff --git a/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/SchedulerTest.java b/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/SchedulerTest.java
index 1ea8ee2..ea34978 100644
--- a/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/SchedulerTest.java
+++ b/spring-quartz/src/test/java/org/apache/archiva/components/scheduler/SchedulerTest.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RunWith ( SpringJUnit4ClassRunner.class )
@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
diff --git a/spring-registry/pom.xml b/spring-registry/pom.xml
index 04b2cf3..c18a5b3 100644
--- a/spring-registry/pom.xml
+++ b/spring-registry/pom.xml
@@ -19,12 +19,12 @@
<parent>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<name>Archiva Components :: Spring Registry</name>
<packaging>pom</packaging>
diff --git a/spring-registry/spring-registry-api/pom.xml b/spring-registry/spring-registry-api/pom.xml
index 8b2c0e3..7f83265 100644
--- a/spring-registry/spring-registry-api/pom.xml
+++ b/spring-registry/spring-registry-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.archiva.components.registry</groupId>
diff --git a/spring-registry/spring-registry-commons/pom.xml b/spring-registry/spring-registry-commons/pom.xml
index 86b56fa..b927608 100644
--- a/spring-registry/spring-registry-commons/pom.xml
+++ b/spring-registry/spring-registry-commons/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-components-spring-registry-commons</artifactId>
diff --git a/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/components/registry/test/AbstractRegistryTest.java b/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/components/registry/test/AbstractRegistryTest.java
index 8c57fe7..f66100b 100644
--- a/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/components/registry/test/AbstractRegistryTest.java
+++ b/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/components/registry/test/AbstractRegistryTest.java
@@ -27,7 +27,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.NoSuchElementException;
/**
diff --git a/spring-taskqueue/pom.xml b/spring-taskqueue/pom.xml
index 5a6463c..eb3c191 100644
--- a/spring-taskqueue/pom.xml
+++ b/spring-taskqueue/pom.xml
@@ -25,10 +25,10 @@
<parent>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<artifactId>archiva-components-spring-taskqueue</artifactId>
<name>Archiva Components :: Spring Task Queue</name>
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java
index e405c7a..06fce01 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java
@@ -25,8 +25,8 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java
index 3eded88..2e6ad9a 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java
@@ -28,8 +28,8 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
[archiva-components] 02/02: Package updates for jakarta ee
Posted by ma...@apache.org.
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 <ma...@apache.org>
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;