chore: use java helper for templates (#195)

b0ffd0b
commit b0ffd0b
Author: Jeff Ching <chingor@google.com>
Date:   Wed Mar 18 17:04:08 2020 -0700

    chore: use java helper for templates (#195)

    We are cleaning up usage of common templates in synthtool. This allows us the cleanup usage in a centralized place rather than in 60+ repos

.kokoro/build.sh

@@ -20,22 +20,17 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 ## cd to the parent directory, i.e. the root of the git repo
 cd ${scriptDir}/..
 
-# include common functions
-source ${scriptDir}/common.sh
-
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-# attempt to install 3 times with exponential backoff (starting with 10 seconds)
-retry_with_backoff 3 10 \
-  mvn install -B -V \
-    -DskipTests=true \
-    -Dclirr.skip=true \
-    -Denforcer.skip=true \
-    -Dmaven.javadoc.skip=true \
-    -Dgcloud.download.skip=true \
-    -T 1C
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true \
+  -Denforcer.skip=true \
+  -Dmaven.javadoc.skip=true \
+  -Dgcloud.download.skip=true \
+  -T 1C
 
 # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
 if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then

.kokoro/dependencies.sh

@@ -15,13 +15,7 @@
 
 set -eo pipefail
 
-## Get the directory of the build script
-scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-## cd to the parent directory, i.e. the root of the git repo
-cd ${scriptDir}/..
-
-# include common functions
-source ${scriptDir}/common.sh
+cd github/java-storage/
 
 # Print out Java
 java -version
@@ -30,9 +24,8 @@ echo $JOB_TYPE
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
-retry_with_backoff 3 10 \
-  mvn install -B -V \
-    -DskipTests=true \
-    -Dclirr.skip=true
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true

.kokoro/linkage-monitor.sh

@@ -17,26 +17,18 @@ set -eo pipefail
 # Display commands being run.
 set -x
 
-## Get the directory of the build script
-scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-## cd to the parent directory, i.e. the root of the git repo
-cd ${scriptDir}/..
-
-# include common functions
-source ${scriptDir}/common.sh
+cd github/java-storage/
 
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-# attempt to install 3 times with exponential backoff (starting with 10 seconds)
-retry_with_backoff 3 10 \
-  mvn install -B -V \
-    -DskipTests=true \
-    -Dclirr.skip=true \
-    -Denforcer.skip=true \
-    -Dmaven.javadoc.skip=true \
-    -Dgcloud.download.skip=true
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true \
+  -Denforcer.skip=true \
+  -Dmaven.javadoc.skip=true \
+  -Dgcloud.download.skip=true
 
 # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
 JAR=linkage-monitor-latest-all-deps.jar

renovate.json

@@ -56,9 +56,7 @@
     },
     {
       "packagePatterns": [
-        "^com.google.cloud:google-cloud-storage",
-        "^com.google.cloud:libraries-bom",
-        "^com.google.cloud.samples:shared-configuration"
+        "^com.google.cloud:libraries-bom"
       ],
       "semanticCommitType": "chore",
       "semanticCommitScope": "deps"
@@ -77,4 +75,4 @@
     }
   ],
   "semanticCommits": true
-}
+}

synth.metadata

@@ -1,11 +1,11 @@
 {
-  "updateTime": "2020-03-30T22:54:26.936389Z",
+  "updateTime": "2020-03-17T18:53:43.239577Z",
   "sources": [
     {
-      "git": {
-        "name": "synthtool",
-        "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "a003d8655d3ebec2bbbd5fc3898e91e152265c67"
+      "template": {
+        "name": "java_library",
+        "origin": "synthtool.gcp",
+        "version": "2020.2.4"
       }
     }
   ]

synth.py

@@ -14,12 +14,9 @@
 
 """This script is used to synthesize generated parts of this library."""
 
-import synthtool as s
-import synthtool.gcp as gcp
+import synthtool.languages.java
 
-common_templates = gcp.CommonTemplates()
-templates = common_templates.java_library()
-s.copy(templates, excludes=[
+java.common_templates(excludes=[
   'README.md',
   '.kokoro/presubmit/integration.cfg'
 ])