diff --git a/pom.xml b/pom.xml index 3469306d41704a2433db0890dd2258feffe5f65f..b4ff00f586a88ef8d70feb11faae9f765644c712 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>no.nibio.vips.common</groupId> <artifactId>VIPSCommon</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2022.1</version> <packaging>jar</packaging> @@ -26,8 +26,14 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.9.8</version> + <version>2.13.1</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + <version>2.13.1</version> + <type>jar</type> + </dependency> <dependency> <groupId>commons-validator</groupId> <artifactId>commons-validator</artifactId> @@ -37,66 +43,66 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.9.8</version> + <version>2.13.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.9.8</version> + <version>2.13.1</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5</version> + <version>4.5.13</version> <type>jar</type> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.1</version> + <version>4.4.15</version> <type>jar</type> <scope>provided</scope> </dependency> <dependency> <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> <type>jar</type> <scope>provided</scope> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> <artifactId>jts-core</artifactId> - <version>1.16.1</version> + <version>1.18.2</version> <type>jar</type> </dependency> <dependency> <groupId>javax</groupId> <artifactId>javaee-api</artifactId> - <version>8.0</version> + <version>8.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax</groupId> <artifactId>javaee-web-api</artifactId> - <version>8.0</version> + <version>8.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.10</version> + <version>1.15</version> </dependency> <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> - <version>52.1</version> + <version>70.1</version> </dependency> <dependency> <groupId>org.geotools</groupId> @@ -111,24 +117,24 @@ <dependency> <groupId>com.kjetland</groupId> <artifactId>mbknor-jackson-jsonschema_2.13</artifactId> - <version>1.0.36</version> + <version>1.0.39</version> </dependency> <dependency> <groupId>com.bedatadriven</groupId> <artifactId>jackson-datatype-jts</artifactId> - <version>2.2</version> + <version>2.4</version> </dependency> <dependency> <!--groupId>com.github.bjornharrtell</groupId--> <groupId>org.wololo</groupId> <artifactId>jts2geojson</artifactId> - <version>0.12.0</version> + <version>0.16.1</version> </dependency> <!-- https://mvnrepository.com/artifact/org.jscience/jscience --> <dependency> <groupId>javax.measure</groupId> <artifactId>unit-api</artifactId> - <version>1.0</version> + <version>2.1.3</version> </dependency> <dependency> <groupId>tec.units</groupId> @@ -138,7 +144,7 @@ <dependency> <groupId>org.renjin</groupId> <artifactId>renjin-script-engine</artifactId> - <version>RELEASE</version> + <version>3.5-beta76</version> </dependency> </dependencies> <repositories> @@ -171,7 +177,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> + <version>3.3.1</version> <configuration> <tags> <tag> @@ -186,12 +192,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0-M4</version> + <version>3.0.0-M5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> + <version>3.8.1</version> <configuration> <source>1.8</source> <target>1.8</target> diff --git a/src/test/java/no/nibio/vips/ipmdecisions/DataTransformerTest.java b/src/test/java/no/nibio/vips/ipmdecisions/DataTransformerTest.java index a34230e08dbf733a60feab0ca08cc941ffa4ccde..3a3bab6fd878ffffd2f8d409df0a7b2f9057e9e3 100644 --- a/src/test/java/no/nibio/vips/ipmdecisions/DataTransformerTest.java +++ b/src/test/java/no/nibio/vips/ipmdecisions/DataTransformerTest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.MappingJsonFactory; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import java.io.BufferedInputStream; import java.io.IOException; import java.time.Instant; @@ -87,7 +88,8 @@ public class DataTransformerTest extends TestCase { WeatherData weatherData = new WeatherData(); ObjectMapper mapper = new ObjectMapper(); //mapper.convertValue(all, new TypeReference<WeatherData>(){}); - + JavaTimeModule javaTimeModule = new JavaTimeModule(); + mapper.registerModule(javaTimeModule); weatherData.setTimeStart(((Date)mapper.convertValue(all.get("timeStart"), new TypeReference<Date>(){})).toInstant()); weatherData.setTimeEnd(((Date)mapper.convertValue(all.get("timeEnd"), new TypeReference<Date>(){})).toInstant()); @@ -116,6 +118,7 @@ public class DataTransformerTest extends TestCase { } catch(IOException ex) { + ex.printStackTrace(); return null; } }