From bdd7e9cab22ffcb660fdb9a90b36339167c87b38 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 16 Apr 2021 14:49:45 -0700 Subject: [PATCH 1/4] changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. --- .kokoro/dependencies.sh | 1 - synth.metadata | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 59d2aafc7..0fb8c8436 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -33,7 +33,6 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ - -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/synth.metadata b/synth.metadata index fcfbe992e..2e5a36431 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-oauth-java-client.git", - "sha": "f6d16c6d7becbd49158e703f1c0b94ce1981e625" + "sha": "ff93258c8506ade94a356ed7e709ec256e08741c" } }, { From 90001602098bf7cfe187cd178a56dc47e412d1b3 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 16 Apr 2021 14:50:04 -0700 Subject: [PATCH 2/4] build(java): skip javadoc tests during dependencies test Source-Author: Jeff Ching Source-Date: Fri Apr 9 09:18:54 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 5b0e1592dd7d70b485e157ea4b3eb1704ecbd015 Source-Link: https://github.com/googleapis/synthtool/commit/5b0e1592dd7d70b485e157ea4b3eb1704ecbd015 --- .kokoro/dependencies.sh | 1 + synth.metadata | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0fb8c8436..59d2aafc7 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/synth.metadata b/synth.metadata index 2e5a36431..a1c12a942 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,7 +11,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098" + "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015" } } ], From 6e7ba53e51f804ced1b4f93798ecd585c36a34b0 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 16 Apr 2021 14:50:12 -0700 Subject: [PATCH 3/4] fix: typo @Neenu1995 Source-Author: Elliotte Rusty Harold Source-Date: Tue Apr 13 00:00:05 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 082e1ca0863b13ada8594fe91845380765da5b70 Source-Link: https://github.com/googleapis/synthtool/commit/082e1ca0863b13ada8594fe91845380765da5b70 --- .kokoro/build.sh | 2 +- synth.metadata | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 4522d958b..6c11faff9 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi diff --git a/synth.metadata b/synth.metadata index a1c12a942..fff1dd308 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,7 +11,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015" + "sha": "082e1ca0863b13ada8594fe91845380765da5b70" } } ], @@ -26,6 +26,7 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", From 22f68999db70b5d7154405416edad526aa23a8e5 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 16 Apr 2021 14:50:16 -0700 Subject: [PATCH 4/4] fix: release scripts from issuing overlapping phases `mvn deploy` will run `mvn install` so specifying `mvn install deploy` is redundant at best. At worst, it will cause plugins like maven-shade-plugin to be executed twice re-shading itself Source-Author: Igor Bernstein Source-Date: Wed Apr 14 13:16:03 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d Source-Link: https://github.com/googleapis/synthtool/commit/8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d --- .kokoro/release/snapshot.sh | 2 +- .kokoro/release/stage.sh | 2 +- synth.metadata | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a73..1f55b7702 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2eb..8a1033843 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/synth.metadata b/synth.metadata index fff1dd308..eef91cc0e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,7 +11,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "082e1ca0863b13ada8594fe91845380765da5b70" + "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" } } ],