Move JS and CSS files to a Javascript source dir (#156)

We got non-serialization object error when deploying the invoicing
pipeline. It turns out that Beam requires every field in the pipeline
object is serilizable. However, it is non-trivial to make
GoogleCredentialsBundle serilizable because almost all of its
dependency are not serilizable and not contraled by us. Also,
it is non-necessary to inject the credential as the spec11
pipeline also writes output to GCS without having injected
credential. So, removing the injected variable can solve the
problem.

TESTED=First reproduced the problem locally by deploying the invoicing pipeline with the previous code; applied this change and successfully deploy the pipeline without having any issue.

.gcloudignore

@@ -1,8 +1,6 @@
-docs/**
+python/
-python/**
+**/build/
-bazel-*/**
+**/out/
-gradle/**/build/**
+.*/
-gradle/**/WEB-INF/**
-gradle/.*/**
 repos/**
-**/.idea/**
+**/.idea/

.gitignore

@@ -74,6 +74,17 @@ local.properties
 # Auto-generated java files
 autogenerated/
 
+# IDEA
+nomulus.iml
+nomulus.ipr
+nomulus.iws
+
+# VScode
+.vscode
+
+# Javascript output
+**/out/*
+
 ######################################################################
 # Python Ignores
 
@@ -83,11 +94,9 @@ autogenerated/
 # Gradle Ignores
 
 # We don't want to ignore the gradle jar files
-!/gradle/gradle/wrapper/**/*.jar
+!/gradle/wrapper/**/*.jar
 .gradle/
-/gradle/.gradle
+**/build
-/gradle/**/WEB-INF
+node_modules/**
-/gradle/**/build
+!node_modules/soyutils_usegoog.js
-/gradle/node_modules/**
-!/gradle/node_modules/soyutils_usegoog.js
 /repos/

.travis.yml

@@ -25,7 +25,6 @@
 # usage (usually just wrapping it in single quotes should suffice).
 
 language: java
-install: true
 jdk:
   # Our builds fail against Oracle Java for reasons yet unknown.
   - openjdk8
@@ -39,15 +38,36 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $HOME/google-cloud-sdk/
 
 # WebDriver tests need Chrome and ChromeDriver provisioned by the docker image
 services:
   - docker
 
 env:
-  # Disable fancy status information (looks bad on travis and exceeds logfile
+  global:
-  # quota)
+    # Disable fancy status information (looks bad on travis and exceeds logfile
-  TERM=dumb
+    # quota)
+    - TERM=dumb
+    # Do not prompt for user input when using any SDK methods.
+    - CLOUDSDK_CORE_DISABLE_PROMPTS=1
+
+install:
+  - |
+    if [ ! -d $HOME/google-cloud-sdk/bin ]
+    then
+      # The install script errors if this directory already exists,
+      # but Travis already creates it when we mark it as cached.
+      rm -rf $HOME/google-cloud-sdk
+      # The install script is overly verbose, which sometimes causes
+      # problems on Travis, so ignore stdout.
+      curl https://sdk.cloud.google.com | bash
+    fi
+  # This line is critical. We setup the SDK to take precedence in our
+  # environment over the old SDK that is already on the machine.
+  - source $HOME/google-cloud-sdk/path.bash.inc
+  - gcloud components install app-engine-java
+  - gcloud version
 
 # Specialize gradle build to use an up-to-date gradle and the /gradle
 # directory.
@@ -55,4 +75,4 @@ env:
 # output, instead of the default 10.
 # See notes on the CREDZ and REPORT_GCS_BUCKET environment variable in the
 # comments at the top of the file.
-script: cd gradle && echo "$CREDZ" >credz.json && chmod 755 ./gradlew && travis_wait 45 ./gradlew build --continue -P uploaderDestination="$REPORT_GCS_DESTINATION" -P uploaderCredentialsFile=credz.json -P uploaderMultithreadedUpload=yes -P mavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven -P pluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins
+script: echo "$CREDZ" >credz.json && chmod 755 ./gradlew && travis_wait 45 ./gradlew build --continue -P uploaderDestination="$REPORT_GCS_DESTINATION" -P uploaderCredentialsFile=credz.json -P uploaderMultithreadedUpload=yes -P mavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven -P pluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins

CONTRIBUTORS

@@ -32,3 +32,5 @@ Hans Ridder <hans.ridder@gmail.com>
 Justin Graham <justin.af.graham@gmail.com>
 Guy Bensky <guyben@google.com>
 Weimin Yu <weiminyu@google.com>
+Shicong Huang <shicong@google.com>
+Gustav Brodman <gbrodman@google.com>

README.md

@@ -1,8 +1,8 @@
 # Nomulus
 
-| Bazel | Gradle |
+| Internal Build | FOSS Build | License | Code Search |
-|-------|--------|
+|----------------|------------|---------|-------------|
-|![Build Status](https://storage.googleapis.com/domain-registry-github-build-status/github-ci-status.png)|[![Build Status](https://travis-ci.org/google/nomulus.svg?branch=master)](https://travis-ci.org/google/nomulus)|
+|[![Build Status for Google Registry internal build](https://storage.googleapis.com/domain-registry-kokoro/build.svg)](https://storage.googleapis.com/domain-registry-kokoro/index.html)|[![Build Status for the open source build](https://travis-ci.org/google/nomulus.svg?branch=master)](https://travis-ci.org/google/nomulus)|[![License for this repo](https://img.shields.io/github/license/google/nomulus.svg)](https://github.com/jianglai/nomulus/blob/master/LICENSE)|[![Link to Source Graph](https://github.com/sourcegraph/sourcegraph/blob/master/ui/assets/img/sourcegraph-logo.svg)](https://sourcegraph.com/github.com/google/nomulus)|
 
 ![Nomulus logo](./nomulus-logo.png)
 
@@ -30,8 +30,8 @@ running system:
 
 *   [Install
     guide](https://github.com/google/nomulus/blob/master/docs/install.md)
-*   View the source code in
+*   View the source code for the [GAE app](https://github.com/google/nomulus/tree/master/core/src/main/java/google/registry)
-    [java/google/registry/](https://github.com/google/nomulus/tree/master/java/google/registry)
+    and for the [GKE proxy](https://github.com/google/nomulus/tree/master/proxy/src/main/java/google/registry)
 *   [Other docs](https://github.com/google/nomulus/tree/master/docs)
 *   [Javadoc](https://nomulus.foo/javadoc/latest/)
 *   [Nomulus discussion

WORKSPACE

@@ -1,56 +0,0 @@
-workspace(name = "domain_registry")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# https://github.com/bazelbuild/rules_closure/releases/tag/0.8.0
-http_archive(
-    name = "io_bazel_rules_closure",
-    sha256 = "0e6de40666f2ebb2b30dc0339745a274d9999334a249b05a3b1f46462e489adf",
-    strip_prefix = "rules_closure-87d24b1df8b62405de8dd059cb604fd9d4b1e395",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/87d24b1df8b62405de8dd059cb604fd9d4b1e395.tar.gz",
-        "https://github.com/bazelbuild/rules_closure/archive/87d24b1df8b62405de8dd059cb604fd9d4b1e395.tar.gz",
-    ],
-)
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
-
-closure_repositories(
-    omit_com_google_auto_factory = True,
-    omit_com_google_protobuf = True,
-    omit_com_google_code_findbugs_jsr305 = True,
-    omit_com_google_guava = True,
-    omit_com_ibm_icu_icu4j = True,
-    omit_javax_inject = True,
-    omit_org_json = True,
-)
-
-load("//java/google/registry:repositories.bzl", "domain_registry_repositories")
-
-domain_registry_repositories()
-
-# Setup docker bazel rules
-http_archive(
-    name = "io_bazel_rules_docker",
-    sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",
-    strip_prefix = "rules_docker-0.7.0",
-    urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.7.0.tar.gz"],
-)
-
-load(
-    "@io_bazel_rules_docker//repositories:repositories.bzl",
-    container_repositories = "repositories",
-)
-container_repositories()
-
-load(
-    "@io_bazel_rules_docker//container:container.bzl",
-    "container_pull",
-)
-
-container_pull(
-  name = "java_base",
-  registry = "gcr.io",
-  repository = "distroless/java",
-  # 'tag' is also supported, but digest is encouraged for reproducibility.
-  digest = "sha256:84a63da5da6aba0f021213872de21a4f9829e4bd2801aef051cf40b6f8952e68",
-)

appengine_war.gradle

@@ -1,3 +1,17 @@
+// Copyright 2019 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 def environments = ['production', 'sandbox', 'alpha', 'crash']
 
 def projects = ['production': 'domain-registry',
@@ -8,7 +22,7 @@ def projects = ['production': 'domain-registry',
 
 def environment = rootProject.findProperty("environment")
 if (environment == null) {
-    environment = 'alpha'
+    environment = 'production'
 }
 def gcpProject = projects[environment]
 if (gcpProject == null) {
@@ -21,14 +35,14 @@ apply plugin: 'war'
 // plugin will recognize this as an app-engine standard app (and also
 // obtains the appengine-web.xml from the correct location)
 project.convention.plugins['war'].webAppDirName =
-        "../../../java/google/registry/env/${environment}/${project.name}"
+        "../../core/src/main/java/google/registry/env/${environment}/${project.name}"
 
 apply plugin: 'com.google.cloud.tools.appengine'
 
 // Get the web.xml file for the service.
 war {
     webInf {
-        from "../../../java/google/registry/env/common/${project.name}/WEB-INF"
+        from "../../core/src/main/java/google/registry/env/common/${project.name}/WEB-INF"
     }
 }
 
@@ -71,3 +85,4 @@ dependencies {
 
 rootProject.deploy.dependsOn appengineDeploy
 rootProject.stage.dependsOn appengineStage
+appengineDeploy.dependsOn rootProject.verifyDeployment

build.gradle

@@ -1,3 +1,17 @@
+// Copyright 2019 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 buildscript {
   if (project.disableDependencyLocking.toBoolean() == false) {
     // Lock buildscript dependencies.
@@ -23,9 +37,13 @@ plugins {
   id 'net.ltgt.apt' version '0.19' apply false
   id 'net.ltgt.errorprone' version '0.6.1'
   id 'checkstyle'
+  id 'com.github.johnrengelman.shadow' version '5.0.0'
 
   // NodeJs plugin
   id "com.moowork.node" version "1.2.0"
+
+  id 'idea'
+  id 'com.diffplug.gradle.spotless' version '3.18.0'
 }
 
 apply plugin: google.registry.gradle.plugin.ReportUploaderPlugin
@@ -64,9 +82,7 @@ if (!project.hasProperty('showAllOutput')) {
 gradleLint.autoLintAfterFailure = false
 
 // Paths to main and test sources.
-ext.projectRootDir = "${rootDir}/.."
+ext.projectRootDir = "${rootDir}"
-ext.javaDir = "${rootDir}/../java"
-ext.javatestsDir = "${rootDir}/../javatests"
 
 // Tasks to deploy/stage all App Engine services
 task deploy {
@@ -74,6 +90,16 @@ task deploy {
   description = 'Deploys all services to App Engine.'
 }
 
+task verifyDeployment {
+  group = 'deployment'
+  description = 'Ensure that one can only deploy to alpha.'
+  doFirst {
+    if (rootProject.findProperty("environment") != 'alpha') {
+      throw new GradleException("Can only deploy to alpha.");
+    }
+  }
+}
+
 task stage {
   group = 'deployment'
   description = 'Generates application directories for all services.'
@@ -96,10 +122,35 @@ allprojects {
   }
 }
 
+task runPresubmits(type: Exec) {
+  executable '/usr/bin/python'
+  args('config/presubmits.py')
+}
+
 subprojects {
   // Skip no-op project
   if (project.name == 'services') return
 
+  ext.createUberJar = { taskName, binaryName, mainClass ->
+    project.tasks.create(
+      taskName, com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
+      mergeServiceFiles()
+      baseName = binaryName
+      manifest {
+        attributes 'Main-Class': mainClass
+      }
+      zip64 = true
+      classifier = null
+      version = null
+      configurations = [project.configurations.runtimeClasspath]
+      from project.sourceSets.main.output
+      // Excludes signature files that accompany some dependency jars, like
+      // bonuncycastle. If they are present, only classes from those signed jars are
+      // made available to the class loader.
+      // see https://discuss.gradle.org/t/signing-a-custom-gradle-plugin-thats-downloaded-by-the-build-system-from-github/1365
+      exclude "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA"
+    }
+  }
 
   if (rootProject.disableDependencyLocking.toBoolean() == false) {
     buildscript {
@@ -132,6 +183,8 @@ subprojects {
 
   if (project.name == 'third_party') return
 
+  project.tasks.test.dependsOn runPresubmits
+
 // Path to code generated with annotation processors. Note that this path is
 // chosen by the 'net.ltgt.apt' plugin, and may change if IDE-specific plugins
 // are applied, e.g., 'idea' or 'eclipse'
@@ -140,43 +193,39 @@ subprojects {
 
   def commonlyExcludedResources = ['**/*.java', '**/BUILD']
 
+  project.ext.javaDir = "${project.projectDir}/src/main/java"
+  project.ext.javaTestDir = "${project.projectDir}/src/test/java"
+  project.ext.resourcesSourceDir = "${project.projectDir}/src/main/resources"
+
   sourceSets {
     main {
       java {
-        srcDirs = [
+        srcDirs += aptGeneratedDir
-            rootProject.javaDir,
-            aptGeneratedDir
-        ]
       }
       resources {
-        srcDirs = [
+        srcDirs += project.ext.javaDir
-            rootProject.javaDir
-        ]
         exclude commonlyExcludedResources
       }
     }
     test {
       java {
-        srcDirs = [
+        srcDirs += aptGeneratedTestDir
-            rootProject.javatestsDir,
-            aptGeneratedTestDir
-        ]
       }
       resources {
-        srcDirs = [
+        srcDirs += project.ext.javaTestDir
-            rootProject.javatestsDir,
-        ]
         exclude commonlyExcludedResources
       }
     }
   }
 
+  if (project.name == 'util') return
+  if (project.name == 'proxy') return
+  if (project.name == 'core') return
+
   test {
     testLogging.showStandardStreams = Boolean.parseBoolean(showAllOutput)
   }
 
-  if (project.name == 'core') return
-
   ext.relativePath = "google/registry/${project.name}"
 
   sourceSets.each {
@@ -187,12 +236,4 @@ subprojects {
       include "${project.relativePath}/"
     }
   }
-  project(':core').sourceSets.each {
-    it.java {
-      exclude "${project.relativePath}/"
-    }
-    it.resources {
-      exclude "${project.relativePath}/"
-    }
-  }
 }

buildSrc/build.gradle

@@ -1,3 +1,17 @@
+// Copyright 2019 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 buildscript {
   if (rootProject.disableDependencyLocking.toBoolean() == false) {
     // Lock buildscript dependencies.
@@ -8,14 +22,13 @@ buildscript {
 }
 
 plugins {
-// Java static analysis plugins. Keep versions consistent with ../build.gradle
+  // Java static analysis plugins. Keep versions consistent with ../build.gradle
   id 'nebula.lint' version '10.4.2'
   // Config helper for annotation processors such as AutoValue and Dagger.
   // Ensures that source code is generated at an appropriate location.
   id 'net.ltgt.apt' version '0.19' apply false
   id 'net.ltgt.errorprone' version '0.6.1'
   id 'checkstyle'
-
   id 'com.diffplug.gradle.spotless' version '3.18.0'
 }
 
@@ -41,24 +54,16 @@ repositories {
 apply from: '../dependencies.gradle'
 apply from: '../java_common.gradle'
 
-checkstyle {
+sourceSets {
-  configDir file('../config/checkstyle')
+  main {
+    java {
+      srcDirs += "${project.buildDir}/generated/source/apt/main"
+    }
+  }
 }
 
-// To check or fix file formats, run the following commands from this directory:
+checkstyle {
-// - Check: ../gradlew spotlessCheck
+  configDir file('../config/checkstyle')
-// - Format in place: ../gradlew spotlessApply
-spotless {
-  java {
-    googleJavaFormat('1.7')
-  }
-  format 'misc', {
-    target '**/*.gradle'
-
-    trimTrailingWhitespace()
-    indentWithSpaces(2)
-    endWithNewline()
-  }
 }
 
 dependencies {
@@ -70,7 +75,6 @@ dependencies {
   compile deps['com.google.auto.value:auto-value-annotations']
   compile deps['com.google.cloud:google-cloud-storage']
   compile deps['org.apache.commons:commons-text']
-  compile deps['com.google.auth:google-auth-library-credentials']
   compile deps['com.google.template:soy']
   annotationProcessor deps['com.google.auto.value:auto-value']
   testCompile deps['com.google.truth:truth']

buildSrc/gradle/dependency-locks/compile.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.google.api-client:google-api-client:1.27.0
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-iam-v1:0.12.0
@@ -11,8 +11,8 @@ com.google.api:api-common:1.7.0
 com.google.api:gax-httpjson:0.52.1
 com.google.api:gax:1.35.1
 com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.cloud:google-cloud-core-http:1.59.0
 com.google.cloud:google-cloud-core:1.59.0
@@ -26,21 +26,21 @@ com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.0-beta1
 com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.27.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.oauth-client:google-oauth-client:1.27.0
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.12.0
+io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.15.0
+io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.15.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 javax.annotation:javax.annotation-api:1.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -48,8 +48,8 @@ javax.validation:validation-api:1.0.0.GA
 joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.json:json:20160212

buildSrc/gradle/dependency-locks/compileClasspath.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.google.api-client:google-api-client:1.27.0
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-iam-v1:0.12.0
@@ -11,8 +11,8 @@ com.google.api:api-common:1.7.0
 com.google.api:gax-httpjson:0.52.1
 com.google.api:gax:1.35.1
 com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.cloud:google-cloud-core-http:1.59.0
 com.google.cloud:google-cloud-core:1.59.0
@@ -26,21 +26,21 @@ com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.0-beta1
 com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.27.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.oauth-client:google-oauth-client:1.27.0
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.12.0
+io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.15.0
+io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.15.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 javax.annotation:javax.annotation-api:1.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -48,8 +48,8 @@ javax.validation:validation-api:1.0.0.GA
 joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.json:json:20160212

buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.google.api-client:google-api-client:1.27.0
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-iam-v1:0.12.0
@@ -11,8 +11,8 @@ com.google.api:api-common:1.7.0
 com.google.api:gax-httpjson:0.52.1
 com.google.api:gax:1.35.1
 com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.cloud:google-cloud-core-http:1.59.0
 com.google.cloud:google-cloud-core:1.59.0
@@ -26,21 +26,21 @@ com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.0-beta1
 com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.27.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.oauth-client:google-oauth-client:1.27.0
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.12.0
+io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.15.0
+io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.15.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 javax.annotation:javax.annotation-api:1.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -48,8 +48,8 @@ javax.validation:validation-api:1.0.0.GA
 joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.json:json:20160212

buildSrc/gradle/dependency-locks/testCompile.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.google.api-client:google-api-client:1.27.0
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-iam-v1:0.12.0
@@ -11,8 +11,8 @@ com.google.api:api-common:1.7.0
 com.google.api:gax-httpjson:0.52.1
 com.google.api:gax:1.35.1
 com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.cloud:google-cloud-core-http:1.59.0
 com.google.cloud:google-cloud-core:1.59.0
@@ -26,24 +26,24 @@ com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.0-beta1
 com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.27.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.oauth-client:google-oauth-client:1.27.0
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:0.44
+com.google.truth.extensions:truth-java8-extension:0.45
-com.google.truth:truth:0.44
+com.google.truth:truth:0.45
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.ibm.icu:icu4j:57.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.12.0
+io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.15.0
+io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.15.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 javax.annotation:javax.annotation-api:1.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -54,8 +54,8 @@ net.bytebuddy:byte-buddy-agent:1.9.7
 net.bytebuddy:byte-buddy:1.9.7
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17

buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.google.api-client:google-api-client:1.27.0
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-iam-v1:0.12.0
@@ -11,8 +11,8 @@ com.google.api:api-common:1.7.0
 com.google.api:gax-httpjson:0.52.1
 com.google.api:gax:1.35.1
 com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.cloud:google-cloud-core-http:1.59.0
 com.google.cloud:google-cloud-core:1.59.0
@@ -26,24 +26,24 @@ com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.0-beta1
 com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.27.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.oauth-client:google-oauth-client:1.27.0
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:0.44
+com.google.truth.extensions:truth-java8-extension:0.45
-com.google.truth:truth:0.44
+com.google.truth:truth:0.45
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.ibm.icu:icu4j:57.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.12.0
+io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.15.0
+io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.15.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 javax.annotation:javax.annotation-api:1.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -54,8 +54,8 @@ net.bytebuddy:byte-buddy-agent:1.9.7
 net.bytebuddy:byte-buddy:1.9.7
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17

buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.google.api-client:google-api-client:1.27.0
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-iam-v1:0.12.0
@@ -11,8 +11,8 @@ com.google.api:api-common:1.7.0
 com.google.api:gax-httpjson:0.52.1
 com.google.api:gax:1.35.1
 com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.cloud:google-cloud-core-http:1.59.0
 com.google.cloud:google-cloud-core:1.59.0
@@ -26,24 +26,24 @@ com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.0-beta1
 com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.27.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.oauth-client:google-oauth-client:1.27.0
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:0.44
+com.google.truth.extensions:truth-java8-extension:0.45
-com.google.truth:truth:0.44
+com.google.truth:truth:0.45
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.ibm.icu:icu4j:57.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.12.0
+io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.15.0
+io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.15.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 javax.annotation:javax.annotation-api:1.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -54,8 +54,8 @@ net.bytebuddy:byte-buddy-agent:1.9.7
 net.bytebuddy:byte-buddy:1.9.7
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17

config/checkstyle/checkstyle.xml

@@ -25,6 +25,53 @@ by Joshua Bloch in his book Effective Java -->
     <property name="message" value='TODO is preferred to FIXME.  e.g. "TODO(johndoe): Refactor when v2 is released."' />
   </module>
 
+  <!-- Checks that String.toUpper/LowerCase() is never used without locale. -->
+  <module name="RegexpSingleline">
+    <property name="format" value="\.to(Upper|Lower)Case\(\)"/>
+    <property name="message" value="String.toUpper/LowerCase() can have unexpected results depending on locale. Either set the locale explicitly - e.g., toUpperCase(Locale.ENGLISH) - or use Ascii.toUpper/LowerCase(...) instead." />
+  </module>
+
+  <!-- Checks that DateTime.now(...) is always passed a DateTimeZone parameter. -->
+  <module name="RegexpSingleline">
+    <property name="format" value="DateTime\.now\(\)"/>
+    <property name="message" value="DateTime.now() must be called with a DateTimeZone parameter, e.g. DateTime.now(UTC)" />
+  </module>
+
+  <!-- Checks that Javadoc does not include a malformed @see tag. -->
+  <module name="RegexpSingleline">
+    <property name="format" value='@see\s\"http(|s)://'/>
+    <property name="message" value='Your Javadocs appear to use invalid &lt;a&gt; tag syntax in @see tags. Please use the correct syntax: @see &lt;a href="http(s)://your_url"&gt;url_description&lt;/a&gt;'/>
+  </module>
+
+  <!-- Checks that our Ofy wrapper is used instead of the "real" ofy(). -->
+  <module name="RegexpSingleline">
+    <property name="format" value="com\.googlecode\.objectify\.ObjectifyService\.ofy"/>
+    <property name="message" value="Use google.registry.model.ofy.ObjectifyService.ofy(). Do not use com.googlecode.objectify.v4.ObjectifyService.ofy()."/>
+  </module>
+
+  <!-- Checks that java.util.Optional is used instead of Guava's Optional. -->
+  <module name="RegexpSingleline">
+    <property name="format" value="com\.google\.common\.base\.Optional"/>
+    <property name="message" value="Use java.util.Optional instead of Guava's Optional."/>
+  </module>
+
+  <!-- Checks that our backport JUnit exception assertion methods are used instead of the ones slated for release in JUnit 4.13. -->
+  <module name="RegexpSingleline">
+    <property name="format" value="org\.junit\.Assert\.(assert|expect)Throws"/>
+    <property name="message" value="Use the exception assertion methods in google.registry.testing.JUnitBackports instead of those in JUnit."/>
+  </module>
+
+  <!-- Checks that the deprecated ExpectedException is not used. -->
+  <module name="RegexpSingleline">
+    <property name="format" value="org\.junit\.rules\.ExpectedException"/>
+    <property name="message" value="Use assertThrows and expectThrows from JUnitBackports instead of the deprecated methods on ExpectedException."/>
+  </module>
+
+  <!-- Checks that the deprecated MockitoJUnitRunner is not used. -->
+  <module name="RegexpSingleline">
+    <property name="format" value="MockitoJUnitRunner"/>
+    <property name="message" value="MockitoJUnitRunner is deprecated. Use @RunWith(JUnit4.class) and MockitoRule instead."/>
+  </module>
 
   <!-- All Java AST specific tests live under TreeWalker module. -->
   <module name="TreeWalker">

config/checkstyle/suppressions.xml

@@ -8,5 +8,7 @@
   <!-- Ignore generated files in Checkstyle -->
   <suppress files="[/\\].*[/\\]generated.*[/\\]" checks="."/>
   <!-- Ignore Javadoc checks in test files -->
-  <suppress files="[/\\].*[/\\]javatests.*[/\\]" checks="JavadocType"/>
+  <suppress files="[/\\].*[/\\]src/test/java/.*[/\\]" checks="JavadocType"/>
+  <!-- ofy() regex check doesn't apply to these files -->
+  <suppress files="AugmentedDeleter.java|AugmentedSaver.java|Ofy.java" checks="RegexpSingleline"/>
 </suppressions>

config/presubmits.py

@@ -0,0 +1,185 @@
+# Copyright 2019 The Nomulus Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Google-style presubmits for the Nomulus project.
+
+These aren't built in to the static code analysis tools we use (e.g. Checkstyle,
+Error Prone) so we must write them manually.
+"""
+
+import os
+import sys
+import re
+
+# We should never analyze any generated files
+UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "/out/"}
+# We can't rely on CI to have the Enum package installed so we do this instead.
+FORBIDDEN = 1
+REQUIRED = 2
+
+
+class PresubmitCheck:
+
+  def __init__(self,
+               regex,
+               included_extensions,
+               skipped_patterns,
+               regex_type=FORBIDDEN):
+    """Define a presubmit check for a particular set of files,
+
+        The provided prefix should always or never be included in the files.
+
+        Args:
+            regex: the regular expression to forbid or require
+            included_extensions: a tuple of extensions that define which files
+              we run over
+            skipped_patterns: a set of patterns that will cause any files that
+              include them to be skipped
+            regex_type: either FORBIDDEN or REQUIRED--whether or not the regex
+              must be present or cannot be present.
+    """
+    self.regex = regex
+    self.included_extensions = included_extensions
+    self.skipped_patterns = UNIVERSALLY_SKIPPED_PATTERNS.union(skipped_patterns)
+    self.regex_type = regex_type
+
+  def fails(self, file):
+    """ Determine whether or not this file fails the regex check.
+
+    Args:
+        file: the full path of the file to check
+    """
+    if not file.endswith(self.included_extensions):
+      return False
+    for pattern in self.skipped_patterns:
+      if pattern in file:
+        return False
+    with open(file, "r") as f:
+      file_content = f.read()
+      matches = re.match(self.regex, file_content, re.DOTALL)
+      if self.regex_type == FORBIDDEN:
+        return matches
+      return not matches
+
+
+PRESUBMITS = {
+    # License check
+    PresubmitCheck(
+        r".*Copyright 20\d{2} The Nomulus Authors\. All Rights Reserved\.",
+        ("java", "js", "soy", "sql", "py", "sh", "gradle"), {
+            ".git", "/build/", "/generated/", "node_modules/",
+            "JUnitBackports.java"
+        }, REQUIRED):
+        "File did not include the license header.",
+
+    # Files must end in a newline
+    PresubmitCheck(r".*\n$", ("java", "js", "soy", "sql", "py", "sh", "gradle"),
+                   {"node_modules/"}, REQUIRED):
+        "Source files must end in a newline.",
+
+    # System.(out|err).println should only appear in tools/
+    PresubmitCheck(
+        r".*\bSystem\.(out|err)\.print", "java", {
+            "StackdriverDashboardBuilder.java", "/tools/", "/example/",
+            "RegistryTestServerMain.java", "TestServerRule.java",
+            "FlowDocumentationTool.java"
+        }):
+        "System.(out|err).println is only allowed in tools/ packages. Please "
+        "use a logger instead.",
+
+    # Various Soy linting checks
+    PresubmitCheck(
+        r".* (/\*)?\* {?@param ",
+        "soy",
+        {},
+    ):
+        "In SOY please use the ({@param name: string} /** User name. */) style"
+        " parameter passing instead of the ( * @param name User name.) style "
+        "parameter pasing.",
+    PresubmitCheck(
+        r'.*\{[^}]+\w+:\s+"',
+        "soy",
+        {},
+    ):
+        "Please don't use double-quoted string literals in Soy parameters",
+    PresubmitCheck(
+        r'.*autoescape\s*=\s*"[^s]',
+        "soy",
+        {},
+    ):
+        "All soy templates must use strict autoescaping",
+    PresubmitCheck(
+        r".*noAutoescape",
+        "soy",
+        {},
+    ):
+        "All soy templates must use strict autoescaping",
+
+    # various JS linting checks
+    PresubmitCheck(
+        r".*goog\.base\(",
+        "js",
+        {"/node_modules/"},
+    ):
+        "Use of goog.base is not allowed.",
+    PresubmitCheck(
+        r".*goog\.dom\.classes",
+        "js",
+        {"/node_modules/"},
+    ):
+        "Instead of goog.dom.classes, use goog.dom.classlist which is smaller "
+        "and faster.",
+    PresubmitCheck(
+        r".*goog\.getMsg",
+        "js",
+        {"/node_modules/"},
+    ):
+        "Put messages in Soy, instead of using goog.getMsg().",
+    PresubmitCheck(
+        r".*(innerHTML|outerHTML)\s*(=|[+]=)([^=]|$)",
+        "js",
+        {"/node_modules/"},
+    ):
+        "Do not assign directly to the dom. Use goog.dom.setTextContent to set"
+        " to plain text, goog.dom.removeChildren to clear, or "
+        "soy.renderElement to render anything else",
+    PresubmitCheck(
+        r".*console\.(log|info|warn|error)",
+        "js",
+        {"/node_modules/", "google/registry/ui/js/util.js"},
+    ):
+        "JavaScript files should not include console logging."
+}
+
+
+def get_files():
+  result = []
+  for root, dirnames, filenames in os.walk("."):
+    for filename in filenames:
+      yield os.path.join(root, filename)
+
+
+if __name__ == "__main__":
+  failed = False
+  for file in get_files():
+    error_messages = []
+    for presubmit, error_message in PRESUBMITS.items():
+      if presubmit.fails(file):
+        error_messages.append(error_message)
+
+    if error_messages:
+      failed = True
+      print("%s had errors: \n  %s" % (file, "\n  ".join(error_messages)))
+
+  if failed:
+    sys.exit(1)

core/build.gradle

@@ -1,3 +1,17 @@
+// Copyright 2019 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 plugins {
   id 'java-library'
 }
@@ -10,7 +24,8 @@ def screenshotsDir = "${project.buildDir}/screenshots"
 def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens"
 def newGoldensDir = "${project.buildDir}/new_golden_images"
 def goldensDir =
-  "${javatestsDir}/google/registry/webdriver/goldens/chrome-linux"
+  "${javaTestDir}/google/registry/webdriver/goldens/chrome-linux"
+def jsDir = "${project.projectDir}/src/main/javascript"
 
 // Tests that conflict with (mostly unidentified) members of the main test
 // suite. It is unclear if they are offenders (i.e., those that pollute global
@@ -58,12 +73,24 @@ sourceSets {
   main {
     java {
       srcDirs += generatedDir
+      // Javadoc API is deprecated and removed in Java 12.
+      // TODO(jianglai): re-enable after migrating to the new Javadoc API
+      if ((JavaVersion.current().majorVersion as Integer) > 11) {
+        exclude 'google/registry/documentation/**'
+      }
     }
     resources {
       exclude '**/*.xjb'
     }
   }
   test {
+    java {
+      // Javadoc API is deprecated and removed in Java 12.
+      // TODO(jianglai): re-enable after migrating to the new Javadoc API
+      if ((JavaVersion.current().majorVersion as Integer) > 11) {
+        exclude 'google/registry/documentation/**'
+      }
+    }
     resources {
       exclude '**/*.xjb', '**/*.xsd'
     }
@@ -110,7 +137,7 @@ dependencies {
   // Custom-built objectify jar at commit ecd5165, included in Nomulus
   // release.
   implementation files(
-      "${rootDir}/../third_party/objectify/v4_1/objectify-4.1.3.jar")
+      "${rootDir}/third_party/objectify/v4_1/objectify-4.1.3.jar")
   testImplementation project(':third_party')
 
   compile deps['com.beust:jcommander']
@@ -134,9 +161,7 @@ dependencies {
   compile deps['com.google.apis:google-api-services-monitoring']
   compile deps['com.google.apis:google-api-services-sheets']
   maybeRuntime deps['com.google.apis:google-api-services-storage']
-  // TODO(b/71631624): change appengine:appengine-api-1.0-sdk to
+  testCompileOnly deps['com.google.appengine:appengine-api-1.0-sdk']
-  // testCompileOnly after BillingEmailUtilsTest.java is fixed.
-  compile deps['com.google.appengine:appengine-api-1.0-sdk']
   maybeRuntime deps['com.google.appengine:appengine-api-labs']
   maybeRuntime deps['com.google.appengine:appengine-api-stubs']
   testCompile deps['com.google.appengine:appengine-api-stubs']
@@ -374,7 +399,7 @@ task soyToJava {
           spec11SoyDir, toolsSoyDir, uiSoyDir, registrarSoyDir,
   ]
   soyRelativeDirs.each {
-    inputs.dir "${javaDir}/${it}"
+    inputs.dir "${resourcesSourceDir}/${it}"
     outputs.dir "${generatedDir}/${it}"
   }
 
@@ -394,19 +419,19 @@ task soyToJava {
     soyToJava('google.registry.tools.soy',
             "${generatedDir}/${toolsSoyDir}",
             fileTree(
-                    dir: "${javaDir}/${toolsSoyDir}",
+                    dir: "${resourcesSourceDir}/${toolsSoyDir}",
                     include: ['**/*.soy']))
 
     soyToJava('google.registry.ui.soy.registrar',
             "${generatedDir}/${registrarSoyDir}",
             fileTree(
-                    dir: "${javaDir}/${registrarSoyDir}",
+                    dir: "${resourcesSourceDir}/${registrarSoyDir}",
                     include: ['**/*.soy']))
 
     soyToJava('google.registry.ui.soy',
             "${generatedDir}/${uiSoyDir}",
             files {
-              file("${javaDir}/${uiSoyDir}").listFiles()
+              file("${resourcesSourceDir}/${uiSoyDir}").listFiles()
             }.filter {
               it.name.endsWith(".soy")
             })
@@ -414,13 +439,13 @@ task soyToJava {
     soyToJava('google.registry.reporting.spec11.soy',
             "${generatedDir}/${spec11SoyDir}",
             fileTree(
-                    dir: "${javaDir}/${spec11SoyDir}",
+                    dir: "${resourcesSourceDir}/${spec11SoyDir}",
                     include: ['**/*.soy']))
   }
 }
 
 task soyToJS {
-  def rootSoyDirectory = "${javaDir}/google/registry/ui/soy"
+  def rootSoyDirectory = "${resourcesSourceDir}/google/registry/ui/soy"
   def outputSoyDirectory = "${generatedDir}/google/registry/ui/soy"
   inputs.dir rootSoyDirectory
   outputs.dir outputSoyDirectory
@@ -434,7 +459,7 @@ task soyToJS {
           "--allowExternalCalls", "false",
           "--srcs", "${soyFiles.join(',')}",
           "--shouldProvideRequireSoyNamespaces", "true",
-          "--compileTimeGlobalsFile", "${javaDir}/google/registry/ui/globals.txt",
+          "--compileTimeGlobalsFile", "${resourcesSourceDir}/google/registry/ui/globals.txt",
           "--deps", "${deps.join(',')}"
     }
   }
@@ -456,7 +481,7 @@ task soyToJS {
 }
 
 task stylesheetsToJavascript {
-  def cssSourceDir = "${javaDir}/google/registry/ui/css"
+  def cssSourceDir = "${jsDir}/google/registry/ui/css"
   def outputDir = "${resourcesDir}/google/registry/ui/css"
   inputs.dir cssSourceDir
   outputs.dir outputDir
@@ -509,8 +534,8 @@ task compileProdJS(type: JavaExec) {
   def outputDir = "${resourcesDir}/google/registry/ui"
   def nodeModulesDir = "${rootDir}/node_modules"
   def cssSourceDir = "${resourcesDir}/google/registry/ui/css"
-  def jsSourceDir = "${javaDir}/google/registry/ui/js"
+  def jsSourceDir = "${jsDir}/google/registry/ui/js"
-  def externsDir = "${javaDir}/google/registry/ui/externs"
+  def externsDir = "${jsDir}/google/registry/ui/externs"
   def soySourceDir = "${generatedDir}/google/registry/ui/soy"
 
   [nodeModulesDir, cssSourceDir, jsSourceDir, externsDir, soySourceDir].each {
@@ -560,6 +585,15 @@ compileProdJS.dependsOn processTestResources
 compileProdJS.dependsOn soyToJS
 assemble.dependsOn compileProdJS
 
+task karmaTest(type: Exec) {
+  dependsOn ':npmInstall'
+  workingDir rootProject.projectDir
+  executable 'node_modules/karma/bin/karma'
+  args('start')
+}
+
+test.dependsOn karmaTest
+
 // Make testing artifacts available to be depended up on by other projects.
 // TODO: factor out google.registry.testing to be a separate project.
 task testJar(type: Jar) {
@@ -666,23 +700,11 @@ test {
   }
 }.dependsOn(fragileTest, outcastTest)
 
-task nomulus(type: Jar) {
+createUberJar('nomulus', 'nomulus', 'google.registry.tools.RegistryTool')
-  manifest {
+createUberJar('gtechTool', 'gtech_tool', 'google.registry.tools.GtechTool')
-    attributes 'Main-Class': 'google.registry.tools.RegistryTool'
+project.nomulus.dependsOn project(':third_party').jar
-  }
+project.gtechTool.dependsOn project(':third_party').jar
-  zip64 = true
+
-  baseName = 'nomulus'
+project.build.dependsOn nomulus
-  version = null
+project.build.dependsOn gtechTool
-  from {
+project.build.dependsOn ':stage'
-    configurations.runtimeClasspath.collect {
-      it.isDirectory() ? it : zipTree(it)
-    }
-  }
-  // Excludes signature files that accompany some dependency jars, like
-  // bonuncycastle. It they are present, only classes from those signed jars are
-  // made available to the class loader.
-  // see https://discuss.gradle.org/t/signing-a-custom-gradle-plugin-thats-downloaded-by-the-build-system-from-github/1365
-  exclude "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA"
-  with jar
-  dependsOn project(':third_party').jar
-}

core/gradle/dependency-locks/compile.lockfile

@@ -4,16 +4,16 @@
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
-com.beust:jcommander:1.48
+com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.9.8
-com.fasterxml.jackson.core:jackson-core:2.9.8
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.fasterxml.jackson.core:jackson-databind:2.9.8
 com.github.luben:zstd-jni:1.3.8-3
-com.google.api-client:google-api-client-appengine:1.28.0
+com.google.api-client:google-api-client-appengine:1.29.0
 com.google.api-client:google-api-client-jackson2:1.27.0
 com.google.api-client:google-api-client-java6:1.27.0
-com.google.api-client:google-api-client-servlet:1.28.0
+com.google.api-client:google-api-client-servlet:1.29.0
-com.google.api-client:google-api-client:1.28.0
+com.google.api-client:google-api-client:1.29.2
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.44.0
@@ -56,8 +56,8 @@ com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.48
 com.google.appengine:appengine-remote-api:1.9.48
 com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.6.3
 com.google.cloud.bigdataoss:gcsio:1.9.16
@@ -83,24 +83,22 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-apache:2.0.0
+com.google.http-client:google-http-client-appengine:1.29.2
-com.google.http-client:google-http-client-appengine:1.28.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client-jackson2:1.28.0
 com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-jdo:1.28.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.28.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:metrics:1.0.4
 com.google.monitoring-client:stackdriver:1.0.4
-com.google.oauth-client:google-oauth-client-appengine:1.28.0
+com.google.oauth-client:google-oauth-client-appengine:1.29.0
 com.google.oauth-client:google-oauth-client-java6:1.28.0
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.28.0
+com.google.oauth-client:google-oauth-client-servlet:1.29.0
-com.google.oauth-client:google-oauth-client:1.28.0
+com.google.oauth-client:google-oauth-client:1.29.2
 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
@@ -113,14 +111,14 @@ com.jcraft:jsch:0.1.55
 com.squareup.okhttp:okhttp:2.5.0
 com.squareup.okio:okio:1.13.0
 com.thoughtworks.paranamer:paranamer:2.7
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
 io.dropwizard.metrics:metrics-core:3.1.2
 io.grpc:grpc-all:1.17.1
 io.grpc:grpc-alts:1.17.1
 io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.17.1
+io.grpc:grpc-context:1.19.0
 io.grpc:grpc-core:1.17.1
 io.grpc:grpc-grpclb:1.17.1
 io.grpc:grpc-netty-shaded:1.17.1
@@ -142,10 +140,10 @@ io.netty:netty-handler:4.1.30.Final
 io.netty:netty-resolver:4.1.30.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
 io.netty:netty-transport:4.1.30.Final
-io.opencensus:opencensus-api:0.18.0
+io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
 io.opencensus:opencensus-contrib-grpc-util:0.17.0
-io.opencensus:opencensus-contrib-http-util:0.18.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.annotation:javax.annotation-api:1.2
@@ -173,8 +171,8 @@ org.apache.beam:beam-vendor-grpc-1_13_1:0.2
 org.apache.beam:beam-vendor-guava-20_0:0.1
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-lang3:3.5
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.5.2

core/gradle/dependency-locks/compileClasspath.lockfile

@@ -4,16 +4,16 @@
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
-com.beust:jcommander:1.48
+com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.9.8
-com.fasterxml.jackson.core:jackson-core:2.9.8
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.fasterxml.jackson.core:jackson-databind:2.9.8
 com.github.luben:zstd-jni:1.3.8-3
-com.google.api-client:google-api-client-appengine:1.28.0
+com.google.api-client:google-api-client-appengine:1.29.0
 com.google.api-client:google-api-client-jackson2:1.27.0
 com.google.api-client:google-api-client-java6:1.27.0
-com.google.api-client:google-api-client-servlet:1.28.0
+com.google.api-client:google-api-client-servlet:1.29.0
-com.google.api-client:google-api-client:1.28.0
+com.google.api-client:google-api-client:1.29.2
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.44.0
@@ -56,8 +56,8 @@ com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.48
 com.google.appengine:appengine-remote-api:1.9.48
 com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.6.3
 com.google.cloud.bigdataoss:gcsio:1.9.16
@@ -82,24 +82,22 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-apache:2.0.0
+com.google.http-client:google-http-client-appengine:1.29.2
-com.google.http-client:google-http-client-appengine:1.28.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client-jackson2:1.28.0
 com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-jdo:1.28.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.28.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:metrics:1.0.4
 com.google.monitoring-client:stackdriver:1.0.4
-com.google.oauth-client:google-oauth-client-appengine:1.28.0
+com.google.oauth-client:google-oauth-client-appengine:1.29.0
 com.google.oauth-client:google-oauth-client-java6:1.28.0
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.28.0
+com.google.oauth-client:google-oauth-client-servlet:1.29.0
-com.google.oauth-client:google-oauth-client:1.28.0
+com.google.oauth-client:google-oauth-client:1.29.2
 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
@@ -112,14 +110,14 @@ com.jcraft:jsch:0.1.55
 com.squareup.okhttp:okhttp:2.5.0
 com.squareup.okio:okio:1.13.0
 com.thoughtworks.paranamer:paranamer:2.7
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
 io.dropwizard.metrics:metrics-core:3.1.2
 io.grpc:grpc-all:1.17.1
 io.grpc:grpc-alts:1.17.1
 io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.17.1
+io.grpc:grpc-context:1.19.0
 io.grpc:grpc-core:1.17.1
 io.grpc:grpc-netty-shaded:1.17.1
 io.grpc:grpc-netty:1.17.1
@@ -140,10 +138,10 @@ io.netty:netty-handler:4.1.30.Final
 io.netty:netty-resolver:4.1.30.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
 io.netty:netty-transport:4.1.30.Final
-io.opencensus:opencensus-api:0.18.0
+io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
 io.opencensus:opencensus-contrib-grpc-util:0.17.0
-io.opencensus:opencensus-contrib-http-util:0.18.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.annotation:javax.annotation-api:1.2
@@ -171,8 +169,8 @@ org.apache.beam:beam-vendor-grpc-1_13_1:0.2
 org.apache.beam:beam-vendor-guava-20_0:0.1
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-lang3:3.5
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.5.2

core/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -4,16 +4,16 @@
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
-com.beust:jcommander:1.48
+com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.9.8
-com.fasterxml.jackson.core:jackson-core:2.9.8
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.fasterxml.jackson.core:jackson-databind:2.9.8
 com.github.luben:zstd-jni:1.3.8-3
-com.google.api-client:google-api-client-appengine:1.28.0
+com.google.api-client:google-api-client-appengine:1.29.0
 com.google.api-client:google-api-client-jackson2:1.27.0
 com.google.api-client:google-api-client-java6:1.27.0
-com.google.api-client:google-api-client-servlet:1.28.0
+com.google.api-client:google-api-client-servlet:1.29.0
-com.google.api-client:google-api-client:1.28.0
+com.google.api-client:google-api-client:1.29.2
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.44.0
@@ -56,8 +56,8 @@ com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.48
 com.google.appengine:appengine-remote-api:1.9.48
 com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.6.3
 com.google.cloud.bigdataoss:gcsio:1.9.16
@@ -83,24 +83,22 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-apache:2.0.0
+com.google.http-client:google-http-client-appengine:1.29.2
-com.google.http-client:google-http-client-appengine:1.28.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client-jackson2:1.28.0
 com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-jdo:1.28.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.28.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:metrics:1.0.4
 com.google.monitoring-client:stackdriver:1.0.4
-com.google.oauth-client:google-oauth-client-appengine:1.28.0
+com.google.oauth-client:google-oauth-client-appengine:1.29.0
 com.google.oauth-client:google-oauth-client-java6:1.28.0
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.28.0
+com.google.oauth-client:google-oauth-client-servlet:1.29.0
-com.google.oauth-client:google-oauth-client:1.28.0
+com.google.oauth-client:google-oauth-client:1.29.2
 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
@@ -115,14 +113,14 @@ com.squareup.okio:okio:1.13.0
 com.sun.istack:istack-commons-runtime:3.0.5
 com.sun.xml.fastinfoset:FastInfoset:1.2.13
 com.thoughtworks.paranamer:paranamer:2.7
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
 io.dropwizard.metrics:metrics-core:3.1.2
 io.grpc:grpc-all:1.17.1
 io.grpc:grpc-alts:1.17.1
 io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.17.1
+io.grpc:grpc-context:1.19.0
 io.grpc:grpc-core:1.17.1
 io.grpc:grpc-grpclb:1.17.1
 io.grpc:grpc-netty-shaded:1.17.1
@@ -144,10 +142,10 @@ io.netty:netty-handler:4.1.30.Final
 io.netty:netty-resolver:4.1.30.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
 io.netty:netty-transport:4.1.30.Final
-io.opencensus:opencensus-api:0.18.0
+io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
 io.opencensus:opencensus-contrib-grpc-util:0.17.0
-io.opencensus:opencensus-contrib-http-util:0.18.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.annotation:javax.annotation-api:1.2
@@ -175,8 +173,8 @@ org.apache.beam:beam-vendor-grpc-1_13_1:0.2
 org.apache.beam:beam-vendor-guava-20_0:0.1
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-lang3:3.5
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.5.2

core/gradle/dependency-locks/testCompile.lockfile

@@ -4,16 +4,16 @@
 aopalliance:aopalliance:1.0
 args4j:args4j:2.33
 cglib:cglib-nodep:2.2
-com.beust:jcommander:1.48
+com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.9.8
-com.fasterxml.jackson.core:jackson-core:2.9.8
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.fasterxml.jackson.core:jackson-databind:2.9.8
 com.github.luben:zstd-jni:1.3.8-3
-com.google.api-client:google-api-client-appengine:1.28.0
+com.google.api-client:google-api-client-appengine:1.29.0
 com.google.api-client:google-api-client-jackson2:1.27.0
 com.google.api-client:google-api-client-java6:1.27.0
-com.google.api-client:google-api-client-servlet:1.28.0
+com.google.api-client:google-api-client-servlet:1.29.0
-com.google.api-client:google-api-client:1.28.0
+com.google.api-client:google-api-client:1.29.2
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.44.0
@@ -57,8 +57,8 @@ com.google.appengine:appengine-api-1.0-sdk:1.9.48
 com.google.appengine:appengine-api-stubs:1.9.48
 com.google.appengine:appengine-remote-api:1.9.48
 com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.6.3
 com.google.cloud.bigdataoss:gcsio:1.9.16
@@ -85,32 +85,30 @@ com.google.guava:guava-testlib:25.0-jre
 com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-apache:2.0.0
+com.google.http-client:google-http-client-appengine:1.29.2
-com.google.http-client:google-http-client-appengine:1.28.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client-jackson2:1.28.0
 com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-jdo:1.28.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.28.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:contrib:1.0.4
 com.google.monitoring-client:metrics:1.0.4
 com.google.monitoring-client:stackdriver:1.0.4
-com.google.oauth-client:google-oauth-client-appengine:1.28.0
+com.google.oauth-client:google-oauth-client-appengine:1.29.0
 com.google.oauth-client:google-oauth-client-java6:1.28.0
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.28.0
+com.google.oauth-client:google-oauth-client-servlet:1.29.0
-com.google.oauth-client:google-oauth-client:1.28.0
+com.google.oauth-client:google-oauth-client:1.29.2
 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:0.44
+com.google.truth.extensions:truth-java8-extension:0.45
-com.google.truth:truth:0.44
+com.google.truth:truth:0.45
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.json-simple:json-simple:1.1.1
@@ -123,14 +121,14 @@ com.squareup.okhttp:okhttp:2.5.0
 com.squareup.okio:okio:1.14.0
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
 io.dropwizard.metrics:metrics-core:3.1.2
 io.grpc:grpc-all:1.17.1
 io.grpc:grpc-alts:1.17.1
 io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.17.1
+io.grpc:grpc-context:1.19.0
 io.grpc:grpc-core:1.17.1
 io.grpc:grpc-grpclb:1.17.1
 io.grpc:grpc-netty-shaded:1.17.1
@@ -152,10 +150,10 @@ io.netty:netty-handler:4.1.30.Final
 io.netty:netty-resolver:4.1.30.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
 io.netty:netty-transport:4.1.30.Final
-io.opencensus:opencensus-api:0.18.0
+io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
 io.opencensus:opencensus-contrib-grpc-util:0.17.0
-io.opencensus:opencensus-contrib-http-util:0.18.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -193,8 +191,8 @@ org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
 org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.apache.mina:mina-core:2.0.4
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0

core/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -4,16 +4,16 @@
 aopalliance:aopalliance:1.0
 args4j:args4j:2.33
 cglib:cglib-nodep:2.2
-com.beust:jcommander:1.48
+com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.9.8
-com.fasterxml.jackson.core:jackson-core:2.9.8
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.fasterxml.jackson.core:jackson-databind:2.9.8
 com.github.luben:zstd-jni:1.3.8-3
-com.google.api-client:google-api-client-appengine:1.28.0
+com.google.api-client:google-api-client-appengine:1.29.0
 com.google.api-client:google-api-client-jackson2:1.27.0
 com.google.api-client:google-api-client-java6:1.27.0
-com.google.api-client:google-api-client-servlet:1.28.0
+com.google.api-client:google-api-client-servlet:1.29.0
-com.google.api-client:google-api-client:1.28.0
+com.google.api-client:google-api-client:1.29.2
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.44.0
@@ -57,8 +57,8 @@ com.google.appengine:appengine-api-1.0-sdk:1.9.48
 com.google.appengine:appengine-api-stubs:1.9.48
 com.google.appengine:appengine-remote-api:1.9.48
 com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.6.3
 com.google.cloud.bigdataoss:gcsio:1.9.16
@@ -84,32 +84,30 @@ com.google.guava:guava-testlib:25.0-jre
 com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-apache:2.0.0
+com.google.http-client:google-http-client-appengine:1.29.2
-com.google.http-client:google-http-client-appengine:1.28.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client-jackson2:1.28.0
 com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-jdo:1.28.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.28.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:contrib:1.0.4
 com.google.monitoring-client:metrics:1.0.4
 com.google.monitoring-client:stackdriver:1.0.4
-com.google.oauth-client:google-oauth-client-appengine:1.28.0
+com.google.oauth-client:google-oauth-client-appengine:1.29.0
 com.google.oauth-client:google-oauth-client-java6:1.28.0
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.28.0
+com.google.oauth-client:google-oauth-client-servlet:1.29.0
-com.google.oauth-client:google-oauth-client:1.28.0
+com.google.oauth-client:google-oauth-client:1.29.2
 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:0.44
+com.google.truth.extensions:truth-java8-extension:0.45
-com.google.truth:truth:0.44
+com.google.truth:truth:0.45
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.json-simple:json-simple:1.1.1
@@ -122,14 +120,14 @@ com.squareup.okhttp:okhttp:2.5.0
 com.squareup.okio:okio:1.14.0
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
 io.dropwizard.metrics:metrics-core:3.1.2
 io.grpc:grpc-all:1.17.1
 io.grpc:grpc-alts:1.17.1
 io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.17.1
+io.grpc:grpc-context:1.19.0
 io.grpc:grpc-core:1.17.1
 io.grpc:grpc-netty-shaded:1.17.1
 io.grpc:grpc-netty:1.17.1
@@ -150,10 +148,10 @@ io.netty:netty-handler:4.1.30.Final
 io.netty:netty-resolver:4.1.30.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
 io.netty:netty-transport:4.1.30.Final
-io.opencensus:opencensus-api:0.18.0
+io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
 io.opencensus:opencensus-contrib-grpc-util:0.17.0
-io.opencensus:opencensus-contrib-http-util:0.18.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -191,8 +189,8 @@ org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
 org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.apache.mina:mina-core:2.0.4
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0

core/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -4,16 +4,16 @@
 aopalliance:aopalliance:1.0
 args4j:args4j:2.33
 cglib:cglib-nodep:2.2
-com.beust:jcommander:1.48
+com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.9.8
-com.fasterxml.jackson.core:jackson-core:2.9.8
+com.fasterxml.jackson.core:jackson-core:2.9.9
 com.fasterxml.jackson.core:jackson-databind:2.9.8
 com.github.luben:zstd-jni:1.3.8-3
-com.google.api-client:google-api-client-appengine:1.28.0
+com.google.api-client:google-api-client-appengine:1.29.0
 com.google.api-client:google-api-client-jackson2:1.27.0
 com.google.api-client:google-api-client-java6:1.27.0
-com.google.api-client:google-api-client-servlet:1.28.0
+com.google.api-client:google-api-client-servlet:1.29.0
-com.google.api-client:google-api-client:1.28.0
+com.google.api-client:google-api-client:1.29.2
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.44.0
@@ -57,8 +57,8 @@ com.google.appengine:appengine-api-1.0-sdk:1.9.48
 com.google.appengine:appengine-api-stubs:1.9.48
 com.google.appengine:appengine-remote-api:1.9.48
 com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.12.0
+com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.12.0
+com.google.auth:google-auth-library-oauth2-http:0.16.1
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.6.3
 com.google.cloud.bigdataoss:gcsio:1.9.16
@@ -85,32 +85,30 @@ com.google.guava:guava-testlib:25.0-jre
 com.google.guava:guava:27.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-apache:2.0.0
+com.google.http-client:google-http-client-appengine:1.29.2
-com.google.http-client:google-http-client-appengine:1.28.0
+com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client-jackson2:1.28.0
 com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-jdo:1.28.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.28.0
+com.google.http-client:google-http-client:1.30.1
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:contrib:1.0.4
 com.google.monitoring-client:metrics:1.0.4
 com.google.monitoring-client:stackdriver:1.0.4
-com.google.oauth-client:google-oauth-client-appengine:1.28.0
+com.google.oauth-client:google-oauth-client-appengine:1.29.0
 com.google.oauth-client:google-oauth-client-java6:1.28.0
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.28.0
+com.google.oauth-client:google-oauth-client-servlet:1.29.0
-com.google.oauth-client:google-oauth-client:1.28.0
+com.google.oauth-client:google-oauth-client:1.29.2
 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
 com.google.protobuf:protobuf-java-util:3.6.1
 com.google.protobuf:protobuf-java:3.6.1
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:0.44
+com.google.truth.extensions:truth-java8-extension:0.45
-com.google.truth:truth:0.44
+com.google.truth:truth:0.45
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.json-simple:json-simple:1.1.1
@@ -125,14 +123,14 @@ com.sun.istack:istack-commons-runtime:3.0.5
 com.sun.xml.fastinfoset:FastInfoset:1.2.13
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
-commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
 io.dropwizard.metrics:metrics-core:3.1.2
 io.grpc:grpc-all:1.17.1
 io.grpc:grpc-alts:1.17.1
 io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.17.1
+io.grpc:grpc-context:1.19.0
 io.grpc:grpc-core:1.17.1
 io.grpc:grpc-grpclb:1.17.1
 io.grpc:grpc-netty-shaded:1.17.1
@@ -154,10 +152,10 @@ io.netty:netty-handler:4.1.30.Final
 io.netty:netty-resolver:4.1.30.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
 io.netty:netty-transport:4.1.30.Final
-io.opencensus:opencensus-api:0.18.0
+io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
 io.opencensus:opencensus-contrib-grpc-util:0.17.0
-io.opencensus:opencensus-contrib-http-util:0.18.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -195,8 +193,8 @@ org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
 org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
-org.apache.httpcomponents:httpclient:4.5.5
+org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.9
+org.apache.httpcomponents:httpcore:4.4.11
 org.apache.mina:mina-core:2.0.4
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0

core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java

@@ -73,7 +73,6 @@ public class DeleteLoadTestDataAction implements Runnable {
 
   @Inject MapreduceRunner mrRunner;
   @Inject Response response;
-  @Inject RegistryEnvironment registryEnvironment;
 
   @Inject
   DeleteLoadTestDataAction() {}
@@ -84,7 +83,8 @@ public class DeleteLoadTestDataAction implements Runnable {
     // run on production. On other environments, data is fully wiped out occasionally anyway, so
     // having some broken data that isn't referred to isn't the end of the world.
     checkState(
-        registryEnvironment != PRODUCTION, "This mapreduce is not safe to run on PRODUCTION.");
+        !RegistryEnvironment.get().equals(PRODUCTION),
+        "This mapreduce is not safe to run on PRODUCTION.");
 
     mrRunner
         .setJobName("Delete load test data")

core/src/main/java/google/registry/batch/DeleteProberDataAction.java

@@ -17,6 +17,7 @@ package google.registry.batch;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static google.registry.config.RegistryEnvironment.PRODUCTION;
 import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
 import static google.registry.model.ResourceTransferUtils.updateForeignKeyIndexDeletionTime;
 import static google.registry.model.ofy.ObjectifyService.ofy;
@@ -77,7 +78,6 @@ public class DeleteProberDataAction implements Runnable {
   @Inject @Config("registryAdminClientId") String registryAdminClientId;
   @Inject MapreduceRunner mrRunner;
   @Inject Response response;
-  @Inject RegistryEnvironment registryEnvironment;
   @Inject DeleteProberDataAction() {}
 
   @Override
@@ -96,7 +96,7 @@ public class DeleteProberDataAction implements Runnable {
 
   private ImmutableSet<String> getProberRoidSuffixes() {
     checkArgument(
-        !RegistryEnvironment.PRODUCTION.equals(registryEnvironment)
+        !PRODUCTION.equals(RegistryEnvironment.get())
             || tlds.stream().allMatch(tld -> tld.endsWith(".test")),
         "On production, can only work on TLDs that end with .test");
     ImmutableSet<String> deletableTlds =

core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java

@@ -14,17 +14,11 @@
 
 package google.registry.beam.invoicing;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import com.google.auth.oauth2.GoogleCredentials;
 import google.registry.beam.invoicing.BillingEvent.InvoiceGroupingKey;
 import google.registry.beam.invoicing.BillingEvent.InvoiceGroupingKey.InvoiceGroupingKeyCoder;
-import google.registry.config.CredentialModule.LocalCredentialJson;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.reporting.billing.BillingModule;
 import google.registry.reporting.billing.GenerateInvoicesAction;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.Serializable;
 import javax.inject.Inject;
 import org.apache.beam.runners.dataflow.DataflowRunner;
@@ -85,8 +79,6 @@ public class InvoicingPipeline implements Serializable {
   @Config("invoiceFilePrefix")
   String invoiceFilePrefix;
 
-  @Inject @LocalCredentialJson String credentialJson;
-
   @Inject
   InvoicingPipeline() {}
 
@@ -108,13 +100,6 @@ public class InvoicingPipeline implements Serializable {
   public void deploy() {
     // We can't store options as a member variable due to serialization concerns.
     InvoicingPipelineOptions options = PipelineOptionsFactory.as(InvoicingPipelineOptions.class);
-    try {
-      options.setGcpCredential(
-          GoogleCredentials.fromStream(new ByteArrayInputStream(credentialJson.getBytes(UTF_8))));
-    } catch (IOException e) {
-      throw new RuntimeException(
-          "Cannot obtain local credential to deploy the invoicing pipeline", e);
-    }
     options.setProject(projectId);
     options.setRunner(DataflowRunner.class);
     // This causes p.run() to stage the pipeline as a template on GCS, as opposed to running it.

core/src/main/java/google/registry/bigquery/BigqueryConnection.java

@@ -727,7 +727,7 @@ public class BigqueryConnection implements AutoCloseable {
               .setProjectId(getProjectId())
               .setDatasetId(datasetName)))
           .execute();
-      System.err.printf("Created dataset: %s:%s\n", getProjectId(), datasetName);
+      logger.atInfo().log("Created dataset: %s:%s\n", getProjectId(), datasetName);
       return true;
     }
     return false;

core/src/main/java/google/registry/bigquery/BigqueryModule.java

@@ -14,7 +14,6 @@
 
 package google.registry.bigquery;
 
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.services.bigquery.Bigquery;
 import com.google.api.services.bigquery.model.TableFieldSchema;
 import com.google.common.collect.ImmutableList;
@@ -23,24 +22,29 @@ import dagger.Provides;
 import dagger.multibindings.Multibinds;
 import google.registry.config.CredentialModule.DefaultCredential;
 import google.registry.config.RegistryConfig.Config;
+import google.registry.util.GoogleCredentialsBundle;
 import java.util.Map;
 
 /** Dagger module for Google {@link Bigquery} connection objects. */
 @Module
 public abstract class BigqueryModule {
 
-  /** Provides a map of BigQuery table names to field names. */
+  // No subclasses.
-  @Multibinds
+  private BigqueryModule() {}
-  abstract Map<String, ImmutableList<TableFieldSchema>> bigquerySchemas();
 
   @Provides
   static Bigquery provideBigquery(
-      @DefaultCredential GoogleCredential credential, @Config("projectId") String projectId) {
+      @DefaultCredential GoogleCredentialsBundle credentialsBundle,
-    return new Bigquery.Builder(credential.getTransport(), credential.getJsonFactory(), credential)
+      @Config("projectId") String projectId) {
+    return new Bigquery.Builder(
+            credentialsBundle.getHttpTransport(),
+            credentialsBundle.getJsonFactory(),
+            credentialsBundle.getHttpRequestInitializer())
         .setApplicationName(projectId)
         .build();
   }
 
-  // No subclasses.
+  /** Provides a map of BigQuery table names to field names. */
-  private BigqueryModule() {}
+  @Multibinds
+  abstract Map<String, ImmutableList<TableFieldSchema>> bigquerySchemas();
 }

core/src/main/java/google/registry/config/CredentialModule.java

@@ -16,32 +16,28 @@ package google.registry.config;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.auth.oauth2.GoogleCredentials;
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
-import com.google.api.client.googleapis.util.Utils;
 import com.google.common.collect.ImmutableList;
 import dagger.Module;
 import dagger.Provides;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.keyring.api.KeyModule.Key;
+import google.registry.util.GoogleCredentialsBundle;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.security.GeneralSecurityException;
 import javax.inject.Qualifier;
 import javax.inject.Singleton;
 
-/**
+/** Dagger module that provides all {@link GoogleCredentials} used in the application. */
- * Dagger module that provides all {@link GoogleCredential GoogleCredentials} used in the
- * application.
- */
 @Module
 public abstract class CredentialModule {
 
   /**
-   * Provides the default {@link GoogleCredential} from the Google Cloud runtime.
+   * Provides the default {@link GoogleCredentialsBundle} from the Google Cloud runtime.
    *
    * <p>The credential returned depends on the runtime environment:
    *
@@ -58,22 +54,22 @@ public abstract class CredentialModule {
   @DefaultCredential
   @Provides
   @Singleton
-  public static GoogleCredential provideDefaultCredential(
+  public static GoogleCredentialsBundle provideDefaultCredential(
       @Config("defaultCredentialOauthScopes") ImmutableList<String> requiredScopes) {
-    GoogleCredential credential;
+    GoogleCredentials credential;
     try {
-      credential = GoogleCredential.getApplicationDefault();
+      credential = GoogleCredentials.getApplicationDefault();
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
     if (credential.createScopedRequired()) {
-      return credential.createScoped(requiredScopes);
+      credential = credential.createScoped(requiredScopes);
     }
-    return credential;
+    return GoogleCredentialsBundle.create(credential);
   }
 
   /**
-   * Provides a {@link GoogleCredential} from the service account's JSON key file.
+   * Provides a {@link GoogleCredentialsBundle} from the service account's JSON key file.
    *
    * <p>On App Engine, a thread created using Java's built-in API needs this credential when it
    * calls App Engine API. The Google Sheets API also needs this credential.
@@ -81,28 +77,24 @@ public abstract class CredentialModule {
   @JsonCredential
   @Provides
   @Singleton
-  public static GoogleCredential provideJsonCredential(
+  public static GoogleCredentialsBundle provideJsonCredential(
       @Config("defaultCredentialOauthScopes") ImmutableList<String> requiredScopes,
       @Key("jsonCredential") String jsonCredential) {
-    GoogleCredential credential;
+    GoogleCredentials credential;
     try {
       credential =
-          GoogleCredential.fromStream(
+          GoogleCredentials.fromStream(new ByteArrayInputStream(jsonCredential.getBytes(UTF_8)));
-              new ByteArrayInputStream(jsonCredential.getBytes(UTF_8)),
+    } catch (IOException e) {
-              // We cannot use UrlFetchTransport as that uses App Engine API.
+      throw new UncheckedIOException(e);
-              GoogleNetHttpTransport.newTrustedTransport(),
-              Utils.getDefaultJsonFactory());
-    } catch (IOException | GeneralSecurityException e) {
-      throw new RuntimeException(e);
     }
     if (credential.createScopedRequired()) {
       credential = credential.createScoped(requiredScopes);
     }
-    return credential;
+    return GoogleCredentialsBundle.create(credential);
   }
 
   /**
-   * Provides a {@link GoogleCredential} with delegated admin access for a G Suite domain.
+   * Provides a {@link GoogleCredentialsBundle} with delegated admin access for a G Suite domain.
    *
    * <p>The G Suite domain must grant delegated admin access to the registry service account with
    * all scopes in {@code requiredScopes}, including ones not related to G Suite.
@@ -110,18 +102,14 @@ public abstract class CredentialModule {
   @DelegatedCredential
   @Provides
   @Singleton
-  public static GoogleCredential provideDelegatedCredential(
+  public static GoogleCredentialsBundle provideDelegatedCredential(
       @Config("delegatedCredentialOauthScopes") ImmutableList<String> requiredScopes,
-      @JsonCredential GoogleCredential googleCredential,
+      @JsonCredential GoogleCredentialsBundle credentialsBundle,
       @Config("gSuiteAdminAccountEmailAddress") String gSuiteAdminAccountEmailAddress) {
-    return new GoogleCredential.Builder()
+    return GoogleCredentialsBundle.create(credentialsBundle
-        .setTransport(Utils.getDefaultTransport())
+        .getGoogleCredentials()
-        .setJsonFactory(Utils.getDefaultJsonFactory())
+        .createDelegated(gSuiteAdminAccountEmailAddress)
-        .setServiceAccountId(googleCredential.getServiceAccountId())
+        .createScoped(requiredScopes));
-        .setServiceAccountPrivateKey(googleCredential.getServiceAccountPrivateKey())
-        .setServiceAccountScopes(requiredScopes)
-        .setServiceAccountUser(gSuiteAdminAccountEmailAddress)
-        .build();
   }
 
   /** Dagger qualifier for the Application Default Credential. */

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -94,13 +94,6 @@ public final class RegistryConfig {
   @Module
   public static final class ConfigModule {
 
-    private static final RegistryEnvironment REGISTRY_ENVIRONMENT = RegistryEnvironment.get();
-
-    @Provides
-    public static RegistryEnvironment provideRegistryEnvironment() {
-      return REGISTRY_ENVIRONMENT;
-    }
-
     @Provides
     @Config("projectId")
     public static String provideProjectId(RegistryConfigSettings config) {