Merge branch 'master' into gb/upgradeJCommander

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>

appengine_war.gradle

@@ -21,14 +21,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"
     }
 }
 

release/cloudbuild-nomulus.yaml

@@ -16,11 +16,6 @@
 # To trigger a build automatically, follow the instructions below and add a trigger:
 # https://cloud.google.com/cloud-build/docs/running-builds/automate-builds
 steps:
-# Set permissions correctly. Not sure why it is necessary, but it is.
-- name: 'gcr.io/${PROJECT_ID}/builder:latest'
-  args: ['chown', '-R', 'root:root', '.']
-- name: 'gcr.io/${PROJECT_ID}/builder:latest'
-  args: ['chmod', '-R', '777', '.']
 # Create a directory to store the artifacts
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args: ['mkdir', 'nomulus']

release/cloudbuild-proxy.yaml

@@ -14,10 +14,6 @@
 # https://cloud.google.com/cloud-build/docs/running-builds/automate-builds
 steps:
 # Set permissions correctly. Not sure why it is necessary, but it is.
-- name: 'gcr.io/${PROJECT_ID}/builder:latest'
-  args: ['chown', '-R', 'root:root', '.']
-- name: 'gcr.io/${PROJECT_ID}/builder:latest'
-  args: ['chmod', '-R', '777', '.']
 # Build the deploy jar.
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args:
@@ -59,7 +55,7 @@ artifacts:
     location: 'gs://${PROJECT_ID}-deploy/${TAG_NAME}'
     # This cannot be regexs because of how Spinnaker constructs artifact paths.
     paths:
-    - 'java/google/registry/proxy/kubernetes/proxy-*.yaml'
+    - 'proxy/src/main/java/google/registry/proxy/kubernetes/proxy-*.yaml'
     - 'release/cloudbuild-tag.yaml'
 timeout: 3600s
 options:

release/cloudbuild-release.yaml

@@ -67,7 +67,7 @@ steps:
     sed -i s%distroless/java%${PROJECT_ID}/base@$base_digest% proxy/Dockerfile
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-proxy.yaml
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-nomulus.yaml
-    sed -i s/GCP_PROJECT/${PROJECT_ID}/ java/google/registry/proxy/kubernetes/proxy-*.yaml
+    sed -i s/GCP_PROJECT/${PROJECT_ID}/ proxy/src/main/java/google/registry/proxy/kubernetes/proxy-*.yaml
     sed -i s/'$${TAG_NAME}'/${TAG_NAME}/g release/cloudbuild-sync.yaml
 # Upload the gradle binary to GCS if it does not exist and point URL in gradle wrapper to it.
 - name: 'gcr.io/cloud-builders/gsutil'