diff options
| author | Brett Porter <brett@apache.org> | 2009-10-16 12:35:38 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2009-10-16 12:35:38 +0000 |
| commit | e89326d687c1964ded21519c65bc59bcdf9f0526 (patch) | |
| tree | 93548dcff1bea21d2b5e036720d71fb87c11591f /archiva-modules/archiva-base/archiva-proxy | |
| parent | 4e4362191f12adbffc2af970b6e1e4affea94954 (diff) | |
| download | archiva-e89326d687c1964ded21519c65bc59bcdf9f0526.tar.gz archiva-e89326d687c1964ded21519c65bc59bcdf9f0526.zip | |
[MRM-1025] merge -r721944:723577 from former MRM-1025 branch, now aligned to trunk
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@825867 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/maven/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 90a1167ef..dc855cda5 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-proxy</artifactId> @@ -43,6 +43,10 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-scanner</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduled</artifactId> </dependency> <dependency> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java index 06ab597cd..32ef6fae2 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; +import java.util.Properties; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; |