Upgrade the closure compiler version (#5955)
Also update Dockerfile for JavaScript. The old one is using an npm that is too outdated
diff --git a/js/gulpfile.js b/js/gulpfile.js
index c458da6..b236699 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -137,7 +137,7 @@
return './node_modules/google-closure-library/closure/bin/build/closurebuilder.py ' +
'--root node_modules ' +
'-o compiled ' +
- '--compiler_jar node_modules/google-closure-compiler/compiler.jar ' +
+ '--compiler_jar node_modules/google-closure-compiler-java/compiler.jar ' +
'-i ' + exportsFile + ' ' +
'map.js message.js binary/arith.js binary/constants.js binary/decoder.js ' +
'binary/encoder.js binary/reader.js binary/utils.js binary/writer.js ' +
diff --git a/js/package.json b/js/package.json
index 2dc3cdb..ee3b0eb 100644
--- a/js/package.json
+++ b/js/package.json
@@ -9,8 +9,8 @@
"dependencies": {},
"devDependencies": {
"glob": "~6.0.4",
- "google-closure-compiler": "~20160619.0.0",
- "google-closure-library": "~20160125.0.0",
+ "google-closure-compiler": "~20190301.0.0",
+ "google-closure-library": "~20190301.0.0",
"gulp": "~3.9.0",
"jasmine": "~2.4.1"
},
diff --git a/kokoro/linux/dockerfile/push_testing_images.sh b/kokoro/linux/dockerfile/push_testing_images.sh
index 54a69e3..9a2983c 100755
--- a/kokoro/linux/dockerfile/push_testing_images.sh
+++ b/kokoro/linux/dockerfile/push_testing_images.sh
@@ -4,7 +4,7 @@
cd $(dirname $0)/../../..
git_root=$(pwd)
-cd -
+cd kokoro/linux/dockerfile
DOCKERHUB_ORGANIZATION=protobuftesting
diff --git a/kokoro/linux/dockerfile/test/javascript/Dockerfile b/kokoro/linux/dockerfile/test/javascript/Dockerfile
new file mode 100644
index 0000000..dff7e7b
--- /dev/null
+++ b/kokoro/linux/dockerfile/test/javascript/Dockerfile
@@ -0,0 +1,33 @@
+FROM ubuntu:latest
+
+RUN apt-get update && apt-get install -y gnupg
+
+# Install dependencies. We start with the basic ones require to build protoc
+# and the C++ build
+RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
+ autoconf \
+ autotools-dev \
+ build-essential \
+ bzip2 \
+ ccache \
+ curl \
+ gcc \
+ git \
+ libc6 \
+ libc6-dbg \
+ libc6-dev \
+ libgtest-dev \
+ libtool \
+ make \
+ parallel \
+ time \
+ wget \
+ && apt-get clean
+
+
+##################
+# Javascript dependencies.
+RUN apt-get install -y \
+ # -- For javascript and closure compiler -- \
+ npm \
+ default-jre
diff --git a/kokoro/linux/javascript/build.sh b/kokoro/linux/javascript/build.sh
index c2585fb..e1e1723 100755
--- a/kokoro/linux/javascript/build.sh
+++ b/kokoro/linux/javascript/build.sh
@@ -10,7 +10,8 @@
# Change to repo root
cd $(dirname $0)/../../..
-export DOCKERFILE_DIR=kokoro/linux/64-bit
+export DOCKERHUB_ORGANIZATION=protobuftesting
+export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/javascript
export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
export OUTPUT_DIR=testoutput
export TEST_SET="javascript"
