From 619218cd7f3e7c5e433aed4734f3108bc8492b00 Mon Sep 17 00:00:00 2001 From: "James E. King, III" Date: Sun, 29 Oct 2017 06:55:00 -0400 Subject: [PATCH] THRIFT-4343: enable nodejs-8.x on ubuntu-artful image and update grunt-jsdoc also fix a perl failure as we were using a deprecated language feature in the cross test server for perl. Client: nodejs, perl This closes #1406 --- LANGUAGES.md | 206 +++++++++++++------------- build/docker/README.md | 2 +- build/docker/ubuntu-artful/Dockerfile | 6 +- lib/js/package.json | 4 +- test/perl/TestServer.pl | 2 +- 5 files changed, 109 insertions(+), 111 deletions(-) diff --git a/LANGUAGES.md b/LANGUAGES.md index e34cce31fed..d1a21e2422b 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -33,22 +33,22 @@ The Language/Library Levels indicate the minimum and maximum versions that are u ActionScript -NoNo + ActionScript 3 -NoNoNoNoYesNo -NoYesNo -YesNoNoNo -NoNoNoNoNo +Yes +Yes +Yes + ActionScript C (glib) YesYes 2.40.22.54.0 -NoYesYesNoYesYes -YesNoNo -YesYesNoYes -NoNoYesNoNo +YesYesYesYes +Yes +YesYesYes +Yes C (glib) @@ -58,227 +58,227 @@ The Language/Library Levels indicate the minimum and maximum versions that are u YesYesYesYesYesYes YesYesYes YesYesYesYes -NoYesYesYesYes +YesYesYesYes C++ C# -YesNo +Yes .NET 3.5 / mono 3.2.8.0.NET 4.6.1 / mono 4.6.2.7 -NoNoYesYesYesYes -YesYesNo +YesYesYesYes +YesYes YesYesYesYes -NoNoYesYesYes +YesYesYes C# (.NET) Cocoa -NoNo + unknown -NoYesYesNoYesYes -YesYesNo -YesYesNoYes -NoNoNoNoYes +YesYesYesYes +YesYes +YesYesYes +Yes Cocoa D -YesNo +Yes 2.070.22.076.0 -NoYesYesYesYesYes +YesYesYesYesYes YesYesYes -YesYesYesNo -NoYesYesYesYes +YesYesYes +YesYesYesYes D Dart -YesNo +Yes 1.20.11.24.2 -NoNoNoNoYesNo -YesYesNo +Yes +YesYes YesYesYesYes -NoNoNoNoNo + Dart Delphi -NoNo + 2010unknown -NoNoNoNoYesNo -YesYesNo +Yes +YesYes YesYesYesYes -NoNoYesNoNo +Yes Delphi .NET Core -NoNo + 2.0.0 -NoNoYesYesYesYes -YesYesNo +YesYesYesYes +YesYes YesYesYesYes -NoYesNoNoNo +Yes .NET Core Erlang -YesNo +Yes R16B0320.0.4 -NoYesYesNoYesYes -YesYesNo +YesYesYesYes +YesYes YesYesYesYes -NoNoYesNoNo +Yes Erlang Go -YesNo +Yes 1.2.11.8.3 -NoNoYesNoYesYes +YesYesYes YesYesYes YesYesYesYes -NoNoYesNoNo +Yes Go Haskell YesYes 7.6.38.0.2 -NoYesYesNoYesYes -YesYesNo -YesYesYesNo -NoNoYesYesNo +YesYesYesYes +YesYes +YesYesYes +YesYes Haskell Haxe -YesNo +Yes 3.2.1 -NoYesNoNoYesNo -YesYesNo +YesYes +YesYes YesYesYesYes -NoNoYesNoNo +Yes Haxe Java (SE) YesYes 1.7.0_1511.8.0_144 -NoYesYesNoYesYes +YesYesYesYes YesYesYes YesYesYesYes -NoYesYesYesYes +YesYesYesYes Java SE Java (ME) -NoNo + unknown -NoNoYesNoYesYes -NoYesNo -YesNoYesNo -NoNoNoNoNo +YesYesYes +Yes +YesYes + Java ME Javascript -YesNo +Yes unknown -NoNoNoNoYesYes -NoYesNo -NoNoYesYes -NoNoNoNoNo +YesYes +Yes +YesYes + Javascript Lua -YesNo +Yes 5.1.55.3.3 -NoNoYesNoYesNo -YesYesNo -YesYesYesNo -NoNoYesNoNo +YesYes +YesYes +YesYesYes +Yes Lua node.js -YesNo -4.2.66.11.2 -NoNoNoNoYesYes -YesYesNo +Yes +4.2.68.8.1 +YesYes +YesYes YesYesYesYes -NoNoYesNoNo +Yes node.js OCaml -NoNo + 4.02.34.04.0 -NoNoNoNoYesNo -YesNoNo -YesNoNoNo -NoNoYesYesNo +Yes +Yes +Yes +YesYes OCaml Perl -YesNo +Yes 5.18.25.26.0 -YesNoYesNoYesYes -YesYesNo -YesNoYesYes -YesNoYesNoNo +YesYesYesYes +YesYes +YesYesYes +YesYes Perl PHP -YesNo +Yes 5.5.97.1.8 -NoNoYesNoYesYes -YesYesNo +YesYesYes +YesYes YesYesYesYes -YesNoYesNoNo +YesYes PHP Python YesYes 2.7.6, 3.4.32.7.14, 3.6.3 -NoNoNoNoYesYes -NoYesYes +YesYes +YesYes YesYesYesYes -YesYesYesNoNo +YesYesYes Python Ruby -YesNo +Yes 1.9.3p4842.3.3p222 -YesNoYesNoYesYes -YesYesNo +YesYesYesYes +YesYes YesYesYesYes -NoYesYesYesYes +YesYesYesYes Ruby Rust -YesNo +Yes 1.15.11.18.0 -NoNoYesNoYesNo -YesNoNo -YesYesNoYes -NoNoNoYesNo +YesYes +Yes +YesYesYes +Yes Rust Smalltalk -NoNo + unknown -NoNoNoNoYesNo -NoNoNo -YesNoNoNo -NoNoNoNoNo +Yes + +Yes + Smalltalk diff --git a/build/docker/README.md b/build/docker/README.md index 32fad92ebda..4cada36fdf9 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -105,7 +105,7 @@ Last updated: October 1, 2017 | java | 1.7.0_151 | 1.8.0_131 | 1.8.0_144 | | | js | | | | Unsure how to look for version info? | | lua | 5.1.5 | 5.2.4 | 5.3.3 | | -| nodejs | | 4.2.6 | 6.11.2 | trusty has node.js 0.10.0 which is too old | +| nodejs | | 4.2.6 | 8.8.1 | trusty has node.js 0.10.0 which is too old | | ocaml | | 4.02.3 | 4.04.0 | | | perl | 5.18.2 | 5.22.1 | 5.26.0 | | | php | 5.5.9 | 7.0.22 | 7.1.8 | | diff --git a/build/docker/ubuntu-artful/Dockerfile b/build/docker/ubuntu-artful/Dockerfile index 1c8f9633e17..523fc36bf7c 100644 --- a/build/docker/ubuntu-artful/Dockerfile +++ b/build/docker/ubuntu-artful/Dockerfile @@ -46,8 +46,7 @@ RUN apt-get update && \ # echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list # node.js (this step runs apt-get update internally) - if we ever want a later version -# note: node 8.5 introduced some issues with directory handling / jsdoc / something... using 7.x for now -# RUN curl -sL https://deb.nodesource.com/setup_7.x | bash +RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - ### install general dependencies RUN apt-get install -y --no-install-recommends \ @@ -170,8 +169,7 @@ RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \ `# Node.js dependencies` \ - nodejs \ - npm + nodejs RUN apt-get install -y --no-install-recommends \ `# OCaml dependencies` \ diff --git a/lib/js/package.json b/lib/js/package.json index edb2ba6555a..526528dd5c6 100644 --- a/lib/js/package.json +++ b/lib/js/package.json @@ -9,11 +9,11 @@ "grunt-contrib-qunit": "^1.2.0", "grunt-contrib-uglify": "^1.0.1", "grunt-external-daemon": "^1.1.0", - "grunt-jsdoc": ">= 2.1.1", + "grunt-jsdoc": "^2.2.0", "grunt-shell": "^1.3.0" }, "dependencies": { - "jsdoc": "<3.5.0", + "jsdoc": "^3.5.5", "nopt": "^4.0.1" } } diff --git a/test/perl/TestServer.pl b/test/perl/TestServer.pl index c97067e991f..1e23ce84a56 100644 --- a/test/perl/TestServer.pl +++ b/test/perl/TestServer.pl @@ -282,7 +282,7 @@ () print(", "); } print("$key"); - push($result, $key); + push(@arr, $key); } print("})\n"); return $result;