Skip to content
Snippets Groups Projects
Commit ce7a7dbc authored by Brita Linnestad's avatar Brita Linnestad
Browse files

Merge branch 'main' into 'release' 

Merge main into release

See merge request !51
parents 8031f1d3 a00aa6ba
No related branches found
No related tags found
1 merge request!51Merge main into release
Pipeline #6071 passed
Stage: build
Stage: test
Stage: deploy
Stage: upload
Hide whitespace changes
Inline Side-by-side
models.xml
+ 22
− 22
View file @ ce7a7dbc
...@@ -2,112 +2,112 @@ ...@@ -2,112 +2,112 @@
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>RoughageNutritionModel</artifactId> <artifactId>RoughageNutritionModel</artifactId>
<version>1.1.13</version> <version>1.1.16</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>AlternariaModel</artifactId> <artifactId>AlternariaModel</artifactId>
<version>1.1.15</version> <version>1.1.19</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.10</version> <version>1.1.12</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.10</version> <version>1.1.12</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.10</version> <version>1.1.12</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.10</version> <version>1.1.13</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.9</version> <version>1.1.12</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.10</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.9</version> <version>1.1.11</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.10</version> <version>1.1.13</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.8</version> <version>1.1.10</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.8</version> <version>1.1.10</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
......
pom.xml
+ 1
− 1
View file @ ce7a7dbc
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<groupId>no.nibio</groupId> <groupId>no.nibio</groupId>
<artifactId>VIPSCore</artifactId> <artifactId>VIPSCore</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>3.0.1</version> <version>3.0.2-SNAPSHOT</version>
<name>VIPSCore</name> <name>VIPSCore</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment