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.git
commit 641efe3a1ff0f9c96d4b72b2ecb95170ac5f002f Author: Martin Stockhammer <[email protected]> AuthorDate: Fri Jun 26 19:40:36 2020 +0200 Dependency cleanup archiva-security --- .../archiva-web/archiva-security/pom.xml | 123 ++++++++++----------- .../archiva/security/AbstractSecurityTest.java | 5 +- status-dep.txt | 1 + 3 files changed, 64 insertions(+), 65 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 7f6dd61..3f6e2b3 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -62,33 +62,9 @@ <artifactId>redback-system</artifactId> <exclusions> <exclusion> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>plexus-spring</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus.registry</groupId> - <artifactId>plexus-registry-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus.registry</groupId> - <artifactId>plexus-registry-commons</artifactId> - </exclusion> - <exclusion> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </exclusion> - <exclusion> - <groupId>org.codehaus.plexus.cache</groupId> - <artifactId>plexus-cache-ehcache</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus.cache</groupId> - <artifactId>plexus-cache-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -106,17 +82,67 @@ <artifactId>redback-rbac-role-manager</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-xml-tools</artifactId> </dependency> - - <!-- Test Scoped --> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-proxy</artifactId> - <scope>test</scope> + <artifactId>metadata-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-common</artifactId> </dependency> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-policies</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-repository-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-policy</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-authentication-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-authorization-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-users-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-spring-taskqueue</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + + + <!-- Test Scoped --> + <dependency> <groupId>org.apache.archiva.maven</groupId> <artifactId>archiva-maven-proxy</artifactId> <scope>test</scope> @@ -142,11 +168,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-keys-cached</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.transaction</groupId> <artifactId>javax.transaction-api</artifactId> <scope>test</scope> @@ -165,14 +186,6 @@ <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </exclusion> - <exclusion> - <groupId>org.codehaus.plexus.cache</groupId> - <artifactId>plexus-cache-ehcache</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus.cache</groupId> - <artifactId>plexus-cache-api</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -191,34 +204,24 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-common-test-resources</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-admin-default</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin-default</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-common-test-resources</artifactId> <scope>test</scope> </dependency> <dependency> @@ -248,12 +251,6 @@ </dependency> <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java index b58aae8..6487e9d 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java @@ -19,7 +19,6 @@ package org.apache.archiva.security; * under the License. */ -import com.google.common.collect.Lists; import junit.framework.TestCase; import net.sf.ehcache.CacheManager; import org.apache.archiva.configuration.ArchivaConfiguration; @@ -47,6 +46,8 @@ import javax.inject.Named; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; /** * AbstractSecurityTest @@ -169,7 +170,7 @@ public abstract class AbstractSecurityTest log.info( "ignore RbacObjectNotFoundException for id {} during restoreGuestInitialValues", userId ); return; } - userAssignment.setRoleNames( Lists.newArrayList( "Guest" ) ); + userAssignment.setRoleNames( new ArrayList( Arrays.asList( "Guest" ) ) ); rbacManager.saveUserAssignment( userAssignment ); CacheManager.getInstance().clearAll(); } diff --git a/status-dep.txt b/status-dep.txt index 0603ef8..4ea8c53 100644 --- a/status-dep.txt +++ b/status-dep.txt @@ -64,6 +64,7 @@ archiva-modules archiva-rest-services archiva-web-common archiva-rss + archiva-security
