csantanapr closed pull request #18: update npm package openwhisk 3.11.0 and Node.js LTS URL: https://github.com/apache/incubator-openwhisk-runtime-nodejs/pull/18
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/.travis.yml b/.travis.yml index 5cc7b20..dcd7733 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ sudo: required group: deprecated-2017Q3 language: scala -scala: -- 2.11.8 services: - docker before_install: diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all index 925ae29..b3f5b82 100755 --- a/ansible/environments/local/group_vars/all +++ b/ansible/environments/local/group_vars/all @@ -1,5 +1,5 @@ whisk_version_name: local -config_root_dir: /tmp +config_root_dir: /tmp/wskconf whisk_logs_dir: /tmp/wsklogs docker_registry: "" docker_dns: "" diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts index c99f195..ce8c7c5 100644 --- a/ansible/environments/local/hosts +++ b/ansible/environments/local/hosts @@ -9,11 +9,15 @@ ansible ansible_connection=local [controllers] controller0 ansible_host=172.17.0.1 ansible_connection=local -[kafka] -172.17.0.1 ansible_host=172.17.0.1 ansible_connection=local +[kafkas] +kafka0 ansible_host=172.17.0.1 ansible_connection=local + +[zookeepers:children] +kafkas [invokers] invoker0 ansible_host=172.17.0.1 ansible_connection=local +invoker1 ansible_host=172.17.0.1 ansible_connection=local ; db group is only used if db_provider is CouchDB [db] diff --git a/core/nodejs6Action/CHANGELOG.md b/core/nodejs6Action/CHANGELOG.md index 6f42b4b..6b16920 100644 --- a/core/nodejs6Action/CHANGELOG.md +++ b/core/nodejs6Action/CHANGELOG.md @@ -2,6 +2,13 @@ +## 1.4.0 +Change: Update nodejs and openwhisk npm package + +Node version = 6.12.2 + +- [openwhisk v3.11.0](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs. + ## 1.3.0 Change: Update openwhisk npm package diff --git a/core/nodejs6Action/Dockerfile b/core/nodejs6Action/Dockerfile index 06fc68d..02b403c 100644 --- a/core/nodejs6Action/Dockerfile +++ b/core/nodejs6Action/Dockerfile @@ -1,7 +1,7 @@ FROM nodejsactionbase # based on https://github.com/nodejs/docker-node -ENV NODE_VERSION 6.12.0 +ENV NODE_VERSION 6.12.2 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" @@ -46,7 +46,7 @@ [email protected] \ [email protected] \ [email protected] \ [email protected] \ [email protected] \ [email protected] \ [email protected] \ [email protected] \ pug@">=2.0.0-beta6 <2.0.1" \ diff --git a/core/nodejs8Action/CHANGELOG.md b/core/nodejs8Action/CHANGELOG.md index b81a414..51259e9 100644 --- a/core/nodejs8Action/CHANGELOG.md +++ b/core/nodejs8Action/CHANGELOG.md @@ -1,7 +1,15 @@ # NodeJS 8 OpenWhisk Runtime Container +## 1.1.0 +Change: Update nodejs and openwhisk npm package + +Node version = 8.9.3 + +- [openwhisk v3.11.0](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs. + ## 1.0.0 Change: Initial release Node version = 8.9.1 + - [openwhisk v3.10.0](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs. \ No newline at end of file diff --git a/core/nodejs8Action/Dockerfile b/core/nodejs8Action/Dockerfile index 21771cc..43eafae 100644 --- a/core/nodejs8Action/Dockerfile +++ b/core/nodejs8Action/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.9.1 +FROM node:8.9.3 RUN apt-get update && apt-get install -y \ imagemagick \ unzip \ diff --git a/core/nodejs8Action/package.json b/core/nodejs8Action/package.json index e715dc5..f331190 100644 --- a/core/nodejs8Action/package.json +++ b/core/nodejs8Action/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "openwhisk": "3.10.0", + "openwhisk": "3.11.0", "body-parser": "1.18.2", "express": "4.16.2" } diff --git a/settings.gradle b/settings.gradle index 501f3c4..7f639a8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,7 +20,7 @@ include 'core:nodejs8Action' rootProject.name = 'runtime-nodejs' gradle.ext.scala = [ - version: '2.11.8', + version: '2.11.11', compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import'] ] ---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
