Author: tchemit Date: 2013-04-23 23:59:46 +0200 (Tue, 23 Apr 2013) New Revision: 646 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/646 Log: update some libs + fix junit imports Modified: trunk/pom.xml trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/DbfTimestampConverterTest.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/ObservationsTest.java trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 13:20:55 UTC (rev 645) +++ trunk/pom.xml 2013-04-23 21:59:46 UTC (rev 646) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> + <version>3.4.9</version> </parent> <groupId>fr.ulr</groupId> @@ -106,22 +106,22 @@ <!-- libraries version --> - <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <eugenePluginVersion>2.5</eugenePluginVersion> - <topiaVersion>2.6.12</topiaVersion> - <hibernateVersion>3.6.10.Final</hibernateVersion> - <h2Version>1.3.168</h2Version> + <eugenePluginVersion>2.6.2</eugenePluginVersion> + <topiaVersion>2.8-rc-1-SNAPSHOT</topiaVersion> + <hibernateVersion>4.2.0.Final</hibernateVersion> + <h2Version>1.3.171</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.6</jaxxVersion> - <swingXVersion>1.6.4</swingXVersion> - <xworkVersion>2.3.4</xworkVersion> + <jaxxVersion>2.5.18</jaxxVersion> + <swingXVersion>1.6.5-1</swingXVersion> + <xworkVersion>2.3.12</xworkVersion> <jodaTimeVersion>2.1</jodaTimeVersion> - <slf4jVersion>1.6.6</slf4jVersion> + <slf4jVersion>1.7.3</slf4jVersion> <logbackVersion>1.0.6</logbackVersion> <i18n.bundles>en_GB</i18n.bundles> Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2012-12-29 13:20:55 UTC (rev 645) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2013-04-23 21:59:46 UTC (rev 646) @@ -77,6 +77,13 @@ throw new UnsupportedOperationException(); } + @Override + public <E extends TopiaEntity> Iterable<E> importTableAndReturnThem(TableMeta<SammoaEntityEnum> meta, + Import<E> importer, + CsvImportResult<SammoaEntityEnum> csvResult) throws TopiaException { + throw new UnsupportedOperationException(); + } + protected TopiaContext getTx() { return tx; } Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/DbfTimestampConverterTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/DbfTimestampConverterTest.java 2012-12-29 13:20:55 UTC (rev 645) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/DbfTimestampConverterTest.java 2013-04-23 21:59:46 UTC (rev 646) @@ -24,7 +24,7 @@ */ import fr.ulr.sammoa.application.io.output.map.DbfTimestampConverter; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2012-12-29 13:20:55 UTC (rev 645) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2013-04-23 21:59:46 UTC (rev 646) @@ -44,7 +44,7 @@ import fr.ulr.sammoa.persistence.Region; import fr.ulr.sammoa.persistence.RegionImpl; import fr.ulr.sammoa.persistence.SammoaDAOHelper; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.Before; import org.junit.Rule; Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java 2012-12-29 13:20:55 UTC (rev 645) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java 2013-04-23 21:59:46 UTC (rev 646) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -24,7 +24,7 @@ */ import com.google.common.collect.Lists; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import java.util.Date; Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/ObservationsTest.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/ObservationsTest.java 2012-12-29 13:20:55 UTC (rev 645) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/ObservationsTest.java 2013-04-23 21:59:46 UTC (rev 646) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -24,7 +24,7 @@ */ import com.google.common.collect.Lists; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; Modified: trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties 2012-12-29 13:20:55 UTC (rev 645) +++ trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties 2013-04-23 21:59:46 UTC (rev 646) @@ -1,16 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2 +# - Apache License 2.0 # - Apache Software Licenses # - BSD License -# - BSD style -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - BSD-3 Clause License # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU LESSER GENERAL PUBLIC LICENSE # - GNU Lesser General Public License # - GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. +# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - LGPL 2.1 @@ -18,16 +20,16 @@ # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - MPL 1.1 +# - New BSD License # - OpenMap Software License Agreement # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - lgpl # - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Jul 19 11:48:00 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Tue Apr 23 23:57:44 CEST 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0