Merge branch 'master' into delete-bazel

google · Jun 13, 2019 · e07fbfa · e07fbfa
2 parents b280efa + 8fa45e8
commit e07fbfa
Show file tree

Hide file tree

Showing 25 changed files with 153 additions and 157 deletions.
diff --git a/gradle/build.gradle b/gradle/build.gradle
@@ -23,6 +23,7 @@ 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"
@@ -100,6 +101,26 @@ 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 {
@@ -196,3 +217,4 @@ subprojects {
     }
   }
 }
+
diff --git a/gradle/core/build.gradle b/gradle/core/build.gradle
@@ -666,23 +666,9 @@ test {
   }
 }.dependsOn(fragileTest, outcastTest)
 
-task nomulus(type: Jar) {
-  manifest {
-    attributes 'Main-Class': 'google.registry.tools.RegistryTool'
-  }
-  zip64 = true
-  baseName = 'nomulus'
-  version = null
-  from {
-    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
-}
+createUberJar('nomulus', 'nomulus', 'google.registry.tools.RegistryTool')
+createUberJar('gtechTool', 'gtech_tool', 'google.registry.tools.GtechTool')
+project.nomulus.dependsOn project(':third_party').jar
+project.gtechTool.dependsOn project(':third_party').jar
+
+
diff --git a/gradle/core/gradle/dependency-locks/compile.lockfile b/gradle/core/gradle/dependency-locks/compile.lockfile
@@ -13,7 +13,7 @@ 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.29.0
-com.google.api-client:google-api-client:1.29.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
@@ -83,11 +83,11 @@ 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-appengine:1.29.1
-com.google.http-client:google-http-client-jackson2:1.29.1
+com.google.http-client:google-http-client-appengine:1.29.2
+com.google.http-client:google-http-client-jackson2:1.29.2
 com.google.http-client:google-http-client-jackson:1.20.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.29.1
+com.google.http-client:google-http-client:1.29.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.1
@@ -98,7 +98,7 @@ 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.29.0
-com.google.oauth-client:google-oauth-client:1.29.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

diff --git a/gradle/core/gradle/dependency-locks/compileClasspath.lockfile b/gradle/core/gradle/dependency-locks/compileClasspath.lockfile
@@ -13,7 +13,7 @@ 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.29.0
-com.google.api-client:google-api-client:1.29.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
@@ -82,11 +82,11 @@ 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-appengine:1.29.1
-com.google.http-client:google-http-client-jackson2:1.29.1
+com.google.http-client:google-http-client-appengine:1.29.2
+com.google.http-client:google-http-client-jackson2:1.29.2
 com.google.http-client:google-http-client-jackson:1.20.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.29.1
+com.google.http-client:google-http-client:1.29.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.1
@@ -97,7 +97,7 @@ 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.29.0
-com.google.oauth-client:google-oauth-client:1.29.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

diff --git a/gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -13,7 +13,7 @@ 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.29.0
-com.google.api-client:google-api-client:1.29.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
@@ -83,11 +83,11 @@ 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-appengine:1.29.1
-com.google.http-client:google-http-client-jackson2:1.29.1
+com.google.http-client:google-http-client-appengine:1.29.2
+com.google.http-client:google-http-client-jackson2:1.29.2
 com.google.http-client:google-http-client-jackson:1.20.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.29.1
+com.google.http-client:google-http-client:1.29.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.1
@@ -98,7 +98,7 @@ 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.29.0
-com.google.oauth-client:google-oauth-client:1.29.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

diff --git a/gradle/core/gradle/dependency-locks/testCompile.lockfile b/gradle/core/gradle/dependency-locks/testCompile.lockfile
@@ -13,7 +13,7 @@ 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.29.0
-com.google.api-client:google-api-client:1.29.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
@@ -85,11 +85,11 @@ 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-appengine:1.29.1
-com.google.http-client:google-http-client-jackson2:1.29.1
+com.google.http-client:google-http-client-appengine:1.29.2
+com.google.http-client:google-http-client-jackson2:1.29.2
 com.google.http-client:google-http-client-jackson:1.20.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.29.1
+com.google.http-client:google-http-client:1.29.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.1
@@ -101,7 +101,7 @@ 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.29.0
-com.google.oauth-client:google-oauth-client:1.29.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

diff --git a/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -13,7 +13,7 @@ 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.29.0
-com.google.api-client:google-api-client:1.29.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
@@ -84,11 +84,11 @@ 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-appengine:1.29.1
-com.google.http-client:google-http-client-jackson2:1.29.1
+com.google.http-client:google-http-client-appengine:1.29.2
+com.google.http-client:google-http-client-jackson2:1.29.2
 com.google.http-client:google-http-client-jackson:1.20.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.29.1
+com.google.http-client:google-http-client:1.29.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.1
@@ -100,7 +100,7 @@ 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.29.0
-com.google.oauth-client:google-oauth-client:1.29.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

diff --git a/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -13,7 +13,7 @@ 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.29.0
-com.google.api-client:google-api-client:1.29.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
@@ -85,11 +85,11 @@ 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-appengine:1.29.1
-com.google.http-client:google-http-client-jackson2:1.29.1
+com.google.http-client:google-http-client-appengine:1.29.2
+com.google.http-client:google-http-client-jackson2:1.29.2
 com.google.http-client:google-http-client-jackson:1.20.0
 com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.29.1
+com.google.http-client:google-http-client:1.29.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.1
@@ -101,7 +101,7 @@ 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.29.0
-com.google.oauth-client:google-oauth-client:1.29.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

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -2,11 +2,11 @@ ext {
     dependencyList = [
       'args4j:args4j:2.0.26',
       'com.beust:jcommander:1.48',
-      'com.google.api-client:google-api-client:1.28.0',
-      'com.google.api-client:google-api-client-appengine:1.28.0',
+      'com.google.api-client:google-api-client:1.29.2',
+      'com.google.api-client:google-api-client-appengine:1.29.2',
       'com.google.api-client:google-api-client-jackson2:1.20.0',
       'com.google.api-client:google-api-client-java6:1.27.0',
-      'com.google.api-client:google-api-client-servlet:1.22.0',
+      'com.google.api-client:google-api-client-servlet:1.29.2',
       'com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0',
       'com.google.apis:google-api-services-appengine:v1-rev101-1.25.0',
       'com.google.apis:google-api-services-bigquery:v2-rev325-1.22.0',
@@ -56,18 +56,18 @@ ext {
       'com.google.guava:guava:27.1-jre',
       'com.google.guava:guava-testlib:25.0-jre',
       'com.google.gwt:gwt-user:2.8.2',
-      'com.google.http-client:google-http-client:1.28.0',
-      'com.google.http-client:google-http-client-appengine:1.22.0',
-      'com.google.http-client:google-http-client-jackson2:1.25.0',
+      'com.google.http-client:google-http-client:1.29.2',
+      'com.google.http-client:google-http-client-appengine:1.29.2',
+      'com.google.http-client:google-http-client-jackson2:1.29.2',
       'com.google.javascript:closure-compiler:v20190301',
       '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:1.25.0',
-      'com.google.oauth-client:google-oauth-client-appengine:1.22.0',
+      'com.google.oauth-client:google-oauth-client:1.29.2',
+      'com.google.oauth-client:google-oauth-client-appengine:1.29.2',
       'com.google.oauth-client:google-oauth-client-java6:1.27.0',
       'com.google.oauth-client:google-oauth-client-jetty:1.28.0',
-      'com.google.oauth-client:google-oauth-client-servlet:1.22.0',
+      'com.google.oauth-client:google-oauth-client-servlet:1.29.2',
       'com.google.protobuf:protobuf-java:2.6.0',
       'com.google.re2j:re2j:1.1',
       'com.google.template:soy:2018-03-14',
@@ -158,3 +158,4 @@ ext {
       [key, it]
     }
 }
+
diff --git a/gradle/gradle/dependency-locks/buildscript-classpath.lockfile b/gradle/gradle/dependency-locks/buildscript-classpath.lockfile
@@ -3,6 +3,8 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 cglib:cglib-nodep:3.2.2
+com.github.jengelman.gradle.plugins:shadow:5.0.0
+com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:5.0.0
 com.google.cloud.tools:appengine-gradle-plugin:1.3.3
 com.google.cloud.tools:appengine-plugins-core:0.3.2
 com.google.code.gson:gson:2.7
@@ -16,7 +18,7 @@ com.netflix.nebula:gradle-lint-plugin:10.4.2
 com.netflix.nebula:nebula-gradle-interop:1.0.7
 com.netflix.nebula:nebula-test:7.2.5
 commons-codec:commons-codec:1.9
-commons-io:commons-io:2.5
+commons-io:commons-io:2.6
 commons-lang:commons-lang:2.6
 commons-logging:commons-logging:1.2
 junit:junit:4.12
@@ -28,11 +30,13 @@ net.ltgt.gradle:gradle-apt-plugin:0.19
 net.ltgt.gradle:gradle-errorprone-plugin:0.6.1
 org.apache.ant:ant-antlr:1.8.4
 org.apache.ant:ant-junit:1.8.4
-org.apache.ant:ant-launcher:1.8.4
-org.apache.ant:ant:1.8.4
+org.apache.ant:ant-launcher:1.9.7
+org.apache.ant:ant:1.9.7
 org.apache.commons:commons-lang3:3.8.1
 org.apache.httpcomponents:httpclient:4.5.2
 org.apache.httpcomponents:httpcore:4.4.4
+org.apache.logging.log4j:log4j-api:2.11.0
+org.apache.logging.log4j:log4j-core:2.11.0
 org.apache.maven:maven-artifact:3.6.1
 org.apache.maven:maven-builder-support:3.6.1
 org.apache.maven:maven-model-builder:3.6.1
@@ -53,15 +57,16 @@ org.eclipse.jdt:core:3.1.1
 org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
 org.gmetrics:GMetrics:0.7
 org.hamcrest:hamcrest-core:1.3
+org.jdom:jdom2:2.0.6
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11
 org.jetbrains.kotlin:kotlin-stdlib:1.3.11
 org.jetbrains:annotations:13.0
 org.multiverse:multiverse-core:0.7.0
 org.objenesis:objenesis:2.4
-org.ow2.asm:asm-analysis:4.0
-org.ow2.asm:asm-commons:4.0
-org.ow2.asm:asm-tree:4.0
+org.ow2.asm:asm-analysis:7.0-beta
+org.ow2.asm:asm-commons:7.0-beta
+org.ow2.asm:asm-tree:7.0-beta
 org.ow2.asm:asm-util:4.0
 org.ow2.asm:asm:7.0
 org.slf4j:slf4j-api:1.7.2
@@ -70,4 +75,5 @@ org.sonatype.aether:aether-impl:1.13.1
 org.sonatype.aether:aether-spi:1.13.1
 org.sonatype.aether:aether-util:1.13.1
 org.spockframework:spock-core:1.1-groovy-2.4-rc-4
+org.vafer:jdependency:2.1.1
 org.yaml:snakeyaml:1.17
diff --git a/gradle/gradlew b/gradle/gradlew