commit c4f0ce7be55999a8ee2f72e259887a510c8c74f4
author Martin Fick <mfick@codeaurora.org> Wed Sep 29 15:14:37 2021 -0600
committer Martin Fick <mfick@codeaurora.org> Wed Sep 29 15:14:45 2021 -0600
tree 1cb3d13bf40229bf0d1131e0c5bf88ba038d2a77
parent 91a1d3327def796cbad7f82f4672587eac8214cf
parent d614d2459943c1fb5802f9b91c691bbe37dd3192

Merge branch 'stable-3.3'

* stable-3.3:
  fixup!: docker: Enable reruning tests without bringing down setup
  docker: Enable reruning tests without bringing down setup
  docker: Add support for "--preserve" option

Change-Id: Icff7f4ef70ae15d329fbaf453bb7382b73844ebd

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index f573f76..c217ecf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -8,7 +8,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "b4324e30289c2f6a2a07a4f0a9df6b1fce85ef1a",
+    commit = "6ebb3cfa1332a0dc0d2b7ea904a4703656f2ba54",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

gr-task-plugin/gr-task-plugin.js

diff --git a/gr-task-plugin/gr-task-plugin.js b/gr-task-plugin/gr-task-plugin.js
index 34fa467..c665d61 100644
--- a/gr-task-plugin/gr-task-plugin.js
+++ b/gr-task-plugin/gr-task-plugin.js
@@ -27,7 +27,7 @@
  *  hint: ?string,
  *  name: string,
  *  status: string
- * }}
+ * }} Defs.Task
  */
 Defs.Task;
 

package.json

diff --git a/package.json b/package.json
index ff90a5b..fac70e5 100644
--- a/package.json
+++ b/package.json
@@ -7,11 +7,11 @@
     "@bazel/terser": "^3.4.0"
   },
   "devDependencies": {
-    "eslint": "^6.6.0",
-    "eslint-config-google": "^0.13.0",
-    "eslint-plugin-html": "^6.0.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jsdoc": "^19.2.0",
+    "eslint": "^7.24.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-plugin-html": "^6.1.2",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsdoc": "^32.3.0",
     "rollup": "^2.45.2",
     "terser": "^5.6.1"
   },

test/docker/gerrit/Dockerfile

diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile
index b15542e..12aa74a 100755
--- a/test/docker/gerrit/Dockerfile
+++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.3.4-ubuntu20
+FROM gerritcodereview/gerrit:3.4.0-ubuntu20
 
 ENV GERRIT_SITE /var/gerrit
 RUN git config -f "$GERRIT_SITE/etc/gerrit.config" auth.type \