Merge changes from topic 'bugfix/sdc-controller'
* changes:
Change on jackson
Attempt to fix jackson-databind
diff --git a/pom.xml b/pom.xml
index 3b2ebe1..86461c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,10 +284,6 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
@@ -329,10 +325,6 @@
<groupId>log4j</groupId>
</exclusion>
<exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- <exclusion>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</exclusion>
@@ -450,10 +442,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.3</version>
@@ -485,9 +473,24 @@
<version>1.0.1.Final</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.8.11.1</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <version>2.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>2.9.4</version>
</dependency>
<!-- Remove the MYSQL connector and replace it by Mariadb -->
<dependency>
@@ -506,8 +509,6 @@
<artifactId>sdc-tosca</artifactId>
<version>1.2.2</version>
</dependency>
-
-
</dependencies>
<build>