Author: ate
Date: Fri Oct 30 09:26:25 2009
New Revision: 831235
URL: http://svn.apache.org/viewvc?rev=831235&view=rev
Log:
Fix commons-beanutils dependency issues (beanutils, beanutils-core and
sometimes also beanutils-collections being pulled in together)
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=831235&r1=831234&r2=831235&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Fri Oct 30 09:26:25
2009
@@ -50,6 +50,7 @@
<commons-lang.version>2.4</commons-lang.version>
<commons-fileupload.version>1.2</commons-fileupload.version>
<commons-io.version>1.4</commons-io.version>
+ <commons-beanutils.version>1.8.0</commons-beanutils.version>
<slf4j.version>1.5.6</slf4j.version>
<javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
<javax.servlet.version>2.4</javax.servlet.version>
@@ -210,9 +211,18 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml?rev=831235&r1=831234&r2=831235&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
Fri Oct 30 09:26:25 2009
@@ -130,6 +130,16 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>dom4j</groupId>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=831235&r1=831234&r2=831235&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri Oct 30 09:26:25 2009
@@ -241,11 +241,11 @@
<aopalliance.version>1.0</aopalliance.version>
<castor.version>1.1.1-xml</castor.version>
<cglib.version>2.1_3</cglib.version>
- <commons-beanutils.version>1.7.0</commons-beanutils.version>
+ <commons-beanutils.version>1.8.0</commons-beanutils.version>
<commons-betwixt.version>0.8</commons-betwixt.version>
<commons-codec.version>1.3</commons-codec.version>
<commons-collections.version>3.2</commons-collections.version>
- <commons-configuration.version>1.1</commons-configuration.version>
+ <commons-configuration.version>1.6</commons-configuration.version>
<commons-dbcp.version>1.2.2</commons-dbcp.version>
<commons-digester.version>1.8</commons-digester.version>
<commons-fileupload.version>1.2</commons-fileupload.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
