You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2022/08/06 01:30:47 UTC
[archiva-redback-core] branch master updated: [MRM-2031] Switch to jdk 11
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
The following commit(s) were added to refs/heads/master by this push:
new a4aaec1e [MRM-2031] Switch to jdk 11
a4aaec1e is described below
commit a4aaec1e1d4abff775ac14da4908a8edbea36aef
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Aug 5 21:40:14 2022 +1000
[MRM-2031] Switch to jdk 11
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
pom.xml | 13 ++++---------
.../apache/archiva/redback/users/AbstractUserManager.java | 5 ++---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8e98d404..af21765f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -761,31 +761,26 @@
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
+ <artifactId>jakarta.persistence-api</artifactId>
<version>${jakarta.persistence.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
@@ -1200,8 +1195,8 @@
<inherited>false</inherited>
<configuration>
<notimestamp>true</notimestamp>
- <javadocVersion>${javaFullVersion}</javadocVersion>
- <source>${compiler.source}</source>
+ <javadocVersion>${maven.compiler.release}</javadocVersion>
+ <source>${maven.compiler.release}</source>
<doclint>none</doclint>
<detectLinks>true</detectLinks>
<detectJavaApiLink>true</detectJavaApiLink>
diff --git a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
index e98dae97..dddd1eb8 100644
--- a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
+++ b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
@@ -19,13 +19,12 @@ package org.apache.archiva.redback.users;
* under the License.
*/
-import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
/**
* AbstractUserManager
@@ -37,7 +36,7 @@ public abstract class AbstractUserManager
{
protected Logger log = LoggerFactory.getLogger( getClass() );
- private List<UserManagerListener> listeners = new ArrayList<UserManagerListener>();
+ private final List<UserManagerListener> listeners = new CopyOnWriteArrayList<>();
public void addUserManagerListener( UserManagerListener listener )
{