Author: echatellier Date: 2012-08-07 16:24:28 +0200 (Tue, 07 Aug 2012) New Revision: 428 Url: http://nuiton.org/repositories/revision/nuiton-matrix/428 Log: refs #2004, #2235: Update libs Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/nuiton-matrix/pom.xml 2012-08-07 14:24:28 UTC (rev 428) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> @@ -53,6 +53,12 @@ <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> </dependencies> Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-07 14:24:28 UTC (rev 428) @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.BeforeClass; @@ -317,7 +318,7 @@ "1;1;1;42.0"; File file = File.createTempFile("import-reader", ".txt"); file.deleteOnExit(); - FileUtil.writeString(file, matrix3D); + FileUtils.writeStringToFile(file, matrix3D, "utf-8"); MatrixND m = MatrixFactory.getInstance().create(new int[]{2, 2, 2}); m.importCSV(new FileReader(file), null); } Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/nuiton-matrix-gui/pom.xml 2012-08-07 14:24:28 UTC (rev 428) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> @@ -75,7 +75,7 @@ <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/pom.xml 2012-08-07 14:24:28 UTC (rev 428) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> <modules> <module>nuiton-matrix</module> @@ -50,7 +50,7 @@ <artifactId>javahelp</artifactId> </exclusion> <exclusion> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </exclusion> <exclusion> @@ -98,8 +98,8 @@ <projectId>nuiton-matrix</projectId> - <jaxxVersion>2.4.2</jaxxVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <jaxxVersion>2.5.3</jaxxVersion> + <nuitonUtilsVersion>2.5.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> </properties> @@ -109,7 +109,7 @@ <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> </plugin> <plugin>