summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dependencies-bom/pom.xml8
-rw-r--r--dependencies-odl-bom/pom.xml67
-rw-r--r--odlparent/binding-parent/pom.xml87
-rw-r--r--odlparent/bundle-parent/pom.xml87
-rw-r--r--odlparent/client-parent/pom.xml2
-rw-r--r--odlparent/feature-repo-parent/pom.xml87
-rw-r--r--odlparent/mdsal-it-parent/pom.xml87
-rw-r--r--odlparent/odlparent-lite/pom.xml87
-rw-r--r--odlparent/odlparent/pom.xml87
-rwxr-xr-xodlparent/pom.xml4
-rwxr-xr-xodlparent/setup/pom.xml4
-rw-r--r--odlparent/setup/src/main/properties/binding-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/bundle-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/feature-repo-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/mdsal-it-parent.properties2
-rw-r--r--odlparent/setup/src/main/properties/odlparent-lite.properties2
-rw-r--r--odlparent/setup/src/main/properties/odlparent.properties2
-rw-r--r--odlparent/setup/src/main/properties/single-feature-parent.properties2
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml81
-rw-r--r--odlparent/single-feature-parent/pom.xml87
-rwxr-xr-xpom.xml2
-rwxr-xr-xspringboot/pom.xml4
-rwxr-xr-xspringboot/springboot1/pom.xml14
-rwxr-xr-xspringboot/springboot2/pom.xml14
-rwxr-xr-xstandalone/pom.xml2
-rwxr-xr-xtools/changeVersion.sh (renamed from changeVersion.sh)0
-rwxr-xr-xtools/fluorine2neon.sh47
-rw-r--r--version.properties4
28 files changed, 480 insertions, 396 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index e0f3bb9b..d56fad6c 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -7,7 +7,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<distributionManagement>
<repository>
@@ -47,7 +47,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
- <version>2.8.11.20181123</version>
+ <version>2.9.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -131,12 +131,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.4</version>
+ <version>4.4.10</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.2</version>
+ <version>4.5.6</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 4b560159..37d106cc 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -7,7 +7,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
@@ -40,19 +40,19 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>1.8.2</version>
+ <version>1.9.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
- <version>1.8.2</version>
+ <version>1.9.1</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
- <version>1.8.2</version>
+ <version>1.9.1</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
@@ -60,33 +60,26 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-test-model</artifactId>
- <version>1.8.2</version>
+ <version>1.9.1</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>2.5.2</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>mdsal-model-artifacts</artifactId>
- <version>0.13.2</version>
+ <version>3.0.8</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>1.5.2</version>
+ <version>1.6.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-artifacts</artifactId>
- <version>1.8.2</version>
+ <version>1.9.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -122,7 +115,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
- <version>2.8.11.20181123</version>
+ <version>2.9.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -185,7 +178,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -229,13 +222,18 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.8.2</version>
+ <version>2.9.7</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -251,12 +249,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.1</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -267,12 +265,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.4</version>
+ <version>4.4.10</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.2</version>
+ <version>4.5.6</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -352,7 +350,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.12.0</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -370,19 +368,29 @@
<version>1.9.13</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.8</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>9.3.24.v20180605</version>
+ <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>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-api</artifactId>
- <version>9.3.24.v20180605</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
- <version>9.3.24.v20180605</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
@@ -456,7 +464,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
- <version>4.3.18.RELEASE</version>
+ <version>4.3.24.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -470,6 +478,11 @@
<artifactId>snakeyaml</artifactId>
<version>1.15</version>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 62f02aa5..7f2c2ace 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -11,12 +11,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>0.13.2</version>
+ <version>3.0.8</version>
<relativePath />
</parent>
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -515,19 +503,34 @@
<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>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 6645aa11..4fcd2852 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -11,12 +11,12 @@
<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>
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -515,19 +503,34 @@
<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>
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 37f35feb..374b6f4b 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>client-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
<url>http://wiki.onap.org</url>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 55648133..963a3dd2 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -11,12 +11,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>3.1.5</version>
+ <version>4.0.10</version>
<relativePath />
</parent>
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -515,19 +503,34 @@
<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>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 6ae848fb..9f6e6c4a 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -11,12 +11,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>mdsal-it-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-parent</artifactId>
- <version>1.8.2</version>
+ <version>1.9.1</version>
<relativePath />
</parent>
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -515,19 +503,34 @@
<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>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index e2b76338..e1e59394 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -11,12 +11,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>3.1.5</version>
+ <version>4.0.10</version>
<relativePath />
</parent>
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -515,19 +503,34 @@
<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>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 27100124..216934b4 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -11,12 +11,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>3.1.5</version>
+ <version>4.0.10</version>
<relativePath />
</parent>
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -515,19 +503,34 @@
<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>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 012fa73e..a0483e3b 100755
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -7,12 +7,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-aggregator</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml
index e113541f..85563e7b 100755
--- a/odlparent/setup/pom.xml
+++ b/odlparent/setup/pom.xml
@@ -8,12 +8,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>setup</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-aggregator</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties
index 81b803ea..f6d52513 100644
--- a/odlparent/setup/src/main/properties/binding-parent.properties
+++ b/odlparent/setup/src/main/properties/binding-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=binding-parent
odlparent.groupId=org.opendaylight.mdsal
-odlparent.version=0.13.2 \ No newline at end of file
+odlparent.version=3.0.8 \ No newline at end of file
diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties
index 0c254c59..8bba8066 100644
--- a/odlparent/setup/src/main/properties/bundle-parent.properties
+++ b/odlparent/setup/src/main/properties/bundle-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=bundle-parent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=3.1.5
+odlparent.version=4.0.10
diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties
index 27347cb6..92c2fcfe 100644
--- a/odlparent/setup/src/main/properties/feature-repo-parent.properties
+++ b/odlparent/setup/src/main/properties/feature-repo-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=feature-repo-parent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=3.1.5
+odlparent.version=4.0.10
diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties
index 39ec0371..acb5ec77 100644
--- a/odlparent/setup/src/main/properties/mdsal-it-parent.properties
+++ b/odlparent/setup/src/main/properties/mdsal-it-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=mdsal-it-parent
odlparent.groupId=org.opendaylight.controller
-odlparent.version=1.8.2
+odlparent.version=1.9.1
diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties
index 46bf9fd3..e57359b6 100644
--- a/odlparent/setup/src/main/properties/odlparent-lite.properties
+++ b/odlparent/setup/src/main/properties/odlparent-lite.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=odlparent-lite
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=3.1.5
+odlparent.version=4.0.10
diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties
index e32f2d2f..8341a6f9 100644
--- a/odlparent/setup/src/main/properties/odlparent.properties
+++ b/odlparent/setup/src/main/properties/odlparent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=odlparent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=3.1.5
+odlparent.version=4.0.10
diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties
index 9fa116df..70c1c4c8 100644
--- a/odlparent/setup/src/main/properties/single-feature-parent.properties
+++ b/odlparent/setup/src/main/properties/single-feature-parent.properties
@@ -1,3 +1,3 @@
odlparent.artifactId=single-feature-parent
odlparent.groupId=org.opendaylight.odlparent
-odlparent.version=3.1.5
+odlparent.version=4.0.10
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index f9d36c17..61ee8747 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -520,14 +508,29 @@
<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>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index dbb80174..34dd90f6 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -11,12 +11,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>3.1.5</version>
+ <version>4.0.10</version>
<relativePath />
</parent>
@@ -93,11 +93,11 @@
<!-- 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>
@@ -106,36 +106,35 @@
<!-- 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 -->
@@ -150,12 +149,8 @@
<!-- 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 -->
@@ -163,22 +158,20 @@
<!-- 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>
@@ -189,16 +182,11 @@
<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>
@@ -515,19 +503,34 @@
<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>
diff --git a/pom.xml b/pom.xml
index 39d8f546..6ec100b1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
<properties>
diff --git a/springboot/pom.xml b/springboot/pom.xml
index 9a0a95c2..16a07cf9 100755
--- a/springboot/pom.xml
+++ b/springboot/pom.xml
@@ -7,12 +7,12 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>springboot-aggregator</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 4eacef31..1f208aec 100755
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-1-starter-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -82,11 +82,11 @@
<!-- 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>
@@ -341,7 +341,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 05045b2a..407a0375 100755
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -82,11 +82,11 @@
<!-- 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>
@@ -366,7 +366,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 3125d48b..c55dc856 100755
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -8,7 +8,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>standalone-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://wiki.onap.org</url>
diff --git a/changeVersion.sh b/tools/changeVersion.sh
index 144ca539..144ca539 100755
--- a/changeVersion.sh
+++ b/tools/changeVersion.sh
diff --git a/tools/fluorine2neon.sh b/tools/fluorine2neon.sh
new file mode 100755
index 00000000..4a513435
--- /dev/null
+++ b/tools/fluorine2neon.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+updatePom() {
+export XMLLINT_INDENT=" "
+cat $1 | xsltproc -o $1 /tmp/rebase-pom.xslt -
+}
+
+export -f updatePom
+
+# Copy blueprints to new directory structure
+find . -path '*/src/main/resources/org/opendaylight/blueprint/*.xml' -execdir sh -c "mkdir -p ../../../OSGI-INF/blueprint; cp {} ../../../OSGI-INF/blueprint" \;
+
+# Update ietf-net-types dependencies
+
+cat <<END > /tmp/rebase-pom.xslt
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:pom="http://maven.apache.org/POM/4.0.0"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ exclude-result-prefixes="pom">
+
+ <!-- Copy everything that does not match a rewrite rule -->
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()" />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="//pom:dependency[pom:groupId='org.opendaylight.mdsal.model' and pom:artifactId='ietf-inet-types-2013-07-15']">
+ <dependency><xsl:text>&#xa; </xsl:text>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId><xsl:text>&#xa; </xsl:text>
+ <artifactId>rfc6991</artifactId><xsl:text>&#xa; </xsl:text>
+ </dependency><xsl:text>&#xa;</xsl:text>
+ </xsl:template>
+
+ <xsl:template match="//pom:dependency[pom:groupId='org.opendaylight.mdsal.model' and pom:artifactId='ietf-yang-types-20130715']">
+ </xsl:template>
+
+ <xsl:template match="//pom:dependency[pom:groupId='org.opendaylight.mdsal.model' and pom:artifactId='mdsal-model-artifacts']">
+ </xsl:template>
+
+ <xsl:output method="xml" encoding="UTF-8" indent="yes" omit-xml-declaration="no"/>
+</xsl:stylesheet>
+END
+
+find . -name pom.xml -exec bash -c 'updatePom "$0" .' '{}' \;
diff --git a/version.properties b/version.properties
index 40509d7a..4b7acda2 100644
--- a/version.properties
+++ b/version.properties
@@ -5,8 +5,8 @@
release_name=1
-sprint_number=3
-feature_revision=3
+sprint_number=4
+feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}