Author: kmorin Date: 2014-11-24 12:42:22 +0000 (Mon, 24 Nov 2014) New Revision: 4135 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4135 Log: fix dependencies Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java trunk/src/test/resources/test-database/sensitivityanalysis/DOptimal.java trunk/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-11-23 21:41:46 UTC (rev 4134) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-11-24 12:42:22 UTC (rev 4135) @@ -47,7 +47,7 @@ import java.util.concurrent.Executors; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; Modified: trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java 2014-11-23 21:41:46 UTC (rev 4134) +++ trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java 2014-11-24 12:42:22 UTC (rev 4135) @@ -32,7 +32,7 @@ import java.util.List; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/src/test/resources/test-database/sensitivityanalysis/DOptimal.java =================================================================== --- trunk/src/test/resources/test-database/sensitivityanalysis/DOptimal.java 2014-11-23 21:41:46 UTC (rev 4134) +++ trunk/src/test/resources/test-database/sensitivityanalysis/DOptimal.java 2014-11-24 12:42:22 UTC (rev 4135) @@ -29,7 +29,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.util.Doc; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.types.RDataFrame; Modified: trunk/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java =================================================================== --- trunk/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java 2014-11-23 21:41:46 UTC (rev 4134) +++ trunk/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java 2014-11-24 12:42:22 UTC (rev 4135) @@ -30,7 +30,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.util.Doc; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.types.RDataFrame;