<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>3.1.5</version>
+ <version>4.0.10</version>
<relativePath />
</parent>
<!-- CCSDK component versions -->
- <ccsdk.sli.core.version>0.5.2-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>0.5.2-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>0.5.2-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>0.5.2-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>0.5.2-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.core.version>0.6.0-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.6.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.6.0-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.6.0-SNAPSHOT</ccsdk.sli.plugins.version>
+ <ccsdk.distribution.version>0.6.0-SNAPSHOT</ccsdk.distribution.version>
<sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
<sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
<sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.8.2</odl.controller.mdsal.version>
- <odl.mdsal.version>2.5.2</odl.mdsal.version>
- <odl.mdsal.model.version>0.13.2</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.8.2</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.5.2</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.8.2</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
+ <odl.mdsal.version>3.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version>
+
<!-- Used by aaa, vtn -->
- <commons.codec.version>1.11</commons.codec.version>
+ <commons.codec.version>1.12</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.7</commons.lang3.version>
+ <commons.lang3.version>3.8.1</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
<commons.net.version>3.6</commons.net.version>
<!-- Used by neutron -->
- <eclipse.persistence.version>2.7.1</eclipse.persistence.version>
+ <eclipse.persistence.version>2.7.3</eclipse.persistence.version>
<!-- Used by aaa -->
<felix.dependencymanager.version>4.4.1</felix.dependencymanager.version>
<!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn -->
<gson.version>2.8.5</gson.version>
<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
- <guava.version>23.6.1-jre</guava.version>
- <!-- Used by lispflowmapping, sxp, vtn/manager -->
- <hamcrest.version>1.3.1</hamcrest.version>
+ <guava.version>25.1-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.8.11</jackson.version>
- <jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+ <jackson.version>2.9.8</jackson.version>
+ <jackson.bom.version>2.9.8</jackson.bom.version>
<!-- Used by snmp4sdn, yangtools -->
- <javassist.version>3.24.0-GA</javassist.version>
+ <javassist.version>3.24.1-GA</javassist.version>
<!-- FIXME remove all dependencies for jersey 1.17 after migration all
projects -->
<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
<org.json.version>20131018</org.json.version>
- <!-- Used by sfc -->
- <jettison.version>1.3.8</jettison.version>
- <!-- Used by persistence -->
- <jsr305.api.version>3.0.0</jsr305.api.version>
- <!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560
- is fixed (either in PowerMock or with a new JUnit release) -->
+
+
<!-- Used everywhere -->
<junit.version>4.12</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>1.10.19</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.31.Final</netty.version>
+ <netty.version>4.1.34.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
toolkit -->
<slf4j.version>1.7.25</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
tsdr, ttp -->
- <spring.version>4.3.18.RELEASE</spring.version>
+ <spring.version>4.3.24.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
- <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>
- <antlr.version>4.7.1</antlr.version>
- <mysql.connector.version>5.1.39</mysql.connector.version>
+ <antlr.version>4.7.2</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.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>
+ <jetty.version>9.4.12.v20180830</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
</properties>
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- Override versions in ODL parent poms -->
+ <!-- Override incorrect versions in ODL parent poms -->
+ <!-- to match versions actually installed in ODL Neon -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.8</version>
+ </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Code Review / ccsdk / parent.git / blobdiff