From e1135c7929ce322516e1a27b00435f084bf8527b Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 6 Dec 2023 16:07:24 +0100
Subject: [PATCH] Update deps to VIPSCommon and models
---
models.xml | 44 +++++++++----------
pom.xml | 2 +-
.../vips/core/service/ModelResourceImpl.java | 1 +
3 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/models.xml b/models.xml
index 92d6d8a..d9aa6a0 100644
--- a/models.xml
+++ b/models.xml
@@ -2,111 +2,111 @@
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>AlternariaModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.4</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>AppleScabModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>BarleyNetBlotchModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>BremiaLactucaeModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>DeliaRadicumModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>DeliaRadicumFloralisObservationModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>DOWNCASTModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>fi.luke.vips.model</groupId>
<artifactId>FinnCerealModels</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>GrassDryingModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>LygusRugulipennisModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>MamestraBrassicaeModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>Model_LEAFBLOTCH</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>Model_MAIZEPHENO</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>NaerstadModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>NegativePrognosisModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>OatFloweringModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>PsilaRosaeObservationModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>PsilaRosaeTempModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>RoughageNutritionModel</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>SeptoriaApiicolaModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>SeptoriaHumidityModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.model</groupId>
<artifactId>SeptoriaReferenceHumidityModel</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
</dependencies>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 42f24f2..24b4849 100755
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>javax</groupId>
diff --git a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
index 2d77976..257b3b8 100755
--- a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
@@ -341,6 +341,7 @@ public class ModelResourceImpl implements ModelResource{
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
calledModel.setConfiguration(config);
List<Result> results = calledModel.getResult();
+ //results.forEach(x->System.out.println(x.toString()));
return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build();
}
catch(Exception ex)
--
GitLab