diff options
| author |   Eddy Hautot <eh552t@intl.att.com> | 2018-03-23 15:16:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-23 15:16:28 +0000 |
| commit | 28e11aa1b2c78016e29efc8ddf5fb8bd8b0cf766 (patch) | |
| tree | d9195d568e04a7b99e3ee8472adbfa8fedf7e020 | |
| parent | 87751f9e022fd044e40119a804a167bc0a338806 (diff) | |
| parent | 020f29ee84fe5d780108149aa9de04e86d308d03 (diff) | |
Merge changes from topic 'bugfix/sdc-controller'
* changes:
Change on jackson
Attempt to fix jackson-databind
| -rw-r--r-- | pom.xml | 33 |
1 files changed, 17 insertions, 16 deletions
@@ -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> |