diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 2a73d591..7ff0b763 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-containeranalysis.git",
- "sha": "009a547af1317cd9c098042caeb95122c6c068ba"
+ "sha": "e77d37a05b68b7dd3d886ad8eb1401fc9cce5627"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "1f5e6bc8dc8e3661ee550905fc070e55e1b6cea1"
+ "sha": "6e8322421485d0937cb4758db812d8fbca0bbedd"
}
}
]
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 518766d3..771016d6 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/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 0fb8c843..59d2aafc 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/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
index 098168a7..1f55b770 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 16126d2e..8a103384 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/CHANGELOG.md b/CHANGELOG.md
index 2d17bf9f..e81debbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+### [1.2.20](https://www.github.com/googleapis/java-containeranalysis/compare/v1.2.19...v1.2.20) (2021-04-23)
+
+
+### Bug Fixes
+
+* release scripts from issuing overlapping phases ([#528](https://www.github.com/googleapis/java-containeranalysis/issues/528)) ([bbb4403](https://www.github.com/googleapis/java-containeranalysis/commit/bbb4403ceaf2e2976277cd0b4904f422613c9ac0))
+* typo ([#525](https://www.github.com/googleapis/java-containeranalysis/issues/525)) ([6156397](https://www.github.com/googleapis/java-containeranalysis/commit/6156397cefe5a88473b05ea48a9102c2a39b8214))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#531](https://www.github.com/googleapis/java-containeranalysis/issues/531)) ([231fac9](https://www.github.com/googleapis/java-containeranalysis/commit/231fac96e57a443fcb68ac48a63cda800f130df7))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#535](https://www.github.com/googleapis/java-containeranalysis/issues/535)) ([7185565](https://www.github.com/googleapis/java-containeranalysis/commit/71855653010b1a705e8ae17736d8ad020337306a))
+
### [1.2.19](https://www.github.com/googleapis/java-containeranalysis/compare/v1.2.18...v1.2.19) (2021-04-10)
diff --git a/README.md b/README.md
index 7e1ba986..d0f93379 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,6 @@ Java idiomatic client for [Cloud Container Analysis][product-docs].
- [Product Documentation][product-docs]
- [Client Library Documentation][javadocs]
-
-
-
## Quickstart
If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
@@ -20,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
com.google.cloud
libraries-bom
- 19.2.1
+ 20.1.0
pom
import
@@ -41,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies:
com.google.cloud
google-cloud-containeranalysis
- 1.2.34
+ 1.2.36
```
If you are using Gradle 5.x or later, add this to your dependencies
```Groovy
-implementation platform('com.google.cloud:libraries-bom:19.2.1')
+implementation platform('com.google.cloud:libraries-bom:20.1.0')
compile 'com.google.cloud:google-cloud-containeranalysis'
```
If you are using Gradle without BOM, add this to your dependencies
```Groovy
-compile 'com.google.cloud:google-cloud-containeranalysis:1.2.34'
+compile 'com.google.cloud:google-cloud-containeranalysis:1.2.36'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.2.34"
+libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.2.36"
```
## Authentication
diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml
index a271a56d..e125bd02 100644
--- a/google-cloud-containeranalysis-bom/pom.xml
+++ b/google-cloud-containeranalysis-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-containeranalysis-bom
- 1.2.36
+ 1.2.37
pom
com.google.cloud
google-cloud-shared-config
- 0.11.0
+ 0.11.2
Google Cloud Container Analysis BOM
@@ -64,27 +64,27 @@
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 1.2.36
+ 1.2.37
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.88.36
+ 0.88.37
com.google.cloud
google-cloud-containeranalysis
- 1.2.36
+ 1.2.37
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 1.2.36
+ 1.2.37
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.88.36
+ 0.88.37
diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml
index f33325ef..0331ac1b 100644
--- a/google-cloud-containeranalysis/pom.xml
+++ b/google-cloud-containeranalysis/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-containeranalysis
- 1.2.36
+ 1.2.37
jar
Google Cloud Container Analysis
https://github.com/googleapis/java-containeranalysis
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-containeranalysis-parent
- 1.2.36
+ 1.2.37
google-cloud-containeranalysis
diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml
index 6d776745..b7ab0a3e 100644
--- a/grpc-google-cloud-containeranalysis-v1/pom.xml
+++ b/grpc-google-cloud-containeranalysis-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 1.2.36
+ 1.2.37
grpc-google-cloud-containeranalysis-v1
GRPC library for grpc-google-cloud-containeranalysis-v1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.2.36
+ 1.2.37
diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
index bb80b08a..17554e69 100644
--- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
+++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.88.36
+ 0.88.37
grpc-google-cloud-containeranalysis-v1beta1
GRPC library for grpc-google-cloud-containeranalysis-v1beta1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.2.36
+ 1.2.37
diff --git a/pom.xml b/pom.xml
index aaa42bce..cb160856 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-containeranalysis-parent
pom
- 1.2.36
+ 1.2.37
Google Cloud Container Analysis Parent
https://github.com/googleapis/java-containeranalysis
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 0.11.0
+ 0.11.2
@@ -70,33 +70,33 @@
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 1.2.36
+ 1.2.37
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.88.36
+ 0.88.37
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.88.36
+ 0.88.37
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 1.2.36
+ 1.2.37
com.google.cloud
google-cloud-containeranalysis
- 1.2.36
+ 1.2.37
com.google.cloud
google-cloud-shared-dependencies
- 0.21.0
+ 1.0.0
pom
import
diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml
index 58116450..653abd07 100644
--- a/proto-google-cloud-containeranalysis-v1/pom.xml
+++ b/proto-google-cloud-containeranalysis-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 1.2.36
+ 1.2.37
proto-google-cloud-containeranalysis-v1
PROTO library for proto-google-cloud-containeranalysis-v1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.2.36
+ 1.2.37
diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml
index 943792e7..c29a058b 100644
--- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml
+++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.88.36
+ 0.88.37
proto-google-cloud-containeranalysis-v1beta1
PROTO library for proto-google-cloud-containeranalysis-v1beta1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.2.36
+ 1.2.37
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index aefa71b8..9ded0b00 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-containeranalysis
- 1.2.34
+ 1.2.36
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f0a9fdf8..4550efce 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-containeranalysis
- 1.2.34
+ 1.2.36
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c529dca7..09eff1c0 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 19.2.1
+ 20.1.0
pom
import
diff --git a/synth.metadata b/synth.metadata
index b013b341..bd16ee52 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-containeranalysis.git",
- "sha": "c1b5299da95b12c1a1ca34412eb7154284e4ae06"
+ "sha": "af93de1efd9093196c593dc8f4d55093a7760f10"
}
},
{
@@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"
+ "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d"
}
}
],
@@ -45,6 +45,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",
diff --git a/versions.txt b/versions.txt
index f34b4464..798655f0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-containeranalysis-v1:1.2.36:1.2.36
-proto-google-cloud-containeranalysis-v1beta1:0.88.36:0.88.36
-grpc-google-cloud-containeranalysis-v1beta1:0.88.36:0.88.36
-grpc-google-cloud-containeranalysis-v1:1.2.36:1.2.36
-google-cloud-containeranalysis:1.2.36:1.2.36
+proto-google-cloud-containeranalysis-v1:1.2.37:1.2.37
+proto-google-cloud-containeranalysis-v1beta1:0.88.37:0.88.37
+grpc-google-cloud-containeranalysis-v1beta1:0.88.37:0.88.37
+grpc-google-cloud-containeranalysis-v1:1.2.37:1.2.37
+google-cloud-containeranalysis:1.2.37:1.2.37