June 2014 - Isis-fish-commits - mailman.cloud.codelutin.com

r4005 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 16:57:50 +0200 (Mon, 02 Jun 2014) New Revision: 4005 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4005 Log: Fix release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 12:34:46 UTC (rev 4004) +++ trunk/pom.xml 2014-06-02 14:57:50 UTC (rev 4005) @@ -477,6 +477,9 @@ <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> + <skipPostRelease>false</skipPostRelease> + <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> + <releaseEmail>noreply(a)forge.codelutin.com</releaseEmail> <!-- jnlp (disabled until retested) <keystorepath>${codelutin.keystorepath}</keystorepath>

1 0

r4004 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 14:34:46 +0200 (Mon, 02 Jun 2014) New Revision: 4004 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4004 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 12:34:37 UTC (rev 4003) +++ trunk/pom.xml 2014-06-02 12:34:46 UTC (rev 4004) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0</version> + <version>4.3.0.1-SNAPSHOT</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> + <url>https://svn.codelutin.com/isis-fish/trunk</url> </scm> <repositories>

1 0

r4003 - in tags: . isis-fish-4.3.0.0
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 14:34:37 +0200 (Mon, 02 Jun 2014) New Revision: 4003 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4003 Log: [maven-release-plugin] copy for tag isis-fish-4.3.0.0 Added: tags/isis-fish-4.3.0.0/ Property changes on: tags/isis-fish-4.3.0.0 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea Added: svn:mergeinfo + /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670

1 0

r4002 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 14:34:30 +0200 (Mon, 02 Jun 2014) New Revision: 4002 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4002 Log: [maven-release-plugin] prepare release isis-fish-4.3.0.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 12:25:19 UTC (rev 4001) +++ trunk/pom.xml 2014-06-02 12:34:30 UTC (rev 4002) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0-SNAPSHOT</version> + <version>4.3.0.0</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> - <url>https://svn.codelutin.com/isis-fish/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> </scm> <repositories>

1 0

r4001 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 14:25:19 +0200 (Mon, 02 Jun 2014) New Revision: 4001 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4001 Log: Revert pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 11:30:25 UTC (rev 4000) +++ trunk/pom.xml 2014-06-02 12:25:19 UTC (rev 4001) @@ -6,12 +6,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <version>5.0.8</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0</version> + <version>4.3.0.0-SNAPSHOT</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> + <url>https://svn.codelutin.com/isis-fish/trunk</url> </scm> <repositories>

1 0

r4000 - trunk
by maven-release＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: maven-release Date: 2014-06-02 13:30:25 +0200 (Mon, 02 Jun 2014) New Revision: 4000 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4000 Log: [maven-release-plugin] prepare release isis-fish-4.3.0.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 11:26:08 UTC (rev 3999) +++ trunk/pom.xml 2014-06-02 11:30:25 UTC (rev 4000) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0-SNAPSHOT</version> + <version>4.3.0.0</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> - <url>https://svn.codelutin.com/isis-fish/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> </scm> <repositories>

1 0

r3999 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 13:26:08 +0200 (Mon, 02 Jun 2014) New Revision: 3999 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3999 Log: Set snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 11:25:14 UTC (rev 3998) +++ trunk/pom.xml 2014-06-02 11:26:08 UTC (rev 3999) @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:http://svn.codelutin.com/isis-fish/branches/4.0.1</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/isis-fish/branches/4.0.1</developerConnection> - <url>http://svn.codelutin.com/isis-fish/branches/4.0.1</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> + <url>https://svn.codelutin.com/isis-fish/trunk</url> </scm> <repositories>

1 0

r3998 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 13:25:14 +0200 (Mon, 02 Jun 2014) New Revision: 3998 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3998 Log: Set snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 10:36:07 UTC (rev 3997) +++ trunk/pom.xml 2014-06-02 11:25:14 UTC (rev 3998) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0</version> + <version>4.3.0.0-SNAPSHOT</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> + <connection>scm:svn:http://svn.codelutin.com/isis-fish/branches/4.0.1</connection> + <developerConnection>scm:svn:http://svn.codelutin.com/isis-fish/branches/4.0.1</developerConnection> + <url>http://svn.codelutin.com/isis-fish/branches/4.0.1</url> </scm> <repositories>

1 0

r3997 - trunk
by maven-release＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: maven-release Date: 2014-06-02 12:36:07 +0200 (Mon, 02 Jun 2014) New Revision: 3997 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3997 Log: [maven-release-plugin] prepare release isis-fish-4.3.0.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 10:25:19 UTC (rev 3996) +++ trunk/pom.xml 2014-06-02 10:36:07 UTC (rev 3997) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0-SNAPSHOT</version> + <version>4.3.0.0</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> - <url>https://svn.codelutin.com/isis-fish/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> </scm> <repositories>

1 0

r3996 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 12:25:19 +0200 (Mon, 02 Jun 2014) New Revision: 3996 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3996 Log: Fix trunk urls Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 10:17:39 UTC (rev 3995) +++ trunk/pom.xml 2014-06-02 10:25:19 UTC (rev 3996) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0</version> + <version>4.3.0.0-SNAPSHOT</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:http://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> - <url>http://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> + <url>https://svn.codelutin.com/isis-fish/trunk</url> </scm> <repositories>

1 0

r3995 - trunk
by maven-release＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: maven-release Date: 2014-06-02 12:17:39 +0200 (Mon, 02 Jun 2014) New Revision: 3995 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3995 Log: [maven-release-plugin] prepare release isis-fish-4.3.0.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 07:31:04 UTC (rev 3994) +++ trunk/pom.xml 2014-06-02 10:17:39 UTC (rev 3995) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0-SNAPSHOT</version> + <version>4.3.0.0</version>  <dependencies> @@ -664,9 +664,9 @@   <scm> - <connection>scm:svn:http://svn.codelutin.com/isis-fish/branches/4.0.1</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/isis-fish/branches/4.0.1</developerConnection> - <url>http://svn.codelutin.com/isis-fish/branches/4.0.1</url> + <connection>scm:svn:http://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</connection> + <developerConnection>scm:svn:http://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</developerConnection> + <url>http://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.0.0</url> </scm> <repositories>

1 0

r3994 - trunk
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 09:31:04 +0200 (Mon, 02 Jun 2014) New Revision: 3994 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3994 Log: Use nuiton-j2r release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 07:06:01 UTC (rev 3993) +++ trunk/pom.xml 2014-06-02 07:31:04 UTC (rev 3994) @@ -159,7 +159,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-j2r</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <scope>compile</scope> </dependency>

1 0

Jenkins build is unstable: isis-fish-ci #1
by admin+ci-codelutin.com＠codelutin.com June 2, 2014

June 2, 2014

See <http://ci.codelutin.com/jenkins/job/isis-fish-ci/1/>

1 24

Jenkins build is unstable: isis-fish-ci » IsisFish #1
by admin+ci-codelutin.com＠codelutin.com June 2, 2014

June 2, 2014

See <http://ci.codelutin.com/jenkins/job/isis-fish-ci/fr.ifremer$isis-fish/1/>

1 24

r3993 - in trunk/src/test/java/fr/ifremer/isisfish/simulator: launcher sensitivity
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 09:06:01 +0200 (Mon, 02 Jun 2014) New Revision: 3993 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3993 Log: fix tests Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2014-06-02 06:52:35 UTC (rev 3992) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2014-06-02 07:06:01 UTC (rev 3993) @@ -85,7 +85,7 @@ Assert.assertTrue("String \"" + simulationResultZip + "\" not found in template", content.indexOf(simulationResultZip) > 0); Assert.assertTrue("String \"" + simulationPreScript + "\" not found in template", content.indexOf(simulationPreScript) > 0); Assert.assertTrue("Action --simulateRemotellyWithPreScript not on script", content.indexOf(" --simulateRemotellyWithPreScript ") > 0); - Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk64/bin/java") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk7/bin/java") > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0); Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-06-02 06:52:35 UTC (rev 3992) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-06-02 07:06:01 UTC (rev 3993) @@ -197,7 +197,9 @@ */ @After public void clear() throws IOException { - FileUtils.deleteDirectory(simulationsDir); + if (simulationsDir != null) { + FileUtils.deleteDirectory(simulationsDir); + } } /**

1 0

r3992 - trunk/src/main/assembly
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 08:52:35 +0200 (Mon, 02 Jun 2014) New Revision: 3992 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3992 Log: Add system property to load jri libs Modified: trunk/src/main/assembly/isisfish.bat trunk/src/main/assembly/isisfish.sh Modified: trunk/src/main/assembly/isisfish.bat =================================================================== --- trunk/src/main/assembly/isisfish.bat 2014-06-01 19:20:40 UTC (rev 3991) +++ trunk/src/main/assembly/isisfish.bat 2014-06-02 06:52:35 UTC (rev 3992) @@ -1,8 +1,8 @@ @echo off rem Uncomment following 2 lines to easy configure R for ISIS-Fish -rem SET R_HOME=C:\Program Files\R\R-2.14.1 +rem SET R_HOME=C:\Program Files\R\R-3.0.0 rem SET PATH=%PATH%;%R_HOME%\bin\i386 echo [Script] Isis starting... -java -Xmx900M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 +java -Xmx900M -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 Modified: trunk/src/main/assembly/isisfish.sh =================================================================== --- trunk/src/main/assembly/isisfish.sh 2014-06-01 19:20:40 UTC (rev 3991) +++ trunk/src/main/assembly/isisfish.sh 2014-06-02 06:52:35 UTC (rev 3992) @@ -2,4 +2,4 @@ MEMORY="-Xmx1024M" -java $MEMORY -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt +java $MEMORY -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt

1 0

r3991 - branches/4.0.1/src/main/assembly
by echatellier＠users.forge.codelutin.com June 1, 2014

June 1, 2014

Author: echatellier Date: 2014-06-01 21:20:40 +0200 (Sun, 01 Jun 2014) New Revision: 3991 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3991 Log: Add system property to load jri libs Modified: branches/4.0.1/src/main/assembly/isisfish.bat branches/4.0.1/src/main/assembly/isisfish.sh Modified: branches/4.0.1/src/main/assembly/isisfish.bat =================================================================== --- branches/4.0.1/src/main/assembly/isisfish.bat 2014-05-30 09:36:58 UTC (rev 3990) +++ branches/4.0.1/src/main/assembly/isisfish.bat 2014-06-01 19:20:40 UTC (rev 3991) @@ -5,4 +5,4 @@ rem SET PATH=%PATH%;%R_HOME%\bin\i386 echo [Script] Isis starting... -java -Xmx900M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 +java -Xmx900M -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 Modified: branches/4.0.1/src/main/assembly/isisfish.sh =================================================================== --- branches/4.0.1/src/main/assembly/isisfish.sh 2014-05-30 09:36:58 UTC (rev 3990) +++ branches/4.0.1/src/main/assembly/isisfish.sh 2014-06-01 19:20:40 UTC (rev 3991) @@ -2,4 +2,4 @@ MEMORY="-Xmx1024M" -java $MEMORY -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt +java $MEMORY -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt

1 0