diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-04-03 19:49:17 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-04-03 19:49:17 +0000 |
| commit | aea9bd1a6ebda2dbf9d49b957766188b0997c16d (patch) | |
| tree | 41a914d276b5d7fc77dd49322d2a99e8d9264d47 /archiva-modules/archiva-base/archiva-proxy | |
| parent | 4d1c49bccbd45efdce1ae634dba4f10a594c9ffb (diff) | |
| download | archiva-aea9bd1a6ebda2dbf9d49b957766188b0997c16d.tar.gz archiva-aea9bd1a6ebda2dbf9d49b957766188b0997c16d.zip | |
[MRM-709] use SelectorUtils from ant.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1309117 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-proxy')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-proxy/pom.xml | 6 | ||||
| -rw-r--r-- | archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 2a27f4472..e974cf6d4 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -62,6 +62,10 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-inject-plexus</artifactId> </dependency> @@ -185,7 +189,7 @@ org.springframework.stereotype;version="[3,4)", org.codehaus.plexus.registry, org.codehaus.plexus.taskqueue, - org.codehaus.plexus.util, + org.apache.tools.ant.types.selectors, org.apache.maven.wagon, org.apache.maven.wagon.authentication, org.apache.maven.wagon.proxy, diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java index d9d615426..40173802f 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java @@ -63,10 +63,10 @@ import org.apache.maven.wagon.authentication.AuthenticationException; import org.apache.maven.wagon.authentication.AuthenticationInfo; import org.apache.maven.wagon.proxy.ProxyInfo; import org.apache.maven.wagon.repository.Repository; +import org.apache.tools.ant.types.selectors.SelectorUtils; import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.registry.RegistryListener; import org.codehaus.plexus.taskqueue.TaskQueueException; -import org.codehaus.plexus.util.SelectorUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; |