From: Timoney, Dan (dt5972) Date: Tue, 18 Jun 2019 14:42:07 +0000 (-0400) Subject: Add new BOM for odl-based projects X-Git-Tag: 1.3.2~12 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bbcacd27a3fcaa2f26f741ab1c46c0c9cc8db8ee;p=ccsdk%2Fparent.git 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) --- diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml new file mode 100644 index 00000000..a799da34 --- /dev/null +++ b/dependencies-bom/pom.xml @@ -0,0 +1,182 @@ + + + + + 4.0.0 + pom + org.onap.ccsdk.parent + dependencies-bom + 1.3.0-SNAPSHOT + + + + + + + ch.qos.logback + logback-classic + 1.2.3 + + + ch.qos.logback + logback-core + 1.2.3 + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + com.att.eelf + eelf-core + 1.0.0 + + + com.fasterxml.jackson + jackson-bom + 2.8.11.20181123 + pom + import + + + com.google.protobuf + protobuf-java-util + 3.6.1 + + + com.jayway.jsonpath + json-path + 2.3.0 + + + commons-lang + commons-lang + 2.6 + + + commons-logging + commons-logging + 1.2 + + + io.grpc + grpc-netty + 1.17.1 + + + io.grpc + grpc-protobuf + 1.17.1 + + + io.grpc + grpc-stub + 1.17.1 + + + io.grpc + grpc-testing + 1.17.1 + + + io.swagger + swagger-annotations + 1.5.22 + + + io.swagger + swagger-core + 1.5.22 + + + javax + javaee-api + 7.0 + + + javax.ws.rs + javax.ws.rs-api + 2.1 + + + junit + junit + 4.12 + test + + + org.apache.commons + commons-text + 1.1 + + + org.apache.derby + derby + 10.14.2.0 + test + + + org.apache.httpcomponents + httpcore + 4.4.4 + + + org.apache.httpcomponents + httpclient + 4.5.2 + + + org.apache.tomcat + tomcat-jdbc + 8.5.14 + + + org.apache.velocity + velocity + 1.7 + + + org.codehaus.jackson + jackson-jaxrs + 1.9.13 + + + org.glassfish.jersey + jersey-bom + 2.25.1 + pom + import + + + com.google.protobuf + protobuf-java + 3.6.1 + + + org.jsoup + jsoup + 1.8.3 + test + + + org.mariadb.jdbc + mariadb-java-client + 2.1.1 + + + org.slf4j + jcl-over-slf4j + 1.7.25 + + + org.testng + testng + 6.11 + + + + + \ No newline at end of file diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml new file mode 100644 index 00000000..b12427fc --- /dev/null +++ b/dependencies-odl-bom/pom.xml @@ -0,0 +1,466 @@ + + + + + 4.0.0 + pom + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT + + + org.opendaylight.odlparent + odlparent + 3.1.5 + + + + + + + + + + + + + org.opendaylight.controller + mdsal-artifacts + 1.8.2 + pom + import + + + org.opendaylight.controller + sal-binding-broker-impl + 1.8.2 + + + org.opendaylight.controller + sal-binding-broker-impl + 1.8.2 + test-jar + tests + test + + + org.opendaylight.controller + sal-test-model + 1.8.2 + + + org.opendaylight.mdsal + mdsal-artifacts + 2.5.2 + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.13.2 + pom + import + + + org.opendaylight.netconf + netconf-artifacts + 1.5.2 + pom + import + + + org.opendaylight.netconf + restconf-artifacts + 1.8.2 + pom + import + + + + + + ch.qos.logback + logback-classic + 1.2.3 + + + ch.qos.logback + logback-core + 1.2.3 + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + com.att.eelf + eelf-core + 1.0.0 + + + com.carrotsearch + hppc + 0.7.1 + + + com.fasterxml.jackson + jackson-bom + 2.8.11.20181123 + pom + import + + + com.github.stefanbirkner + system-rules + 1.19.0 + + + com.github.tomakehurst + wiremock + 2.7.1 + test + + + com.google.code.gson + gson + 2.8.5 + + + com.google.protobuf + protobuf-java + 3.6.1 + + + com.jayway.jsonpath + json-path + 2.3.0 + + + com.ning + compress-lzf + 1.0.2 + + + com.spatial4j + spatial4j + 0.5 + + + com.tdunning + t-digest + 3.0 + + + com.twitter + jsr166e + 1.1.0 + + + commons-collections + commons-collections + 3.2.2 + + + commons-cli + commons-cli + 1.3.1 + + + commons-io + commons-io + 2.5 + + + commons-logging + commons-logging + 1.2 + + + dom4j + dom4j + 1.6.1 + + + io.grpc + grpc-netty + 1.17.1 + + + io.grpc + grpc-protobuf + 1.17.1 + + + io.grpc + grpc-stub + 1.17.1 + + + io.grpc + grpc-testing + 1.17.1 + + + jakarta-regexp + jakarta-regexp + 1.4 + + + javax + javaee-api + 7.0 + + + javax.servlet + servlet-api + 2.5 + + + joda-time + joda-time + 2.8.2 + + + junit + junit + 4.12 + test + + + org.apache.commons + commons-io + 1.3.2 + + + org.apache.commons + commons-lang3 + 3.4 + + + org.apache.commons + commons-text + 1.1 + + + org.apache.derby + derby + 10.14.2.0 + test + + + org.apache.httpcomponents + httpcore + 4.4.4 + + + org.apache.httpcomponents + httpclient + 4.5.2 + + + org.apache.lucene + lucene-analyzers-common + 5.4.1 + + + org.apache.lucene + lucene-backward-codecs + 5.4.1 + + + org.apache.lucene + lucene-core + 5.4.1 + + + org.apache.lucene + lucene-grouping + 5.4.1 + + + org.apache.lucene + lucene-highlighter + 5.4.1 + + + org.apache.lucene + lucene-join + 5.4.1 + + + org.apache.lucene + lucene-memory + 5.4.1 + + + org.apache.lucene + lucene-misc + 5.4.1 + + + org.apache.lucene + lucene-queries + 5.4.1 + + + org.apache.lucene + lucene-queryparser + 5.4.1 + + + org.apache.lucene + lucene-sandbox + 5.4.1 + + + org.apache.lucene + lucene-spatial + 5.4.1 + + + org.apache.lucene + lucene-spatial3d + 5.4.1 + + + org.apache.lucene + lucene-suggest + 5.4.1 + + + org.apache.sling + org.apache.sling.testing.osgi-mock + 2.3.2 + + + org.apache.sshd + sshd-core + 0.12.0 + + + org.apache.tomcat + tomcat-jdbc + 8.5.14 + + + org.apache.velocity + velocity + 1.7 + + + org.codehaus.jackson + jackson-jaxrs + 1.9.13 + + + org.eclipse.jetty + jetty-servlet + 9.3.24.v20180605 + + + org.eclipse.jetty.websocket + websocket-api + 9.3.24.v20180605 + + + org.eclipse.jetty.websocket + websocket-servlet + 9.3.24.v20180605 + + + org.elasticsearch + elasticsearch + 2.2.0 + + + org.elasticsearch + securesm + 1.0 + + + org.elasticsearch.plugin + delete-by-query + 2.2.0 + + + org.glassfish.jersey + jersey-bom + 2.25.1 + pom + import + + + org.hdrhistogram + HdrHistogram + 2.1.6 + + + org.java-websocket + Java-WebSocket + 1.3.8 + + + org.joda + joda-convert + 1.2 + + + org.mockito + mockito-core + 2.2.11 + test + + + org.jsoup + jsoup + 1.8.3 + test + + + org.mariadb.jdbc + mariadb-java-client + 2.1.1 + + + org.powermock + powermock-api-mockito2 + 1.6.6 + + + org.powermock + powermock-module-junit4 + 1.6.6 + + + org.slf4j + jcl-over-slf4j + 1.7.25 + + + org.springframework + spring-framework-bom + 4.3.18.RELEASE + pom + import + + + org.testng + testng + 6.11 + + + org.yaml + snakeyaml + 1.15 + + + + + \ No newline at end of file diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index d9189c94..508c02df 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT pom import - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - ${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - org.apache.derby - derby - ${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 4c3f4c06..4e5bf856 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT pom import - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - ${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - org.apache.derby - derby - ${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 053fdb57..af628d83 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT pom import - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - ${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - org.apache.derby - derby - ${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 7a4fe7f2..0aaec6aa 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT pom import - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - ${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - org.apache.derby - derby - ${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index c3a2962a..2d7cc81e 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT pom import - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - ${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - org.apache.derby - derby - ${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 35237526..8ae592c6 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT pom import - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - ${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - org.apache.derby - derby - ${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 6ed32b2f..8374afbb 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 \${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - \${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - \${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - \${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - \${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - \${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + ${project.version} pom import - - com.fasterxml.jackson - jackson-bom - \${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - \${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - \${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - \${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - \${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - \${spring.version} - - - org.springframework - spring-beans - \${spring.version} - - - org.springframework - spring-context - \${spring.version} - - - com.att.eelf - eelf-core - \${eelf.version} - - - org.apache.derby - derby - \${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 1669133d..fbb0edd8 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -177,20 +177,29 @@ 3.8.1.v20120830-144521 ${jackson.version} 0.6.4 - 4.4.4 - 4.5.2 4.7.1 5.1.39 - 2.1.1 - 1.4.196 - 10.14.2.0 - 1.0.0 1.0.0 - 8.5.14 - 2.27 + + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 true @@ -465,6 +474,7 @@ + yang-compile src/main/yang @@ -521,104 +531,30 @@ + + - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${odl.netconf.netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${odl.netconf.restconf.version} + org.onap.ccsdk.parent + dependencies-odl-bom + 1.3.0-SNAPSHOT pom import - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - org.opendaylight.controller - sal-test-model - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.controller.mdsal.version} - test-jar - tests - test - + junit junit - ${junit.version} + 4.12 test - org.testng - testng - 6.11 - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - org.apache.derby - derby - ${derby.version} - test + com.google.protobuf + protobuf-java + 3.6.1 @@ -1050,7 +986,7 @@ true - false + false @@ -1072,7 +1008,7 @@ true - false + false diff --git a/pom.xml b/pom.xml index c1a55214..46c88fdb 100755 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,8 @@ + dependencies-bom + dependencies-odl-bom standalone odlparent springboot diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index fc2ad065..d86bb535 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.20.RELEASE + 1.5.21.RELEASE @@ -362,6 +362,13 @@ + + org.onap.ccsdk.parent + dependencies-bom + 1.3.0-SNAPSHOT + pom + import + org.onap.ccsdk.sli.core sli-common diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 8073ea7b..1bc6a497 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.4.RELEASE + 2.1.6.RELEASE @@ -93,6 +93,25 @@ ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} + + 4.4.4 + 4.5.2 + 10.14.2.0 + 1.0.0 + 1.17.1 + 2.8.11.20181123 + 2.25.1 + 1.3.8 + 4.12 + 1.2.3 + 2.1.1 + 2.2.3 + 4.3.18.RELEASE + 1.7.25 + 6.11 + 8.5.14 + + @@ -356,6 +375,13 @@ + + org.onap.ccsdk.parent + dependencies-bom + 1.3.0-SNAPSHOT + pom + import + org.onap.ccsdk.sli.core sli-common @@ -385,7 +411,12 @@ dblib-provider ${sdnctl.dblib.version} - + + junit + junit + ${junit.version} + test +