This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit fde0cc137425d220341519a83b08d20f54167829 Author: Martin Stockhammer <[email protected]> AuthorDate: Tue Dec 24 15:23:24 2019 +0100 Cleanup of users dependencies --- .../archiva/redback/integration/HttpUtils.java | 2 +- .../checks/security/AdminAutoCreateCheck.java | 2 +- .../filter/authentication/HttpAuthenticator.java | 2 +- .../basic/HttpBasicAuthentication.java | 2 +- .../digest/HttpDigestAuthentication.java | 2 +- .../authentication/digest/HttpDigestHeader.java | 2 +- .../authorization/SimpleAuthorizationFilter.java | 2 +- .../redback/integration/mail/MailerImpl.java | 2 +- .../redback/integration/model/UserCredentials.java | 2 +- .../redback/integration/util/AutoLoginCookies.java | 2 +- .../redback-users-jpa/pom.xml | 40 ++++++++-------------- .../archiva/redback/users/jpa/model/JpaUser.java | 4 --- .../redback-users-ldap/pom.xml | 30 +++++++++++++--- .../redback-users-memory/pom.xml | 23 ++++++++++--- redback-users/redback-users-tests/pom.xml | 17 +++++++++ 15 files changed, 86 insertions(+), 48 deletions(-) diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java index b50b497..995b407 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java @@ -19,7 +19,7 @@ package org.apache.archiva.redback.integration; * under the License. */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Properties; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java index 6821a4b..7f70e02 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java @@ -33,7 +33,7 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java index ed8ef61..7371699 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java @@ -30,7 +30,7 @@ import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystemConstants; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java index 29ad886..a1c9ff1 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java @@ -33,7 +33,7 @@ import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; /** diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java index 7a1bc18..e784137 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java @@ -31,7 +31,7 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.inject.Inject; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java index c5872f9..1e7082e 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java @@ -23,7 +23,7 @@ package org.apache.archiva.redback.integration.filter.authentication.digest; import org.apache.commons.codec.binary.Base64; import org.apache.archiva.redback.integration.HttpUtils; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java index f3d22dd..40e772c 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java @@ -23,7 +23,7 @@ import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.integration.filter.SpringServletFilter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java index 462699d..754edce 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java @@ -39,7 +39,7 @@ import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserValidationSettings; import org.apache.archiva.redback.system.SecuritySystem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.mail.javamail.JavaMailSender; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java index 2cde900..c43eaec 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java @@ -22,7 +22,7 @@ package org.apache.archiva.redback.integration.model; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManagerException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java index b3f4639..fe559aa 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java @@ -30,7 +30,7 @@ import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.policy.CookieSettings; import org.apache.archiva.redback.system.SecuritySystem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-users/redback-users-providers/redback-users-jpa/pom.xml b/redback-users/redback-users-providers/redback-users-jpa/pom.xml index 874b7ee..61a5630 100644 --- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml +++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml @@ -38,10 +38,7 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-policy</artifactId> </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-common-jpa</artifactId> - </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -66,43 +63,31 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> - - <dependency> - <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>archiva-components-spring-registry-commons</artifactId> - <scope>test</scope> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-common-jpa</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <version>${springVersion}</version> - <scope>runtime</scope> + <groupId>org.apache.archiva.components.registry</groupId> + <artifactId>archiva-components-spring-registry-commons</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> + <artifactId>spring-tx</artifactId> <version>${springVersion}</version> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> @@ -194,6 +179,11 @@ <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-common-jpa</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </plugin> </plugins> diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/model/JpaUser.java b/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/model/JpaUser.java index e5ee5eb..4ed4d64 100644 --- a/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/model/JpaUser.java +++ b/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/model/JpaUser.java @@ -19,9 +19,6 @@ package org.apache.archiva.redback.users.jpa.model; * under the License. */ -import org.apache.openjpa.persistence.ExternalValues; -import org.apache.openjpa.persistence.Type; - import javax.persistence.CollectionTable; import javax.persistence.Column; import javax.persistence.ElementCollection; @@ -29,7 +26,6 @@ import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; import javax.persistence.OrderColumn; import javax.persistence.Table; import java.util.ArrayList; diff --git a/redback-users/redback-users-providers/redback-users-ldap/pom.xml b/redback-users/redback-users-providers/redback-users-ldap/pom.xml index 6bd6dbb..078e441 100644 --- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml +++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml @@ -48,23 +48,43 @@ <artifactId>redback-common-ldap</artifactId> </dependency> <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-configuration</artifactId> + </dependency> + <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.apache.archiva.components.cache</groupId> <artifactId>archiva-components-spring-cache-api</artifactId> </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.apache.archiva.components.cache</groupId> <artifactId>archiva-components-spring-cache-ehcache</artifactId> + <scope>runtime</scope> </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> <scope>test</scope> diff --git a/redback-users/redback-users-providers/redback-users-memory/pom.xml b/redback-users/redback-users-providers/redback-users-memory/pom.xml index 7165d99..3785cf0 100644 --- a/redback-users/redback-users-providers/redback-users-memory/pom.xml +++ b/redback-users/redback-users-providers/redback-users-memory/pom.xml @@ -39,10 +39,6 @@ <artifactId>redback-policy</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - <dependency> <groupId>org.apache.archiva.components.registry</groupId> <artifactId>archiva-components-spring-registry-commons</artifactId> <scope>test</scope> @@ -56,6 +52,25 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-console-standalone</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-users-tests</artifactId> <scope>test</scope> diff --git a/redback-users/redback-users-tests/pom.xml b/redback-users/redback-users-tests/pom.xml index 10ba7a0..291fb82 100644 --- a/redback-users/redback-users-tests/pom.xml +++ b/redback-users/redback-users-tests/pom.xml @@ -35,7 +35,13 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-policy</artifactId> </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-users-api</artifactId> + </dependency> + + <!-- JUNIT 5 --> <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> @@ -52,10 +58,21 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.springframework</groupId>
