diff options
| author | Joakim Erdfelt <joakime@apache.org> | 2007-05-01 13:37:43 +0000 |
|---|---|---|
| committer | Joakim Erdfelt <joakime@apache.org> | 2007-05-01 13:37:43 +0000 |
| commit | 4c9789b2284a3d8bde67405fe8651fbf674dbca8 (patch) | |
| tree | 5f8d1b31b1e8b46c278bc2979b971835b40408d2 /archiva-base/archiva-proxy/pom.xml | |
| parent | e52e0793dff4db34b8b81dc5d2380871daaa9a1a (diff) | |
| download | archiva-4c9789b2284a3d8bde67405fe8651fbf674dbca8.tar.gz archiva-4c9789b2284a3d8bde67405fe8651fbf674dbca8.zip | |
Merging changes from old (archiva-0.9) trunk into branch.
svn merge revision 518676 to 534045.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@534082 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-base/archiva-proxy/pom.xml')
| -rw-r--r-- | archiva-base/archiva-proxy/pom.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/archiva-base/archiva-proxy/pom.xml b/archiva-base/archiva-proxy/pom.xml index 679910306..e9d55f1b3 100644 --- a/archiva-base/archiva-proxy/pom.xml +++ b/archiva-base/archiva-proxy/pom.xml @@ -52,6 +52,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> |