Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-709] use SelectorUtils from ant. 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1309057 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-03 17:24:50 +00:00
parent bda662451a
commit 045c83645b
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-base/archiva-configuration/pom.xml
View File

@ -76,6 +76,10 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.redback.components</groupId> <groupId>org.codehaus.redback.components</groupId>
<artifactId>spring-utils</artifactId> <artifactId>spring-utils</artifactId>
@ -191,6 +195,7 @@
org.codehaus.plexus.evaluator*, org.codehaus.plexus.evaluator*,
org.codehaus.plexus.registry, org.codehaus.plexus.registry,
org.codehaus.plexus.util, org.codehaus.plexus.util,
org.apache.tools.ant.types.selectors,
org.codehaus.redback.components.registry.commons, org.codehaus.redback.components.registry.commons,
org.codehaus.redback.components.springutils, org.codehaus.redback.components.springutils,
org.springframework.stereotype;version="[3,4)", org.springframework.stereotype;version="[3,4)",

2
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
View File

@ -25,10 +25,10 @@ import org.apache.archiva.configuration.io.registry.ConfigurationRegistryReader;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate; import org.apache.commons.collections.Predicate;
import org.apache.commons.configuration.CombinedConfiguration; import org.apache.commons.configuration.CombinedConfiguration;
import org.apache.tools.ant.types.selectors.SelectorUtils;
import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryException; import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.registry.RegistryListener; import org.codehaus.plexus.registry.RegistryListener;
import org.codehaus.plexus.util.SelectorUtils;
import org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry; import org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
archiva-modules/archiva-web/archiva-webapp-js/pom.xml
View File

@ -194,6 +194,10 @@
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.indexer</groupId> <groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId> <artifactId>indexer-core</artifactId>

4
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -70,6 +70,10 @@
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.indexer</groupId> <groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId> <artifactId>indexer-core</artifactId>

5
pom.xml
View File

@ -827,6 +827,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.8.3</version>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>