Roll version for Frankfurt release

[ccsdk/parent.git] / odlparent / setup / src / main / resources / pom-template.xml

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 0296e9e..ef4bb72 100755 (executable)
--- 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.6.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.6.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.6.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.6.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.6.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.7.0-SNAPSHOT</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.7.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>
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
@@ -510,6 +510,28 @@
 
                        <!-- Override incorrect versions in ODL parent poms -->
                        <!-- to match versions actually installed in ODL Neon -->
+                       <dependency>
+                               <groupId>com.google.protobuf</groupId>
+                               <artifactId>protobuf-java</artifactId>
+                               <version>3.6.1</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>io.netty</groupId>
+                               <artifactId>netty-transport</artifactId>
+                               <version>4.1.34.Final</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>io.netty</groupId>
+                               <artifactId>netty-all</artifactId>
+                               <version>4.1.34.Final</version>
+                               <!-- <version>${netty.version}</version> -->
+                       </dependency>
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>4.12</version>
+                               <scope>test</scope>
+                       </dependency>
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-server</artifactId>
@@ -521,21 +543,15 @@
                                <version>9.4.12.v20180830</version>
                        </dependency>
                        <dependency>
-                               <groupId>junit</groupId>
-                               <artifactId>junit</artifactId>
-                               <version>4.12</version>
-                               <scope>test</scope>
+                               <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+                               <artifactId>jersey-guava</artifactId>
+                               <version>2.25.1</version>
                        </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>
-                               <version>3.6.1</version>
-                       </dependency>
                </dependencies>
 
        </dependencyManagement>