[GitHub] csantanapr closed pull request #59: Node6 and express updates

[GitBox <gi...@apache.org>]

csantanapr closed pull request #59: Node6 and express updates
URL: https://github.com/apache/incubator-openwhisk-runtime-nodejs/pull/59
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/core/nodejs6Action/Dockerfile b/core/nodejs6Action/Dockerfile
index b381111..c725e60 100644
--- a/core/nodejs6Action/Dockerfile
+++ b/core/nodejs6Action/Dockerfile
@@ -18,7 +18,7 @@
 FROM nodejsactionbase
 
 # based on https://github.com/nodejs/docker-node
-ENV NODE_VERSION 6.14.2
+ENV NODE_VERSION 6.14.3
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
   && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
   && rm "node-v$NODE_VERSION-linux-x64.tar.gz"
diff --git a/core/nodejs8Action/Dockerfile b/core/nodejs8Action/Dockerfile
index 8ee5d30..3f56b96 100644
--- a/core/nodejs8Action/Dockerfile
+++ b/core/nodejs8Action/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM node:8.11.2
+FROM node:8.11.3
 RUN apt-get update && apt-get install -y \
     imagemagick \
     unzip \
diff --git a/core/nodejs8Action/package.json b/core/nodejs8Action/package.json
index 0f4a77a..8e7d57f 100644
--- a/core/nodejs8Action/package.json
+++ b/core/nodejs8Action/package.json
@@ -9,7 +9,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "openwhisk": "3.15.0",
-    "body-parser": "1.18.2",
-    "express": "4.16.2"
+    "body-parser": "1.18.3",
+    "express": "4.16.3"
   }
 }
diff --git a/core/nodejsActionBase/package.json b/core/nodejsActionBase/package.json
index cc0f9d9..de9ab5f 100644
--- a/core/nodejsActionBase/package.json
+++ b/core/nodejsActionBase/package.json
@@ -2,10 +2,10 @@
   "name": "nodejsAction",
   "version": "0.0.1",
   "dependencies": {
-    "body-parser": "1.15.2",
+    "body-parser": "1.18.3",
     "btoa": "1.1.2",
-    "express": "4.14.0",
+    "express": "4.16.3",
     "log4js": "0.6.38",
-    "request": "2.79.0"
+    "request": "2.87.0"
   }
 }
diff --git a/core/nodejsActionBase/src/service.js b/core/nodejsActionBase/src/service.js
index 536aad4..d80a5a3 100644
--- a/core/nodejsActionBase/src/service.js
+++ b/core/nodejsActionBase/src/service.js
@@ -16,7 +16,7 @@
  */
 
 var NodeActionRunner = require('../runner');
-var fs = require('fs');
+const fs = require('fs');
 
 function NodeActionService(config) {
     var Status = {
diff --git a/settings.gradle b/settings.gradle
index c2bf195..a27f6e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,6 @@ include 'tests'
 
 include 'core:nodejsActionBase'
 include 'core:nodejs6Action'
-
 include 'core:nodejs8Action'
 
 rootProject.name = 'runtime-nodejs'


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services