January 2017 - Isis-fish-commits - mailman.cloud.codelutin.com

r4389 - in trunk/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/input/observation java/fr/ifremer/isisfish/util resources/i18n
by bpoussin＠users.forge.codelutin.com 19 Jan '17

19 Jan '17

Author: bpoussin Date: 2017-01-19 19:47:50 +0100 (Thu, 19 Jan 2017) New Revision: 4389 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4389 Log: fixes #8972: Pouvoir utilis?\195?\169 des objets natifs java pour les semantiques dans IsisMatrixSemanticMapper Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2017-01-19 18:47:50 UTC (rev 4389) @@ -374,6 +374,16 @@ } } + // TODO poussin 20170118 #8968 + // Il faut quoi qu'il arrive que les poissons recrutés durant le 1er mois de recrutement finissent + // en classe 0. Il se peut que pour les autres mois de recrutement il y ait besoin de changer de classe + // mais toujours en fonction de ce 1er mois de recrutement. Si le delta entre repro et recru est de 36 mois + // et que l'étalement du recrutement est sur 12 mois. et que la repro a lieu en juin. + // Les 6 premiers de recrutement finisse en classe 0, les 6 dernieres en classe 1. + // ----- implantation + // pour cela il faut remplir usedSeasons seulement avec les mois a partir + // du 2eme mois de recrutement (repro+gap+1) pour garantir que le 1er mois + // de recru finisse bien dans la classe 0. for (PopulationSeasonInfo info : usedSeasons) { Month month = info.getFirstMonth(); MatrixND CA = info.getGroupChangeMatrix(month); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java 2017-01-19 18:47:50 UTC (rev 4389) @@ -22,9 +22,11 @@ */ package fr.ifremer.isisfish.ui.input; +import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.ui.WelcomeSaveVerifier; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultJAXXContext; +import org.nuiton.topia.TopiaContext; /** * Ce contexte regroupe les élements qui servent à une hierachie d'interfaces Input. @@ -33,6 +35,34 @@ */ public class InputContext extends DefaultJAXXContext { + static RegionStorage storage; + static TopiaContext db; + + /** + * return RegionStorage currently used in input interface. + * @return + */ + public static RegionStorage getStorage() { + return storage; + } + + /** + * return TopiaContext currently used in input interface. + * need to load matrix with IsisMatrixSemanticMapper + * @return + */ + public static TopiaContext getDb() { + return db; + } + + public static void setDb(TopiaContext db) { + InputContext.db = db; + } + + public static void setStorage(RegionStorage storage) { + InputContext.storage = storage; + } + public InputContext(JAXXContext parent) { setParentContext(parent); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-01-19 18:47:50 UTC (rev 4389) @@ -138,6 +138,8 @@ if (name == null) { // show empty region ui + InputContext.setStorage(null); + InputContext.setDb(null); inputUI.getCardlayoutPrincipal().show(inputUI.getInputPanePrincipal(), "none"); TreeModel model = new DefaultTreeModel(null); inputUI.getFisheryRegionTree().setModel(model); @@ -155,6 +157,9 @@ // warning : this is a weak reference topiaContext.addTopiaEntityListener(regionChangeLogger); fisheryRegion = RegionStorage.getFisheryRegion(topiaContext); + + InputContext.setStorage(regionStorage); + InputContext.setDb(topiaContext); } catch (TopiaException | StorageException ex) { throw new IsisFishRuntimeException("Can't load region", ex); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2017-01-19 18:47:50 UTC (rev 4389) @@ -42,6 +42,8 @@ import fr.ifremer.isisfish.entities.Observation; import fr.ifremer.isisfish.ui.input.InputContentHandler; import fr.ifremer.isisfish.ui.util.ErrorHelper; +import java.io.File; +import org.nuiton.jaxx.runtime.JaxxFileChooser; /** * Observation handler. @@ -82,6 +84,29 @@ setObservationValueMatrix(); } + public void loadObservationValueMatrix() { + try { + Observation observation = inputContentUI.getBean(); + if (observation != null) { + File file = JaxxFileChooser.forLoadingFile() + .setApprovalText(t("isisfish.common.ok")) + .setPatternOrDescriptionFilters(".*\\.csv", "MatrixND csv file") + .setUseAcceptAllFileFilter(true).choose(); + if (file != null) { + MatrixND newMat = MatrixFactory.getInstance().create(file); + observation.setValue(newMat); + observation.update(); + setObservationValueMatrix(); + } + } + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Can't load matrix observation", eee); + } + ErrorHelper.showErrorDialog(t("isisfish.error.input.matrix.load"), eee); + } + } + public void createObservationValueMatrix(Observation observation) { try { String val = JOptionPane.showInputDialog(t("isisfish.message.observation.value.dimensions")); @@ -111,10 +136,9 @@ } } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Can't remove RecruitmentDistribution", eee); + log.error("Can't create matrix", eee); } - ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", - "RecruitmentDistribution"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.input.matrix.create"), eee); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx 2017-01-19 18:47:50 UTC (rev 4389) @@ -92,12 +92,12 @@ </cell> </row> <row> - <cell> - <JPanel/> - </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='horizontal' weightx='0.5'> <JButton text="isisfish.common.newMatrix" onActionPerformed='handler.createObservationValueMatrix()' enabled='{isActive()}' decorator='boxed'/> </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.loadMatrix" onActionPerformed='handler.loadObservationValueMatrix()' enabled='{isActive()}' decorator='boxed'/> + </cell> </row> </Table> </cell> Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2017-01-19 18:47:50 UTC (rev 4389) @@ -36,6 +36,7 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationGroupDAO; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.ui.input.InputContext; /** * Implementation du mapper de semantique pour Isis pour que l'import/export @@ -123,9 +124,11 @@ } else if (TopiaEntity.class.isAssignableFrom(type)) { TopiaContext context = SimulationContext.get().getDB(); - // TODO poussin 20170118 si pas de context de simulation - // alors demander le context de region en edition (travail a faire) - // utile pour charger des Observation avec semantique dans la region. + // si on est pas en simulation, on est peut-etre en saisie, + // on utilise la base de la saisie (Evolution #8971) + if (context == null) { + context = InputContext.getDb(); + } TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); value = dao.findByProperty("name", valueId); } else { Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-01-19 18:47:50 UTC (rev 4389) @@ -126,6 +126,7 @@ isisfish.common.immigration=Immigration isisfish.common.info=info isisfish.common.ko=KO +isisfish.common.loadMatrix=Load file isisfish.common.migration=Migration isisfish.common.module=Module isisfish.common.month=month %1$s @@ -322,6 +323,8 @@ isisfish.error.input.addentity=Can't add entity "%s" isisfish.error.input.cancelentity=Can't cancel modification on entity isisfish.error.input.createentity=Can't create entity +isisfish.error.input.matrix.create=Can't create matrix +isisfish.error.input.matrix.load=Can't load matrix isisfish.error.input.removeentity=Can't remove entity "%s" isisfish.error.input.saveentity=Can't save entity isisfish.error.input.spacializematrix= Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-01-19 18:07:40 UTC (rev 4388) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-01-19 18:47:50 UTC (rev 4389) @@ -126,6 +126,7 @@ isisfish.common.immigration=immigration isisfish.common.info=Info isisfish.common.ko=KO +isisfish.common.loadMatrix=Charger un fichier isisfish.common.migration=migration isisfish.common.module=Module isisfish.common.month=mois %1$s @@ -322,6 +323,8 @@ isisfish.error.input.addentity=Impossible d'ajouter l'entité "%s" isisfish.error.input.cancelentity=Impossible d'annuler les modifications isisfish.error.input.createentity=Impossible de créer une nouvelle entité +isisfish.error.input.matrix.create=Impossible de créer la matrice +isisfish.error.input.matrix.load=Impossible de charger la matrice isisfish.error.input.removeentity=Impossible de supprimer l'entité "%s" isisfish.error.input.saveentity=Impossible de sauver les modifications isisfish.error.input.spacializematrix=

1 0

r4388 - trunk/src/main/java/fr/ifremer/isisfish/util
by bpoussin＠users.forge.codelutin.com 19 Jan '17

19 Jan '17

Author: bpoussin Date: 2017-01-19 19:07:40 +0100 (Thu, 19 Jan 2017) New Revision: 4388 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4388 Log: fixes #8972: Pouvoir utilis?\195?\169 des objets natifs java pour les semantiques dans IsisMatrixSemanticMapper Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2017-01-04 09:27:29 UTC (rev 4387) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2017-01-19 18:07:40 UTC (rev 4388) @@ -67,15 +67,19 @@ // In simulation context : Class clazz = null; try { - clazz = Class.forName("fr.ifremer.isisfish.entities." + typeName); - } catch (Exception ex) { + // try first exact class (need for java.lang.String, java.lang.Integer, ...) + clazz = Class.forName(typeName); + } catch (Exception eee) { try { - clazz = Class.forName("fr.ifremer.isisfish.types." + typeName); - } catch (Exception ex2) { - log.warn("Can't find class for name " + typeName, ex2); - clazz = String.class; + clazz = Class.forName("fr.ifremer.isisfish.entities." + typeName); + } catch (Exception eee1) { + try { + clazz = Class.forName("fr.ifremer.isisfish.types." + typeName); + } catch (Exception eee2) { + log.warn("Can't find class for name " + typeName, eee2); + clazz = String.class; + } } - } return clazz; } @@ -119,6 +123,9 @@ } else if (TopiaEntity.class.isAssignableFrom(type)) { TopiaContext context = SimulationContext.get().getDB(); + // TODO poussin 20170118 si pas de context de simulation + // alors demander le context de region en edition (travail a faire) + // utile pour charger des Observation avec semantique dans la region. TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); value = dao.findByProperty("name", valueId); } else {

1 0

r4387 - in trunk: . src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 04 Jan '17

04 Jan '17

Author: echatellier Date: 2017-01-04 10:27:29 +0100 (Wed, 04 Jan 2017) New Revision: 4387 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4387 Log: fixes #8787: Impossible d'utiliser R via le package rJava en x64 Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-01-03 13:28:55 UTC (rev 4386) +++ trunk/pom.xml 2017-01-04 09:27:29 UTC (rev 4387) @@ -185,7 +185,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-j2r</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> <scope>compile</scope> </dependency> Modified: trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java 2017-01-03 13:28:55 UTC (rev 4386) +++ trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java 2017-01-04 09:27:29 UTC (rev 4387) @@ -33,6 +33,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -92,15 +93,17 @@ // 1 lignes = commande OK, mais rJava n'est pas installé // 2 lignes = commande OK et rJava est installé if (output.size() == 1) { - //installRJava(); + if (log.isWarnEnabled()) { + log.warn("Can't locate rJava package using Rscript (probably not installed)"); + } } else if (output.size() == 2) { // get install location without "" - String location = output.get(1).trim(); - location = StringUtils.removeStart(location, "\""); - location = StringUtils.removeEnd(location, "\""); + String repository = output.get(1).trim(); + repository = StringUtils.removeStart(repository, "\""); + repository = StringUtils.removeEnd(repository, "\""); // build full library path - location = location.replace('/', File.separatorChar); - location += File.separator + "rJava" + File.separator + "jri"; + repository = repository.replace('/', File.separatorChar); + String location = getArchLibraryPath(repository); setJavaLibraryPath(location); } else if (log.isErrorEnabled()) { log.error("Can't analyze Rscript output. was: "); @@ -111,6 +114,31 @@ } /** + * On some platform, rJava dll are installed into a sub directory depending on system arch. + * + * @param libraryRepository library base repository + * @return rJava lib path depending on arch + */ + protected static String getArchLibraryPath(String libraryRepository) { + String archLibraryPath = libraryRepository + File.separator + "rJava" + File.separator + "jri"; + + String arch = SystemUtils.OS_ARCH; + if ("x86_64".equals(arch) || "amd64".equals(arch)) { + String x64LibraryPath = archLibraryPath + File.separator + "x64"; + if (new File(x64LibraryPath).isDirectory()) { + archLibraryPath = x64LibraryPath; + } + } else { + String i386LibraryPath = archLibraryPath + File.separator + "i386"; + if (new File(i386LibraryPath).isDirectory()) { + archLibraryPath = i386LibraryPath; + } + } + + return archLibraryPath; + } + + /** * Set runtime java library path. * * http://fahdshariff.blogspot.fr/2011/08/changing-java-library-path-at-runtim…

1 0

r4386 - trunk
by echatellier＠users.forge.codelutin.com 03 Jan '17

03 Jan '17

Author: echatellier Date: 2017-01-03 14:28:55 +0100 (Tue, 03 Jan 2017) New Revision: 4386 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4386 Log: Update jaxx Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-01-03 13:21:29 UTC (rev 4385) +++ trunk/pom.xml 2017-01-03 13:28:55 UTC (rev 4386) @@ -564,7 +564,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.33.1</jaxxVersion> + <jaxxVersion>2.37</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.12-SNAPSHOT</topiaVersion> <hibernateVersion>5.1.3.Final</hibernateVersion>

1 0

r4385 - trunk
by echatellier＠users.forge.codelutin.com 03 Jan '17

03 Jan '17

Author: echatellier Date: 2017-01-03 14:21:29 +0100 (Tue, 03 Jan 2017) New Revision: 4385 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4385 Log: Update slf4j Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-01-03 13:19:51 UTC (rev 4384) +++ trunk/pom.xml 2017-01-03 13:21:29 UTC (rev 4385) @@ -229,7 +229,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.21</version> + <version>1.7.22</version> <scope>runtime</scope> </dependency>

1 0

r4384 - trunk
by echatellier＠users.forge.codelutin.com 03 Jan '17

03 Jan '17

Author: echatellier Date: 2017-01-03 14:19:51 +0100 (Tue, 03 Jan 2017) New Revision: 4384 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4384 Log: Update nuiton-config Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-01-03 13:19:27 UTC (rev 4383) +++ trunk/pom.xml 2017-01-03 13:19:51 UTC (rev 4384) @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.1</version> + <version>3.1.1</version> <scope>compile</scope> </dependency>

1 0

r4383 - trunk
by echatellier＠users.forge.codelutin.com 03 Jan '17

03 Jan '17

Author: echatellier Date: 2017-01-03 14:19:27 +0100 (Tue, 03 Jan 2017) New Revision: 4383 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4383 Log: Update hibernate Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-01-03 13:19:02 UTC (rev 4382) +++ trunk/pom.xml 2017-01-03 13:19:27 UTC (rev 4383) @@ -567,7 +567,7 @@ <jaxxVersion>2.33.1</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.12-SNAPSHOT</topiaVersion> - <hibernateVersion>5.1.2.Final</hibernateVersion> + <hibernateVersion>5.1.3.Final</hibernateVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r4382 - trunk
by echatellier＠users.forge.codelutin.com 03 Jan '17

03 Jan '17

Author: echatellier Date: 2017-01-03 14:19:02 +0100 (Tue, 03 Jan 2017) New Revision: 4382 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4382 Log: Update aspectj Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-01-03 13:18:19 UTC (rev 4381) +++ trunk/pom.xml 2017-01-03 13:19:02 UTC (rev 4382) @@ -319,7 +319,7 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.9</version> + <version>1.8.10</version> </dependency> <dependency>

1 0

r4381 - in trunk: . src/main/java/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com 03 Jan '17

03 Jan '17

Author: echatellier Date: 2017-01-03 14:18:19 +0100 (Tue, 03 Jan 2017) New Revision: 4381 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4381 Log: Fix compil error Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-01-03 13:14:19 UTC (rev 4380) +++ trunk/pom.xml 2017-01-03 13:18:19 UTC (rev 4381) @@ -399,6 +399,18 @@ <version>3.8</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.8.5</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.8.5</version> + </dependency> +  <dependency> <groupId>junit</groupId> Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java 2017-01-03 13:14:19 UTC (rev 4380) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java 2017-01-03 13:18:19 UTC (rev 4381) @@ -1,6 +1,5 @@ package fr.ifremer.isisfish.entities; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper;

1 0

r4380 - trunk
by echatellier＠users.forge.codelutin.com 03 Jan '17

03 Jan '17

Author: echatellier Date: 2017-01-03 14:14:19 +0100 (Tue, 03 Jan 2017) New Revision: 4380 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4380 Log: Update guava Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-11-30 16:04:30 UTC (rev 4379) +++ trunk/pom.xml 2017-01-03 13:14:19 UTC (rev 4380) @@ -390,7 +390,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <version>20.0</version> </dependency> <dependency>

1 0