Add new BOM for odl-based projects

Refactor dependencyManagement section from odlparent poms into a new
BOM for ease of maintenance.

Change-Id: I4e31ccc2a3c5349b10777c14b9d5e7fd3e034c46
Issue-ID: CCSDK-1412
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
new file mode 100644 (file)
index 0000000..a799da3
--- /dev/null
+++ b/dependencies-bom/pom.xml
@@ -0,0 +1,182 @@
+<?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">
+
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>dependencies-bom</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+
+
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.vorburger.mariaDB4j</groupId>
+                <artifactId>mariaDB4j</artifactId>
+                <version>2.2.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.att.eelf</groupId>
+                <artifactId>eelf-core</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>2.8.11.20181123</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>3.6.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.jayway.jsonpath</groupId>
+                <artifactId>json-path</artifactId>
+                <version>2.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.6</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <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>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-testing</artifactId>
+                <version>1.17.1</version>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>1.5.22</version>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-core</artifactId>
+                <version>1.5.22</version>
+            </dependency>
+            <dependency>
+                <groupId>javax</groupId>
+                <artifactId>javaee-api</artifactId>
+                <version>7.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>javax.ws.rs-api</artifactId>
+                <version>2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.14.2.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.4.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jdbc</artifactId>
+                <version>8.5.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>1.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>1.9.13</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey</groupId>
+                <artifactId>jersey-bom</artifactId>
+                <version>2.25.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>3.6.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>1.8.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>2.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>1.7.25</version>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>6.11</version>
+            </dependency>
+        </dependencies>
+
+    </dependencyManagement>
+</project>
\ No newline at end of file

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
new file mode 100644 (file)
index 0000000..b12427f
--- /dev/null
+++ b/dependencies-odl-bom/pom.xml
@@ -0,0 +1,466 @@
+<?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">
+
+
+    <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 />
+    </parent>
+
+
+
+
+    <!-- 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.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.8.2</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>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-binding-broker-impl</artifactId>
+                <version>1.8.2</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.8.2</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>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>1.5.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>1.8.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+
+            <!-- Other dependencies -->
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.vorburger.mariaDB4j</groupId>
+                <artifactId>mariaDB4j</artifactId>
+                <version>2.2.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.att.eelf</groupId>
+                <artifactId>eelf-core</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.carrotsearch</groupId>
+                <artifactId>hppc</artifactId>
+                <version>0.7.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>2.8.11.20181123</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.github.stefanbirkner</groupId>
+                <artifactId>system-rules</artifactId>
+                <version>1.19.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock</artifactId>
+                <version>2.7.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.8.5</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>3.6.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.jayway.jsonpath</groupId>
+                <artifactId>json-path</artifactId>
+                <version>2.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.ning</groupId>
+                <artifactId>compress-lzf</artifactId>
+                <version>1.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.spatial4j</groupId>
+                <artifactId>spatial4j</artifactId>
+                <version>0.5</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tdunning</groupId>
+                <artifactId>t-digest</artifactId>
+                <version>3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.twitter</groupId>
+                <artifactId>jsr166e</artifactId>
+                <version>1.1.0</version>
+            </dependency>
+            <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>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.5</version>
+            </dependency>
+            <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>
+            <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>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-testing</artifactId>
+                <version>1.17.1</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta-regexp</groupId>
+                <artifactId>jakarta-regexp</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>javax</groupId>
+                <artifactId>javaee-api</artifactId>
+                <version>7.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>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>1.3.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.14.2.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.4.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-analyzers-common</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-backward-codecs</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-core</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-grouping</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-highlighter</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-join</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-memory</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-misc</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-queries</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-queryparser</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-sandbox</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-spatial</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-spatial3d</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-suggest</artifactId>
+                <version>5.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+                <version>2.3.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-core</artifactId>
+                <version>0.12.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jdbc</artifactId>
+                <version>8.5.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>1.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>1.9.13</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>9.3.24.v20180605</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.websocket</groupId>
+                <artifactId>websocket-api</artifactId>
+                <version>9.3.24.v20180605</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.websocket</groupId>
+                <artifactId>websocket-servlet</artifactId>
+                <version>9.3.24.v20180605</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch</groupId>
+                <artifactId>elasticsearch</artifactId>
+                <version>2.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch</groupId>
+                <artifactId>securesm</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch.plugin</groupId>
+                <artifactId>delete-by-query</artifactId>
+                <version>2.2.0</version>
+            </dependency>
+            <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>
+                <version>2.1.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.java-websocket</groupId>
+                <artifactId>Java-WebSocket</artifactId>
+                <version>1.3.8</version>
+            </dependency>
+            <dependency>
+                <groupId>org.joda</groupId>
+                <artifactId>joda-convert</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>2.2.11</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>1.8.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>2.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito2</artifactId>
+                <version>1.6.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>1.6.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>1.7.25</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>4.3.18.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>6.11</version>
+            </dependency>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>1.15</version>
+            </dependency>
+        </dependencies>
+
+    </dependencyManagement>
+</project>
\ No newline at end of file

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index d9189c9..508c02d 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 4c3f4c0..4e5bf85 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 053fdb5..af628d8 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 7a4fe7f..0aaec6a 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index c3a2962..2d7cc81 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 3523752..8ae592c 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 6ed32b2..8374afb 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>\${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>\${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>\${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>\${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>\${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>\${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>${project.version}</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>\${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>\${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>\${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>\${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>\${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>\${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>\${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>\${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>\${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>\${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 1669133..fbb0edd 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -177,20 +177,29 @@
                <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
                <jackson-annotations-version>${jackson.version}</jackson-annotations-version>
                <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
-               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
                <antlr.version>4.7.1</antlr.version>
                <mysql.connector.version>5.1.39</mysql.connector.version>
-               <mariadb.connector.version>2.1.1</mariadb.connector.version>
-               <h2database.version>1.4.196</h2database.version>
-               <derby.version>10.14.2.0</derby.version>
 
-               <eelf.version>1.0.0</eelf.version>
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
-
                <glassfish.version>2.27</glassfish.version>
+
+               <!-- Managed dependency versions -->
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
                <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
@@ -465,6 +474,7 @@
                        </build>
                </profile>
                <profile>
+                       <id>yang-compile</id>
                        <activation>
                                <file>
                                        <exists>src/main/yang</exists>
@@ -521,104 +531,30 @@
 
        <dependencyManagement>
                <dependencies>
+
+                       <!-- Note: If value in BOM conflicts with value inherited from
+                       parent pom, inherited value takes precedence.  This seems more like
+                       a bug than a feature, but this is how maven 3.6 works -->
                        <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>netconf-artifacts</artifactId>
-                               <version>${odl.netconf.netconf.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>restconf-artifacts</artifactId>
-                               <version>${odl.netconf.restconf.version}</version>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-odl-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                           <groupId>com.fasterxml.jackson</groupId>
-                           <artifactId>jackson-bom</artifactId>
-                           <version>${jackson.bom.version}</version>
-                           <type>pom</type>
-                           <scope>import</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-test-model</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-broker-impl</artifactId>
-                               <version>${odl.controller.mdsal.version}</version>
-                               <type>test-jar</type>
-                               <classifier>tests</classifier>
-                               <scope>test</scope>
-                       </dependency>
+                       <!-- Override versions in ODL parent poms -->
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
+                               <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.11</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.eelf</groupId>
-                               <artifactId>eelf-core</artifactId>
-                               <version>${eelf.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.derby</groupId>
-                               <artifactId>derby</artifactId>
-                               <version>${derby.version}</version>
-                               <scope>test</scope>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
                        </dependency>
                </dependencies>
 
@@ -1050,7 +986,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -1072,7 +1008,7 @@
                                                        <excludes>
                                                        </excludes>
                                                        <consoleOutput>true</consoleOutput>
-                                                       <failsOnViolation>false</failsOnViolation>
+                                                       <failOnViolation>false</failOnViolation>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/pom.xml b/pom.xml
index c1a5521..46c88fd 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,8 @@
         </plugins>
     </build>
     <modules>
+        <module>dependencies-bom</module>
+        <module>dependencies-odl-bom</module>
         <module>standalone</module>
         <module>odlparent</module>
         <module>springboot</module>

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index fc2ad06..d86bb53 100755 (executable)
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -11,7 +11,7 @@
        <parent>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.20.RELEASE</version>
+               <version>1.5.21.RELEASE</version>
                <relativePath/>
        </parent>
 
@@ -362,6 +362,13 @@
 
        <dependencyManagement>
                <dependencies>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
                        <dependency>
                                <groupId>org.onap.ccsdk.sli.core</groupId>
                                <artifactId>sli-common</artifactId>

diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 8073ea7..1bc6a49 100755 (executable)
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -11,7 +11,7 @@
        <parent>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
-               <version>2.1.4.RELEASE</version>
+               <version>2.1.6.RELEASE</version>
                <relativePath/>
        </parent>
 
@@ -93,6 +93,25 @@
                <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
                <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
+               <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+               <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+               <derby.version>10.14.2.0</derby.version>
+               <eelf.version>1.0.0</eelf.version>
+               <grpc.version>1.17.1</grpc.version>
+               <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+               <jersey.version>2.25.1</jersey.version>
+               <jettison.version>1.3.8</jettison.version>
+               <junit.version>4.12</junit.version>
+               <logback.version>1.2.3</logback.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
+               <mariadb4j.version>2.2.3</mariadb4j.version>
+               <spring.version>4.3.18.RELEASE</spring.version>
+               <slf4j.version>1.7.25</slf4j.version>
+               <testng.version>6.11</testng.version>
+               <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
+
+
        </properties>
 
 
@@ -356,6 +375,13 @@
 
        <dependencyManagement>
                <dependencies>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.parent</groupId>
+                               <artifactId>dependencies-bom</artifactId>
+                               <version>1.3.0-SNAPSHOT</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
                        <dependency>
                                <groupId>org.onap.ccsdk.sli.core</groupId>
                                <artifactId>sli-common</artifactId>
@@ -385,7 +411,12 @@
                                <artifactId>dblib-provider</artifactId>
                                <version>${sdnctl.dblib.version}</version>
                        </dependency>
-
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>${junit.version}</version>
+                               <scope>test</scope>
+                       </dependency>
                </dependencies>
 
        </dependencyManagement>