diff options
| author |   Eric Debeau <eric.debeau@orange.com> | 2019-04-29 16:27:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-29 16:27:42 +0000 |
| commit | e49da59b5e68847a83e269d988b43f863687cffc (patch) | |
| tree | ec714a0e7985b77053f0b1dc335b91f56d30a837 | |
| parent | 386c5265922f008e7412c8aef033e53ff83cc9e9 (diff) | |
| parent | d21408b75fc6e9cd5cbbd2743219128f3127e5f1 (diff) | |
Merge "Update dependencies to latest"
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | pom.xml | 38 |
2 files changed, 42 insertions, 1 deletions
@@ -18,6 +18,11 @@ ### Linux related ### *~ +### Restructured Text ### +conf.py +__* +_static + # KDE directory preferences .directory @@ -106,7 +106,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>2.1.3.RELEASE</version> + <version>2.1.4.RELEASE</version> <type>pom</type> <scope>import</scope> </dependency> @@ -118,6 +118,18 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>9.0.19</version> </dependency> <dependency> @@ -199,9 +211,19 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.12</version> + </dependency> + <!-- jolt --> <dependency> @@ -262,6 +284,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> </exclusions> </dependency> @@ -295,10 +321,20 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> + <exclusion> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>3.14.1</version> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> |