diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-11-23 00:08:26 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-11-23 00:08:26 +0000 |
| commit | 06ccf6fb074c8497b6fdac15f7d028609eda73a6 (patch) | |
| tree | abad2613d897b3c378b3ce2526cb273ed492b07e | |
| parent | 1a88779e42f9b4bd3bd66ed3e2d58279d8ad0d70 (diff) | |
| download | archiva-06ccf6fb074c8497b6fdac15f7d028609eda73a6.tar.gz archiva-06ccf6fb074c8497b6fdac15f7d028609eda73a6.zip | |
enforcer commons-digester and beanutils versions used to avoid dup with redback overlay
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205245 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 51 | ||||
| -rw-r--r-- | pom.xml | 22 |
2 files changed, 67 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index f97b2a9e6..861c61f1e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -236,6 +236,30 @@ <artifactId>commons-configuration</artifactId> <exclusions> <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <exclusions> + <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> @@ -338,12 +362,7 @@ </exclusions> </dependency> <!-- Redback Dependencies --> - <dependency> - <groupId>org.codehaus.redback</groupId> - <artifactId>redback-struts2-content</artifactId> - <type>war</type> - <scope>runtime</scope> - </dependency> + <dependency> <groupId>org.codehaus.redback</groupId> <artifactId>redback-struts2-integration</artifactId> @@ -383,6 +402,14 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>org.codehaus.redback</groupId> + <artifactId>redback-struts2-content</artifactId> + <scope>runtime</scope> + <type>war</type> + </dependency> + <!-- Other dependencies --> <dependency> <groupId>org.apache.archiva</groupId> @@ -723,6 +750,18 @@ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> </manifest> </archive> + <overlays> + <overlay> + <id>redback-contents</id> + <groupId>org.codehaus.redback</groupId> + <artifactId>redback-struts2-content</artifactId> + <excludes> + <exclude>WEB-INF/lib/**.jar</exclude> + <exclude>WEB-INF/web.xml</exclude> + <exclude>META-INF/**</exclude> + </excludes> + </overlay> + </overlays> </configuration> </plugin> <plugin> @@ -552,6 +552,28 @@ </exclusions> </dependency> <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2</version> |