Merge branch 'develop' of gitlab.nibio.no:VIPS/models/java/Model_OATFLOWERM into develop

pom.xml

@@ -18,7 +18,7 @@
           <version>2.4.1</version>
         </dependency>
         <dependency>
-            <groupId>no.nibio.vips.common</groupId>
+            <groupId>no.nibio.vips</groupId>
             <artifactId>VIPSCommon</artifactId>
             <version>2022.1</version>
         </dependency>

src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java

@@ -122,6 +122,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
     private Result initResult(WeatherObservation obs)
     {
         Calendar cal = Calendar.getInstance();
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
         Result result = new ResultImpl();
         result.setValidTimeStart(obs.getTimeMeasured());
         

src/test/java/OatFloweringModelTest.java

@@ -119,7 +119,7 @@ public class OatFloweringModelTest {
                 System.out.println("Result: [" + result.getValidTimeStart() + "]" + result.getAllValues());
             }*/
             
-            assertEquals("27", weekResult);
+            assertEquals("26", weekResult);
             assertEquals("60", zReached);
             
         }