From 7f23907c2416ef038782a12ccee390c19d88179d Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 1 Jun 2020 09:28:12 -0400
Subject: Add new BOM for preinstalled ODL dependencies

Add new BOM to reflect dependency versions installed in ODL image.
This new BOM is created by a new script - mkbom.sh - based on
jar files installed in the OpenDaylight local maven repository.

Issue-ID: CCSDK-2397
Change-Id: I70881f1db55a1482ce1d33ee598b69b4ad2661ba
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 dependencies-odl-bom/pom.xml | 150 ++-----------------------------------------
 1 file changed, 5 insertions(+), 145 deletions(-)

(limited to 'dependencies-odl-bom')

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index e18d3faf..92829d08 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -31,61 +31,16 @@
     not properties, for versions in BOMs -->
     <dependencyManagement>
         <dependencies>
-            <!-- OpenDaylight dependencies -->
+            <!-- Preinstalled OpenDaylight artifacts -->
             <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.9.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.9.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.9.1</version>
-                <type>test-jar</type>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-test-model</artifactId>
-                <version>1.9.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.8</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>1.6.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.9.1</version>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>installed-odl-bom</artifactId>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
+
             <!-- Other dependencies -->
             <dependency>
                 <groupId>ch.qos.logback</groupId>
@@ -113,14 +68,6 @@
                 <artifactId>hppc</artifactId>
                 <version>0.7.1</version>
             </dependency>
-            <!-- Constrained by OpenDaylight -->
-            <dependency>
-                <groupId>com.fasterxml.jackson</groupId>
-                <artifactId>jackson-bom</artifactId>
-                <version>2.9.8</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>com.github.stefanbirkner</groupId>
                 <artifactId>system-rules</artifactId>
@@ -132,11 +79,6 @@
                 <version>2.25.1</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>2.8.6</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
@@ -172,42 +114,16 @@
                 <artifactId>jsr166e</artifactId>
                 <version>1.1.0</version>
             </dependency>
-            <!-- Constrained by OpenDaylight -->
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
-            </dependency>
             <dependency>
                 <groupId>commons-cli</groupId>
                 <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>
-                <version>1.2</version>
-            </dependency>
             <dependency>
                 <groupId>dom4j</groupId>
                 <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>
-                <scope>import</scope>
-            </dependency>
             <!-- Indirect ODL constraint : should be compatible with io.netty version -->
             <dependency>
                 <groupId>io.grpc</groupId>
@@ -226,23 +142,11 @@
                 <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.9.7</version>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -254,18 +158,6 @@
                 <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>
-                <version>1.6</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
@@ -359,12 +251,6 @@
                 <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
                 <version>2.3.10</version>
             </dependency>
-            <!-- Constrained by OpenDaylight -->
-            <dependency>
-                <groupId>org.apache.sshd</groupId>
-                <artifactId>sshd-core</artifactId>
-                <version>2.0.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-jdbc</artifactId>
@@ -397,24 +283,6 @@
                 <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>
-                <version>9.4.12.v20180830</version>
-            </dependency>
             <dependency>
                 <groupId>org.elasticsearch</groupId>
                 <artifactId>elasticsearch</artifactId>
@@ -430,14 +298,6 @@
                 <artifactId>delete-by-query</artifactId>
                 <version>2.2.0</version>
             </dependency>
-            <!-- Constrained by OpenDaylight -->
-            <dependency>
-                <groupId>org.glassfish.jersey</groupId>
-                <artifactId>jersey-bom</artifactId>
-                <version>2.25.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.hdrhistogram</groupId>
                 <artifactId>HdrHistogram</artifactId>
-- 
cgit 1.2.3-korg