Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dependency cleanup and switch to new archiva component coordinates

This commit is contained in:
Martin Stockhammer 2019-11-15 17:55:26 +01:00
parent 9e66f0c236
commit 638bb213ef
7 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -359,15 +359,9 @@
<version>2.7.5</version> <version>2.7.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components</groupId> <groupId>org.apache.archiva.components</groupId>
<artifactId>expression-evaluator</artifactId> <artifactId>archiva-components-expression-evaluator</artifactId>
<version>${redback.comp.expression-evaluator.version}</version> <version>${archiva.comp.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components.registry</groupId> <groupId>org.apache.archiva.redback.components.registry</groupId>
@ -556,9 +550,9 @@
</dependency> </dependency>
--> -->
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components</groupId> <groupId>org.apache.archiva.components</groupId>
<artifactId>spring-apacheds</artifactId> <artifactId>archiva-components-spring-apacheds</artifactId>
<version>${redback.comp.spring-apacheds.version}</version> <version>${archiva.comp.version}</version>
</dependency> </dependency>
<!-- <!--
<dependency> <dependency>

11
redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
View File

@ -32,7 +32,6 @@
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
<apacheds.version>1.5.1</apacheds.version>
</properties> </properties>
<dependencies> <dependencies>
@ -75,16 +74,10 @@
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
<version>${apacheds.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components</groupId> <groupId>org.apache.archiva.components</groupId>
<artifactId>spring-apacheds</artifactId> <artifactId>archiva-components-spring-apacheds</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

4
redback-common/redback-common-ldap/pom.xml
View File

@ -74,8 +74,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components</groupId> <groupId>org.apache.archiva.components</groupId>
<artifactId>spring-apacheds</artifactId> <artifactId>archiva-components-spring-apacheds</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

4
redback-integrations/redback-rest/redback-rest-services/pom.xml
View File

@ -213,8 +213,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components</groupId> <groupId>org.apache.archiva.components</groupId>
<artifactId>spring-apacheds</artifactId> <artifactId>archiva-components-spring-apacheds</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
View File

@ -21,7 +21,7 @@ import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.apache.archiva.redback.keys.jpa.model.JpaAuthenticationKey; import org.apache.archiva.redback.keys.jpa.model.JpaAuthenticationKey;
import org.codehaus.plexus.util.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

4
redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
View File

@ -28,7 +28,7 @@ import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.UserQuery; import org.apache.archiva.redback.users.UserQuery;
import org.apache.archiva.redback.users.jpa.model.JpaUser; import org.apache.archiva.redback.users.jpa.model.JpaUser;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -289,7 +289,7 @@ public class JpaUserManager extends AbstractUserManager {
" is not an instance of " + JpaUser.class.getName() ); " is not an instance of " + JpaUser.class.getName() );
} }
if ( org.codehaus.plexus.util.StringUtils.isEmpty( user.getUsername() ) ) if ( StringUtils.isEmpty( user.getUsername() ) )
{ {
throw new IllegalStateException( throw new IllegalStateException(
Messages.getString( "user.manager.cannot.add.user.without.username" ) ); //$NON-NLS-1$ Messages.getString( "user.manager.cannot.add.user.without.username" ) ); //$NON-NLS-1$

4
redback-users/redback-users-providers/redback-users-ldap/pom.xml
View File

@ -92,8 +92,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components</groupId> <groupId>org.apache.archiva.components</groupId>
<artifactId>spring-apacheds</artifactId> <artifactId>archiva-components-spring-apacheds</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>