Skip to content
Snippets Groups Projects
Commit e1135c79 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Update deps to VIPSCommon and models

parent 17babb2c
Branches
Tags
No related merge requests found
Pipeline #2674 passed
...@@ -2,111 +2,111 @@ ...@@ -2,111 +2,111 @@
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>AlternariaModel</artifactId> <artifactId>AlternariaModel</artifactId>
<version>1.1.1</version> <version>1.1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>AppleScabModel</artifactId> <artifactId>AppleScabModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>BarleyNetBlotchModel</artifactId> <artifactId>BarleyNetBlotchModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>BremiaLactucaeModel</artifactId> <artifactId>BremiaLactucaeModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>DeliaRadicumModel</artifactId> <artifactId>DeliaRadicumModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>DeliaRadicumFloralisObservationModel</artifactId> <artifactId>DeliaRadicumFloralisObservationModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>DOWNCASTModel</artifactId> <artifactId>DOWNCASTModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>fi.luke.vips.model</groupId> <groupId>fi.luke.vips.model</groupId>
<artifactId>FinnCerealModels</artifactId> <artifactId>FinnCerealModels</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>GrassDryingModel</artifactId> <artifactId>GrassDryingModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>LygusRugulipennisModel</artifactId> <artifactId>LygusRugulipennisModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>MamestraBrassicaeModel</artifactId> <artifactId>MamestraBrassicaeModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>Model_LEAFBLOTCH</artifactId> <artifactId>Model_LEAFBLOTCH</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>Model_MAIZEPHENO</artifactId> <artifactId>Model_MAIZEPHENO</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>NaerstadModel</artifactId> <artifactId>NaerstadModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>NegativePrognosisModel</artifactId> <artifactId>NegativePrognosisModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>OatFloweringModel</artifactId> <artifactId>OatFloweringModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>PsilaRosaeObservationModel</artifactId> <artifactId>PsilaRosaeObservationModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>PsilaRosaeTempModel</artifactId> <artifactId>PsilaRosaeTempModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>RoughageNutritionModel</artifactId> <artifactId>RoughageNutritionModel</artifactId>
<version>1.1.4</version> <version>1.1.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>SeptoriaApiicolaModel</artifactId> <artifactId>SeptoriaApiicolaModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>SeptoriaHumidityModel</artifactId> <artifactId>SeptoriaHumidityModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>SeptoriaReferenceHumidityModel</artifactId> <artifactId>SeptoriaReferenceHumidityModel</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
\ No newline at end of file
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<dependency> <dependency>
<groupId>no.nibio.vips</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId> <artifactId>VIPSCommon</artifactId>
<version>2.0.1</version> <version>2.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax</groupId> <groupId>javax</groupId>
......
...@@ -341,6 +341,7 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -341,6 +341,7 @@ public class ModelResourceImpl implements ModelResource{
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId); Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
calledModel.setConfiguration(config); calledModel.setConfiguration(config);
List<Result> results = calledModel.getResult(); List<Result> results = calledModel.getResult();
//results.forEach(x->System.out.println(x.toString()));
return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build(); return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build();
} }
catch(Exception ex) catch(Exception ex)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment