DLUX upgrade to Neon SR2

Upgrade OpenDaylight upstream dependencies to Neon,
so that the project resolves and builds.

Upgrade frontend-plugin to 1.8.0, see
https://github.com/eirslett/frontend-maven-plugin/blob/master/CHANGELOG.md

Upgrade node.js to 12.13.0 (LTS).

Also mark some leftovers which need to happen for us to get on something
reasonably supported.

Change-Id: I656140b1361578741f4ba5879afbdb46c2c0b4d7
Signed-off-by: Rohan Julka <rohanjulka19@gmail.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/archetype/pom.xml b/archetype/pom.xml
index f079536af697cf2a569894b5bf9cc37d5fc8e3df..00bd18822eb3e3ef284d208893676e0442c698e9 100644 (file)
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.controller.archetypes</groupId>
         <artifactId>archetypes-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.9.2</version>
         <relativePath/>
     </parent>
 

diff --git a/dlux-web/package.json b/dlux-web/package.json
index fb4325a07252cd914d307f17ef311f8a9c40ec16..bb75134f6985ec4d783dadbf1ecc75409420c655 100644 (file)
--- a/dlux-web/package.json
+++ b/dlux-web/package.json
@@ -12,43 +12,42 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "bower": "~1.3.12",
-    "karma":"~0.12.0",
-    "grunt": "~0.4.5",
-    "grunt-cli": "~0.1.13",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-coffee": "~0.7.0",
-    "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-compass": "~0.3.0",
-    "grunt-contrib-jshint": "~0.8.0",
-    "grunt-contrib-cssmin": "~0.6.0",
-    "grunt-contrib-connect": "~0.3.0",
-    "grunt-contrib-clean": "~0.4.1",
-    "grunt-contrib-htmlmin": "~0.1.3",
-    "grunt-contrib-imagemin": "~0.1.4",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-usemin": "~0.1.11",
-    "grunt-svgmin": "~0.2.0",
+    "bower": "~1.8.8",
+    "karma": "~0.13.0",
+    "grunt": "~1.0.4",
+    "grunt-cli": "~1.3.2",
+    "grunt-contrib-copy": "~1.0.0",
+    "grunt-contrib-concat": "~1.0.1",
+    "grunt-contrib-coffee": "~2.1.0",
+    "grunt-contrib-uglify": "~4.0.1",
+    "grunt-contrib-compass": "~1.1.0",
+    "grunt-contrib-jshint": "~2.1.0",
+    "grunt-contrib-cssmin": "~3.0.0",
+    "grunt-contrib-connect": "~2.1.0",
+    "grunt-contrib-clean": "~2.0.0",
+    "grunt-contrib-htmlmin": "~3.1.0",
+    "grunt-contrib-imagemin": "~3.1.0",
+    "grunt-contrib-watch": "~1.1.0",
+    "grunt-usemin": "~3.1.1",
+    "grunt-svgmin": "~6.0.0",
     "grunt-rev": "~0.1.0",
-    "grunt-karma": "~0.8.0",
+    "grunt-karma": "~0.12.2",
     "grunt-open": "~0.2.0",
     "grunt-concurrent": "~0.3.0",
     "matchdep": "~0.1.2",
     "connect-livereload": "~0.2.0",
     "grunt-google-cdn": "~0.2.0",
     "connect-modrewrite": "~0.5.4",
-    "grunt-recess": "~0.5.0",
-    "grunt-contrib-less": "~0.8.2",
+    "grunt-contrib-less": "~2.0.0",
     "grunt-conventional-changelog": "~1.0.0",
-    "grunt-bump": "0.0.13",
-    "grunt-html2js": "~0.2.4",
-    "grunt-coffeelint": "0.0.8",
+    "grunt-bump": "0.8.0",
+    "grunt-html2js": "~0.6.0",
+    "grunt-coffeelint": "0.0.16",
     "requirejs": "~2.1.19",
     "karma-requirejs": "~0.2.2",
-    "grunt-shell": "~0.7.0",
-    "grunt-ng-annotate": "~0.3.2",
-    "grunt-replace": "~0.7.8",
+    "grunt-shell": "~3.0.1",
+    "grunt-ng-annotate": "~3.0.0",
+    "grunt-replace": "~1.0.1",
     "karma-chrome-launcher": "~0.1.4",
     "karma-firefox-launcher": "~0.1.3",
     "karma-jasmine": "~0.1.5",

diff --git a/dlux-web/pom.xml b/dlux-web/pom.xml
index ab3b819574c3f04235f4c61c1cfd6376c6e69681..30457ea315648e6de474a009bdef9e48c0f20b86 100644 (file)
--- a/dlux-web/pom.xml
+++ b/dlux-web/pom.xml
@@ -78,7 +78,6 @@
             <!--Clean extracted resources-->\r
             <plugin>\r
                 <artifactId>maven-clean-plugin</artifactId>\r
-                <version>2.5</version>\r
                 <configuration>\r
                     <filesets>\r
                         <fileset>\r
@@ -172,7 +171,7 @@
             <plugin>\r
                 <groupId>com.github.eirslett</groupId>\r
                 <artifactId>frontend-maven-plugin</artifactId>\r
-                <version>0.0.24</version>\r
+                <version>1.8.0</version>\r
                 <executions>\r
                     <execution>\r
                         <id>npm</id>\r
@@ -183,6 +182,7 @@
                         <phase>generate-resources</phase>\r
                     </execution>\r
                     <execution>\r
+                        <!-- FIXME: https://bower.io/blog/2017/how-to-migrate-away-from-bower/ -->\r
                         <id>bower</id>\r
                         <goals>\r
                             <goal>bower</goal>\r
@@ -196,8 +196,8 @@
                     </execution>\r
                 </executions>\r
                 <configuration>\r
-                    <nodeVersion>v0.12.7</nodeVersion>\r
-                    <npmVersion>3.1.3</npmVersion>\r
+                    <nodeVersion>v12.13.0</nodeVersion>\r
+                    <npmVersion>6.12.0</npmVersion>\r
                 </configuration>\r
             </plugin>\r
         </plugins>\r

diff --git a/features/features-dlux/pom.xml b/features/features-dlux/pom.xml
index d83df83c93ee60f859f318887f009b765e1502b6..ff818393beaa22eff3c552fd91a02d3925148e74 100644 (file)
--- a/features/features-dlux/pom.xml
+++ b/features/features-dlux/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.0</version>
+        <version>4.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dlux-core/pom.xml b/features/odl-dlux-core/pom.xml
index 9a7e61f8e54fb36ae5b1e79936f16017e90a7743..b05acf6ddbc1715197124900f06946d64ce51097 100644 (file)
--- a/features/odl-dlux-core/pom.xml
+++ b/features/odl-dlux-core/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>4.0.11</version>
         <relativePath/>
     </parent>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf</artifactId>
-            <version>1.8.0-SNAPSHOT</version>
+            <version>1.9.2</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 255671169c904cd930eb893e8eae5d1b9ccd65c8..211a6804568eb43c1195490bc6dd7ce3edf02df1 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.0</version>
+        <version>4.0.11</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.dlux</groupId>

diff --git a/pom.xml b/pom.xml
index b8ade6a6e09d9a20bee8c78569ab32d94dfbb6eb..fc0fbbe30b3a9204c5ca5c7ebee5b36c81c79031 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.0</version>
+    <version>4.0.11</version>
     <relativePath/>
   </parent>
 
@@ -28,17 +28,6 @@
     <common.layout.resources.version>0.8.0-SNAPSHOT</common.layout.resources.version>
     <common.topbar.resources.version>0.8.0-SNAPSHOT</common.topbar.resources.version>
     <common.login.resources.version>0.8.0-SNAPSHOT</common.login.resources.version>
-    <restconf.version>1.8.0-SNAPSHOT</restconf.version>
-    <l2switch.version>0.8.0-SNAPSHOT</l2switch.version>
-    <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
-    <branding.version>1.7.0-SNAPSHOT</branding.version>
-    <feature.l2switch.version>0.8.0-SNAPSHOT</feature.l2switch.version>
-    <feature.aaa.version>0.8.0-SNAPSHOT</feature.aaa.version>
-    <feature.openflowplugin.version>0.7.0-SNAPSHOT</feature.openflowplugin.version>
-
-    <feature.mdsal.version>1.8.0-SNAPSHOT</feature.mdsal.version>
-    <feature.dlux.version>0.8.0-SNAPSHOT</feature.dlux.version>
-    <feature.flow.version>1.8.0-SNAPSHOT</feature.flow.version>
   </properties>
 
   <modules>