Merge "Update versions of dependencies"

1 files changed, 38 insertions, 20 deletions

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index bbb96170..33f1cd1a 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -93,7 +93,7 @@
             <dependency>
                 <groupId>ch.vorburger.mariaDB4j</groupId>
                 <artifactId>mariaDB4j</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -106,6 +106,7 @@
                 <artifactId>hppc</artifactId>
                 <version>0.7.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
@@ -121,13 +122,13 @@
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
                 <artifactId>wiremock</artifactId>
-                <version>2.7.1</version>
+                <version>2.25.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.8.5</version>
+                <version>2.8.6</version>
             </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
@@ -137,7 +138,7 @@
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
-                <version>2.3.0</version>
+                <version>2.4.0</version>
             </dependency>
             <dependency>
                 <groupId>com.ning</groupId>
@@ -159,6 +160,7 @@
                 <artifactId>jsr166e</artifactId>
                 <version>1.1.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
@@ -169,11 +171,13 @@
                 <artifactId>commons-cli</artifactId>
                 <version>1.3.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
                 <version>2.6</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -184,31 +188,33 @@
                 <artifactId>dom4j</artifactId>
                 <version>1.6.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
                 <version>4.1.34.Final</version>
                 <type>pom</type>
             </dependency>
+            <!-- Indirect ODL constraint : should be compatible with io.netty version -->
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-protobuf</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-stub</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-testing</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>jakarta-regexp</groupId>
@@ -220,6 +226,7 @@
                 <artifactId>javaee-api</artifactId>
                 <version>7.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
@@ -230,6 +237,7 @@
                 <artifactId>servlet-api</artifactId>
                 <version>2.5</version>
             </dependency>
+
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
@@ -246,11 +254,13 @@
                 <artifactId>commons-io</artifactId>
                 <version>1.3.2</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
                 <version>3.8.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
@@ -265,13 +275,15 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.10</version>
+                <version>4.4.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.6</version>
+                <version>4.5.10</version>
             </dependency>
+
+            <!-- There are newer major releases of lucene available -->
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-analyzers-common</artifactId>
@@ -345,8 +357,9 @@
             <dependency>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-                <version>2.3.2</version>
+                <version>2.3.10</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
@@ -370,23 +383,27 @@
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
                 <version>9.4.12.v20180830</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlets</artifactId>
                 <version>9.4.12.v20180830</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty.websocket</groupId>
                 <artifactId>websocket-api</artifactId>
                 <version>9.4.12.v20180830</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty.websocket</groupId>
                 <artifactId>websocket-servlet</artifactId>
@@ -407,6 +424,7 @@
                 <artifactId>delete-by-query</artifactId>
                 <version>2.2.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
@@ -422,7 +440,7 @@
             <dependency>
                 <groupId>org.java-websocket</groupId>
                 <artifactId>Java-WebSocket</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.0</version>
             </dependency>
             <dependency>
                 <groupId>org.joda</groupId>
@@ -438,40 +456,40 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.8.3</version>
+                <version>1.12.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>2.1.1</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-api-mockito2</artifactId>
-                <version>1.6.6</version>
+                <version>1.7.4</version>
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-module-junit4</artifactId>
-                <version>1.6.6</version>
+                <version>1.7.4</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.7.25</version>
+                <version>1.7.29</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>4.3.24.RELEASE</version>
+                <version>4.3.25.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>6.11</version>
+                <version>6.14.3</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>