Author: bleny Date: 2013-03-01 14:51:47 +0100 (Fri, 01 Mar 2013) New Revision: 1641 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1641 Log: update dependencies and plugins Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-14 09:37:26 UTC (rev 1640) +++ trunk/pom.xml 2013-03-01 13:51:47 UTC (rev 1641) @@ -27,7 +27,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.2</version> + <version>1.3</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -199,7 +199,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.10.0</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>xml-apis</groupId> @@ -215,7 +215,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.165</version> + <version>1.3.170</version> </dependency> <dependency> <groupId>postgresql</groupId> @@ -237,7 +237,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.0</version> + <version>1.9.5</version> <scope>test</scope> </dependency> </dependencies> @@ -338,14 +338,14 @@ <!-- libraries version --> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.4.5</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.9</nuitonUtilsVersion> <nuitonWebVersion>1.10</nuitonWebVersion> - <topiaVersion>2.6.8</topiaVersion> - <eugeneVersion>2.4.2</eugeneVersion> + <topiaVersion>2.7.1</topiaVersion> + <eugeneVersion>2.6.1</eugeneVersion> <tapestryVersion>5.2.5</tapestryVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxbVersion>2.2.5-b10</jaxbVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <jaxbVersion>2.2.7-b58</jaxbVersion> + <slf4jVersion>1.7.2</slf4jVersion> </properties> <!-- ************************************************************* --> @@ -387,7 +387,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-01-14 09:37:26 UTC (rev 1640) +++ trunk/wao-business/pom.xml 2013-03-01 13:51:47 UTC (rev 1641) @@ -160,7 +160,7 @@ <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <id>generate-entities</id> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2013-01-14 09:37:26 UTC (rev 1640) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2013-03-01 13:51:47 UTC (rev 1641) @@ -151,7 +151,7 @@ String query = "FROM " + Contact.class.getName() + " WHERE " + Contact.PROPERTY_MAIN_OBSERVER + " = :observer" + " OR :observer IN ELEMENTS(" + Contact.PROPERTY_SECONDARY_OBSERVERS + ")"; - List observersContact = context.find(query, "observer", observer); + List observersContact = context.findAll(query, "observer", observer); return observersContact.size() > 0; }