X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dependencies-odl-bom%2Fpom.xml;h=7152df5dc40c97bf75f327315c0726ca5bd10250;hb=50f48c988c331bcf5020c1b9f951cbbbfadce992;hp=6be92992e9b84050c8ed8d106d31092025875d1e;hpb=54fc4ce488bbd26b86fddc26c6e2af32ee1d7c15;p=ccsdk%2Fparent.git

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 6be92992..7152df5d 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>dependencies-odl-bom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>3.1.5</version>
-        <relativePath />
+        <version>4.0.10</version>
+        <relativePath/>
     </parent>
 
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>dependencies-odl-bom</artifactId>
+    <version>1.5.6</version>
+    <packaging>pom</packaging>
 
     <distributionManagement>
         <repository>
@@ -28,31 +25,36 @@
         </snapshotRepository>
     </distributionManagement>
 
-
     <!-- Note: maven properties do not work as expected in BOMs.  The property settings are
     not imported - so if you use a property in the version below, the pom that imports your BOM is
     expected to have that property set - defeating the whole point of a BOM.  Moral : use constants,
     not properties, for versions in BOMs -->
-
     <dependencyManagement>
         <dependencies>
             <!-- OpenDaylight dependencies -->
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>bgp-artifacts</artifactId>
+                <version>0.11.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.8.2</version>
+                <version>1.9.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.8.2</version>
+                <version>1.9.1</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.8.2</version>
+                <version>1.9.1</version>
                 <type>test-jar</type>
                 <classifier>tests</classifier>
                 <scope>test</scope>
@@ -60,38 +62,30 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-test-model</artifactId>
-                <version>1.8.2</version>
+                <version>1.9.1</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>2.5.2</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.13.2</version>
+                <version>3.0.8</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>1.5.2</version>
+                <version>1.6.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>restconf-artifacts</artifactId>
-                <version>1.8.2</version>
+                <version>1.9.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
-
             <!-- Other dependencies -->
             <dependency>
                 <groupId>ch.qos.logback</groupId>
@@ -106,7 +100,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>
@@ -119,10 +113,11 @@
                 <artifactId>hppc</artifactId>
                 <version>0.7.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.8.11.20181123</version>
+                <version>2.9.8</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -134,23 +129,28 @@
             <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>
                 <artifactId>protobuf-java</artifactId>
-                <version>3.6.1</version>
+                <version>3.10.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>3.10.0</version>
             </dependency>
             <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>
@@ -172,6 +172,7 @@
                 <artifactId>jsr166e</artifactId>
                 <version>1.1.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
@@ -182,11 +183,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.5</version>
+                <version>2.6</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -197,25 +200,21 @@
                 <artifactId>dom4j</artifactId>
                 <version>1.6.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-netty</artifactId>
-                <version>1.17.1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-protobuf</artifactId>
-                <version>1.17.1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-stub</artifactId>
-                <version>1.17.1</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>4.1.34.Final</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
+            <!-- Indirect ODL constraint : should be compatible with io.netty version -->
             <dependency>
                 <groupId>io.grpc</groupId>
-                <artifactId>grpc-testing</artifactId>
-                <version>1.17.1</version>
+                <artifactId>grpc-bom</artifactId>
+                <version>1.21.1</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>jakarta-regexp</groupId>
@@ -227,15 +226,22 @@
                 <artifactId>javaee-api</artifactId>
                 <version>7.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.1.0</version>
+            </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
                 <version>2.5</version>
             </dependency>
+
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.8.2</version>
+                <version>2.9.7</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -248,15 +254,17 @@
                 <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.4</version>
+                <version>3.8.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.1</version>
+                <version>1.6</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
@@ -267,13 +275,15 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.4</version>
+                <version>4.4.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.2</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>
@@ -347,17 +357,18 @@
             <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>
-                <version>0.12.0</version>
+                <version>2.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-jdbc</artifactId>
-                <version>8.5.14</version>
+                <version>9.0.30</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
@@ -369,20 +380,40 @@
                 <artifactId>jackson-jaxrs</artifactId>
                 <version>1.9.13</version>
             </dependency>
+            <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>1.4.0</version>
+            </dependency>
+            <!-- Constrained by OpenDaylight -->
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+                <version>9.4.12.v20180830</version>
+            </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
-                <version>9.3.24.v20180605</version>
+                <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.3.24.v20180605</version>
+                <version>9.4.12.v20180830</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty.websocket</groupId>
                 <artifactId>websocket-servlet</artifactId>
-                <version>9.3.24.v20180605</version>
+                <version>9.4.12.v20180830</version>
             </dependency>
             <dependency>
                 <groupId>org.elasticsearch</groupId>
@@ -399,6 +430,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>
@@ -414,7 +446,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>
@@ -424,53 +456,52 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>2.2.11</version>
+                <version>2.23.4</version>
                 <scope>test</scope>
             </dependency>
             <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.18.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>
                 <artifactId>snakeyaml</artifactId>
-                <version>1.15</version>
+                <version>1.25</version>
             </dependency>
         </dependencies>
-
     </dependencyManagement>
-</project>
\ No newline at end of file
+</project>