Author: tchemit Date: 2012-08-14 19:46:22 +0200 (Tue, 14 Aug 2012) New Revision: 550 Url: http://forge.codelutin.com/repositories/revision/echobase/550 Log: refs #1404: updates libs Modified: trunk/echobase-entities/pom.xml trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-08-07 07:52:43 UTC (rev 549) +++ trunk/echobase-entities/pom.xml 2012-08-14 17:46:22 UTC (rev 550) @@ -156,7 +156,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-08-07 07:52:43 UTC (rev 549) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-08-14 17:46:22 UTC (rev 550) @@ -443,7 +443,7 @@ EchoBaseEntityEnum sourceType = associationMeta.getSource(); - ImportToMap importer = ImportToMap.newImport(model, reader); + ImportToMap importer = ImportToMap.newImportToMap(model, reader); List<E> sourceEntities = getEntities(sourceType); Map<String, E> sourcesById = Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-07 07:52:43 UTC (rev 549) +++ trunk/pom.xml 2012-08-14 17:46:22 UTC (rev 550) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <groupId>fr.ifremer</groupId> @@ -123,18 +123,18 @@ <!-- libraries version --> - <eugenePluginVersion>2.4.3-SNAPSHOT</eugenePluginVersion> - <topiaVersion>2.6.10</topiaVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <eugenePluginVersion>2.5-SNAPSHOT</eugenePluginVersion> + <topiaVersion>2.6.12-SNAPSHOT</topiaVersion> + <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.4</struts2Version> <jqueryPluginVersion>3.3.1</jqueryPluginVersion> <seleniumVersion>2.21.0</seleniumVersion> - <h2Version>1.3.167</h2Version> + <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <slf4jVersion>1.6.6</slf4jVersion> <jackcessVersion>1.2.7</jackcessVersion> <hibernateVersion>3.6.10.Final</hibernateVersion>