Author: echatellier Date: 2017-03-08 11:27:30 +0100 (Wed, 08 Mar 2017) New Revision: 4396 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4396 Log: Update libs. Fix build and tests. Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/pom.xml 2017-03-08 10:27:30 UTC (rev 4396) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-16</version> + <version>3.0-rc-18</version> <scope>compile</scope> </dependency> @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.1.1</version> + <version>3.2</version> <scope>compile</scope> </dependency> @@ -34,7 +34,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0.1</version> + <version>3.1</version> <scope>compile</scope> </dependency> @@ -111,25 +111,25 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>2.6.0</version> + <version>2.6.1</version> </dependency> <dependency> <groupId>com.fifesoft</groupId> <artifactId>rstaui</artifactId> - <version>2.6.0</version> + <version>2.6.1</version> </dependency> <!-- <dependency> <groupId>com.fifesoft</groupId> <artifactId>autocomplete</artifactId> - <version>2.6.0</version> + <version>2.6.1</version> </dependency> <dependency> <groupId>com.fifesoft</groupId> <artifactId>languagesupport</artifactId> - <version>2.6.0</version> + <version>2.6.1</version> </dependency> --> <dependency> @@ -229,7 +229,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.22</version> + <version>1.7.24</version> <scope>runtime</scope> </dependency> @@ -242,7 +242,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>compile</scope> </dependency> @@ -249,7 +249,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>compile</scope> </dependency> @@ -256,7 +256,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>runtime</scope> </dependency> @@ -263,7 +263,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>runtime</scope> </dependency> @@ -396,19 +396,19 @@ <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>3.8</version> + <version>3.9</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.5</version> + <version>2.8.7</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.5</version> + <version>2.8.7</version> </dependency> <!-- Tests --> @@ -564,11 +564,11 @@ <signatureVersion>1.0</signatureVersion> <!-- Dependencies version --> - <jaxxVersion>2.37</jaxxVersion> + <jaxxVersion>2.41</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.12-SNAPSHOT</topiaVersion> - <hibernateVersion>5.1.3.Final</hibernateVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> + <hibernateVersion>5.1.4.Final</hibernateVersion> + <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> @@ -575,21 +575,17 @@ <skipPostRelease>false</skipPostRelease> <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> <releaseEmail>noreply@forge.codelutin.com</releaseEmail> + <redmine.url>https://forge.${platform}</redmine.url> <!-- Correction des bugs du super pom --> - <javadocPluginVersion>2.10.3</javadocPluginVersion> + <javadocPluginVersion>2.10.4</javadocPluginVersion> + <assemblyPluginVersion>3.0.0</assemblyPluginVersion> + <jarPluginVersion>3.0.2</jarPluginVersion> + <surefirePluginVersion>2.19.1</surefirePluginVersion> + <sitePluginVersion>3.6</sitePluginVersion> + <jrstPluginVersion>2.3-SNAPSHOT</jrstPluginVersion> <maven.javadoc.skip>false</maven.javadoc.skip> - <animalSnifferPluginVersion>1.14</animalSnifferPluginVersion> - <redmine.url>https://forge.${platform}</redmine.url> - <maven.javadoc.skip>false</maven.javadoc.skip> - - <!-- jnlp (disabled until retested) - <keystorepath>${codelutin.keystorepath}</keystorepath> - <keystorealias>CodeLutin</keystorealias> - <keystorepass>codelutin</keystorepass> - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - <jnlpCodebase>${project.url}</jnlpCodebase> - <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>--> + <animalSnifferPluginVersion>1.15</animalSnifferPluginVersion> </properties> <distributionManagement> Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-03-08 10:27:30 UTC (rev 4396) @@ -28,7 +28,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.SessionFactory; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2017-03-08 10:27:30 UTC (rev 4396) @@ -40,6 +40,7 @@ import java.util.Properties; import fr.ifremer.isisfish.types.Month; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -327,11 +328,11 @@ List groups = pop.getPopulationGroup(); List zones = pop.getPopulationZone(); - if (groups.isEmpty()) { - groups.add("No group"); + if (CollectionUtils.isEmpty(groups)) { + groups = Collections.singletonList("No group"); } - if (zones.isEmpty()) { - zones.add("No zone"); + if (CollectionUtils.isEmpty(zones)) { + zones = Collections.singletonList("No zone"); } List[] semantics = new List[] { groups, zones }; result = MatrixFactory.getInstance().create( Modified: trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-03-08 10:27:30 UTC (rev 4396) @@ -75,7 +75,7 @@ private static Log log = LogFactory.getLog(VCSSVNTest.class); /** Run test out of target directory for SVN to not find parent .svn with not supported svn format. */ - public static final File TMPDIR = new File("target"); + public static final File TMPDIR = new File("target").getAbsoluteFile(); public static final String FILECONTENTTAG = "Version 3.1.0"; public static final String FILECONTENTTRUNK = "Version 3.2.0"; @@ -479,7 +479,7 @@ Map<File, String> result = vcs.getChanglog(files); - Map<File, String> expResult = new HashMap<File, String>(); + Map<File, String> expResult = new HashMap<>(); expResult.put(firstFile, "mise a jour de la version"); expResult.put(secondFile, "mise a jour de la version"); Assert.assertEquals(expResult, result);