Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1081] trunk
|
From: <fg...@us...> - 2009-03-12 11:12:31
|
Revision: 1081
http://openutils.svn.sourceforge.net/openutils/?rev=1081&view=rev
Author: fgiust
Date: 2009-03-12 11:12:04 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
massive update of dependencies: magnolia, slf4j, spring, hibernate
Modified Paths:
--------------
trunk/openutils-backup/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-configuration-dataobjects/pom.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-elfunctions/pom.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
trunk/openutils-mgnlbootstrapsync/pom.xml
trunk/openutils-mgnlcas/pom.xml
trunk/openutils-mgnlcontrols/pom.xml
trunk/openutils-mgnlcriteria/pom.xml
trunk/openutils-mgnlext/pom.xml
trunk/openutils-mgnlgroovy/pom.xml
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmessages/pom.xml
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstruts11/pom.xml
trunk/openutils-mgnltasks/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-spring-remote-callback/pom.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4web/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
trunk/openutils-web/pom.xml
trunk/pom.xml
Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-backup/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-backup</artifactId>
@@ -15,20 +15,14 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-bshd5/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-bshd5</artifactId>
@@ -14,12 +15,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -67,16 +68,20 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.1.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
<exclusions>
<exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -103,6 +108,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-configuration-dataobjects/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -16,19 +17,19 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
<!-- not needed here, just load annotations -->
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-configuration-services/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -29,6 +29,12 @@
<artifactId>openutils-spring</artifactId>
<version>2.0</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -38,43 +44,40 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.3</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-testng</artifactId>
<version>2.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -96,7 +99,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-dbmigration/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-dbmigration</artifactId>
@@ -14,7 +15,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -57,12 +58,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
@@ -74,6 +75,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -91,6 +96,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-deployment/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-deployment</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -65,6 +65,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-elfunctions/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-hibernate-security/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,8 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>openutils</artifactId>
<groupId>net.sourceforge.openutils</groupId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,10 +12,6 @@
<name>openutils hibernate security</name>
<version>0.0.8-SNAPSHOT</version>
<description>Hibernate Security classes</description>
- <properties>
- <spring.version>2.5.1</spring.version>
- <aspectj.version>1.5.3</aspectj.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -99,6 +96,12 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-usermanagement</artifactId>
<version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -108,53 +111,54 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.2</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
<exclusions>
<exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -176,28 +180,28 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security</artifactId>
- <version>1.0.6</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>2.0.3</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-remoting</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-jdbc</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
- <groupId>org.springframework</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -220,4 +224,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <spring.version>2.5.6</spring.version>
+ <aspectj.version>1.5.3</aspectj.version>
+ </properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-log4j/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-log4j</artifactId>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-maven-skin/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-maven-skin</artifactId>
Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,12 +39,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5-rc2</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.5.2</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: trunk/openutils-mgnlcas/pom.xml
===================================================================
--- trunk/openutils-mgnlcas/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcas/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,13 +2,13 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
- <artifactId>openutils-cas</artifactId>
- <name>openutils-cas</name>
+ <artifactId>openutils-mgnlcas</artifactId>
+ <name>openutils-mgnlcas</name>
<version>1.1-SNAPSHOT</version>
<licenses>
<license>
@@ -38,7 +38,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-jaas</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcontrols/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
@@ -49,7 +49,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
@@ -14,17 +14,17 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlext/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlgroovy/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,12 +49,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.6.3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,12 +39,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,12 +38,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlspring/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -64,7 +64,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5.4</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-jaas</artifactId>
- <version>3.5.4</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -146,6 +146,6 @@
</repository>
</repositories>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -50,12 +50,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc1</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc1</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlstruts11/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-mgnlstruts11</artifactId>
@@ -38,12 +38,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0-rc3</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnltasks/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
@@ -51,7 +51,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.5.8</version>
+ <version>4.0</version>
<exclusions>
<exclusion>
<groupId>servlets.com</groupId>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring</artifactId>
@@ -63,7 +64,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -79,27 +80,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<optional>true</optional>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -131,12 +129,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -144,6 +136,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-spring-remote-callback/pom.xml
===================================================================
--- trunk/openutils-spring-remote-callback/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring-remote-callback/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<artifactId>openutils</artifactId>
<groupId>net.sourceforge.openutils</groupId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -13,18 +13,12 @@
<version>0.0.1-SNAPSHOT</version>
<description>Openutils Spring Remote Callback classes</description>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
<aspectj.version>1.5.3</aspectj.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<exclusions>
@@ -60,10 +54,29 @@
<groupId>org.logicblaze.lingo</groupId>
<artifactId>lingo</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
+ <version>5.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
<version>4.1.1</version>
</dependency>
<dependency>
@@ -105,24 +118,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -135,16 +148,12 @@
<artifactId>xbean-spring-v2c</artifactId>
<version>2.8</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>http://repository.codehaus.org</id>
- <name>codehaus repository</name>
- <url>http://repository.codehaus.org</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
\ No newline at end of file
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring-rmibernate/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
@@ -15,13 +15,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<!-- replaces commons-logging -->
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -47,24 +47,20 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</exclusion>
<exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -82,7 +78,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -103,22 +99,19 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.2</version>
+ <version>2.0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
<scope>test</scope>
</dependency>
@@ -133,14 +126,14 @@
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
@@ -170,6 +163,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-tags-spring/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-tags-spring</artifactId>
@@ -32,7 +32,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -77,20 +77,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
@@ -98,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing</artifactId>
@@ -14,12 +14,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -112,6 +112,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit</artifactId>
@@ -14,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -50,7 +51,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.5.3</version>
+ <version>2.5.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing-testng/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng</artifactId>
@@ -14,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -57,7 +58,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.5.3</version>
+ <version>2.5.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4dwr</artifactId>
@@ -30,12 +30,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -77,26 +77,56 @@
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-resources</artifactId>
<version>5.5.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory</artifactId>
<version>5.5.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -127,6 +157,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4dwr-junit</artifactId>
Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr-testng/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4dwr-testng</artifactId>
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4web/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing4web</artifactId>
@@ -47,6 +47,12 @@
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
@@ -63,16 +69,34 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>5.5.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory</artifactId>
<version>5.5.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-usermanagement/pom.xml 2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -12,9 +13,6 @@
<name>openutils-usermanagement</name>
<version>2.0.2-SNAPSHOT</version>
<description>Usermanagement classes</description>
- <properties>
- <spring.version>2.5.1</spring.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -39,12 +37,18 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0.2</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
<version>2.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
@@ -72,16 +76,13 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.4.0.GA</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -108,22 +109,22 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>org.acegisecurity</groupId>
-...
[truncated message content] |
