diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 65be6e24..9acc70fe 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": "dd6e51f82fb6aec48d62da54670f98a80d0512db"
+ "sha": "3563c75964e55a658c3e376f8a917ce5a4064c2f"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "740366bbb9a7e0f4b77fc75dc26be1d3a376c3e0"
+ "sha": "9763f20e4b7bb1091082462b2f7970e965d0d414"
}
}
]
diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
index 5cf7ba49..46edbf7f 100755
--- a/.kokoro/coerce_logs.sh
+++ b/.kokoro/coerce_logs.sh
@@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
echo "coercing sponge logs..."
for xml in `find . -name *-sponge_log.xml`
do
- echo "processing ${xml}"
class=$(basename ${xml} | cut -d- -f2)
dir=$(dirname ${xml})/${job}/${class}
text=$(dirname ${xml})/${class}-sponge_log.txt
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 59d2aafc..9030ba8f 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -14,6 +14,7 @@
# limitations under the License.
set -eo pipefail
+shopt -s nullglob
## Get the directory of the build script
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -46,7 +47,7 @@ function completenessCheck() {
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
- mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
+ mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
@@ -70,7 +71,7 @@ function completenessCheck() {
set +e
error_count=0
-for path in $(find -name ".flattened-pom.xml")
+for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aafdfe0..5f4651f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+### [1.3.5](https://www.github.com/googleapis/java-containeranalysis/compare/v1.3.4...v1.3.5) (2021-07-02)
+
+
+### Bug Fixes
+
+* Add `shopt -s nullglob` to dependencies script ([#611](https://www.github.com/googleapis/java-containeranalysis/issues/611)) ([a256e57](https://www.github.com/googleapis/java-containeranalysis/commit/a256e5714d05ba992c96b3b83023c1fa5187379b))
+* Update dependencies.sh to not break on mac ([#607](https://www.github.com/googleapis/java-containeranalysis/issues/607)) ([217f1db](https://www.github.com/googleapis/java-containeranalysis/commit/217f1dbfa5a89ce54521f0320c4941730206552d))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#614](https://www.github.com/googleapis/java-containeranalysis/issues/614)) ([8b99477](https://www.github.com/googleapis/java-containeranalysis/commit/8b99477dd5e094eb5d1afccd2f56f600764f18eb))
+* update dependency io.grafeas:grafeas to v1.2.3 ([#615](https://www.github.com/googleapis/java-containeranalysis/issues/615)) ([64911e9](https://www.github.com/googleapis/java-containeranalysis/commit/64911e921a65a43e0b1ba8889cebd338d79b05ca))
+
### [1.3.4](https://www.github.com/googleapis/java-containeranalysis/compare/v1.3.3...v1.3.4) (2021-06-11)
diff --git a/README.md b/README.md
index 33ec0c54..164a691f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
com.google.cloud
libraries-bom
- 20.6.0
+ 20.7.0
pom
import
@@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies:
com.google.cloud
google-cloud-containeranalysis
- 1.3.3
+ 1.3.4
```
If you are using Gradle 5.x or later, add this to your dependencies
```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.6.0')
+implementation platform('com.google.cloud:libraries-bom:20.7.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.3.3'
+compile 'com.google.cloud:google-cloud-containeranalysis:1.3.4'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.3.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.3.4"
```
## Authentication
diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml
index 0978dfc0..f57df060 100644
--- a/google-cloud-containeranalysis-bom/pom.xml
+++ b/google-cloud-containeranalysis-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-containeranalysis-bom
- 1.3.4
+ 1.3.5
pom
com.google.cloud
@@ -64,27 +64,27 @@
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 1.3.4
+ 1.3.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.89.4
+ 0.89.5
com.google.cloud
google-cloud-containeranalysis
- 1.3.4
+ 1.3.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 1.3.4
+ 1.3.5
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.89.4
+ 0.89.5
diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml
index f97fe082..d5e760db 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.3.4
+ 1.3.5
jar
Google Cloud Container Analysis
https://github.com/googleapis/java-containeranalysis
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-containeranalysis-parent
- 1.3.4
+ 1.3.5
google-cloud-containeranalysis
diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java
index 08a206bf..bbc5b128 100644
--- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java
+++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java
@@ -140,6 +140,11 @@ public static String getDefaultEndpoint() {
return "containeranalysis.googleapis.com:443";
}
+ /** Returns the default mTLS service endpoint. */
+ public static String getDefaultMtlsEndpoint() {
+ return "containeranalysis.mtls.googleapis.com:443";
+ }
+
/** Returns the default service scopes. */
public static List getDefaultServiceScopes() {
return DEFAULT_SERVICE_SCOPES;
@@ -279,6 +284,8 @@ private static Builder createDefault() {
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
+ builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+ builder.setSwitchToMtlsEndpointAllowed(true);
return initDefaults(builder);
}
diff --git a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java
index 6612d369..d6e8012f 100644
--- a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java
+++ b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java
@@ -53,8 +53,8 @@
public class ContainerAnalysisClientTest {
private static MockContainerAnalysis mockContainerAnalysis;
private static MockServiceHelper mockServiceHelper;
- private ContainerAnalysisClient client;
private LocalChannelProvider channelProvider;
+ private ContainerAnalysisClient client;
@BeforeClass
public static void startStaticServer() {
diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml
index e577d538..a43864a3 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.3.4
+ 1.3.5
grpc-google-cloud-containeranalysis-v1
GRPC library for grpc-google-cloud-containeranalysis-v1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.3.4
+ 1.3.5
diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
index f8f37c98..4867c478 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.89.4
+ 0.89.5
grpc-google-cloud-containeranalysis-v1beta1
GRPC library for grpc-google-cloud-containeranalysis-v1beta1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.3.4
+ 1.3.5
diff --git a/pom.xml b/pom.xml
index c0459980..235637ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-containeranalysis-parent
pom
- 1.3.4
+ 1.3.5
Google Cloud Container Analysis Parent
https://github.com/googleapis/java-containeranalysis
@@ -70,33 +70,33 @@
com.google.api.grpc
proto-google-cloud-containeranalysis-v1
- 1.3.4
+ 1.3.5
com.google.api.grpc
proto-google-cloud-containeranalysis-v1beta1
- 0.89.4
+ 0.89.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1beta1
- 0.89.4
+ 0.89.5
com.google.api.grpc
grpc-google-cloud-containeranalysis-v1
- 1.3.4
+ 1.3.5
com.google.cloud
google-cloud-containeranalysis
- 1.3.4
+ 1.3.5
com.google.cloud
google-cloud-shared-dependencies
- 1.3.0
+ 1.4.0
pom
import
@@ -105,7 +105,7 @@
io.grafeas
grafeas
- 1.2.2
+ 1.2.3
diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml
index f5c4476a..2f6e28cd 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.3.4
+ 1.3.5
proto-google-cloud-containeranalysis-v1
PROTO library for proto-google-cloud-containeranalysis-v1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.3.4
+ 1.3.5
diff --git a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java
index fc8bfff3..69315b69 100644
--- a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java
+++ b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java
@@ -158,7 +158,7 @@ public Builder setProject(String project) {
}
private Builder(ProjectName projectName) {
- project = projectName.project;
+ this.project = projectName.project;
}
public ProjectName build() {
diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml
index 8564a9d7..d98dc98a 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.89.4
+ 0.89.5
proto-google-cloud-containeranalysis-v1beta1
PROTO library for proto-google-cloud-containeranalysis-v1beta1
com.google.cloud
google-cloud-containeranalysis-parent
- 1.3.4
+ 1.3.5
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index b0608242..2b919dd6 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.3.3
+ 1.3.4
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index bbf4d431..2eff15e2 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-containeranalysis
- 1.3.3
+ 1.3.4
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 48c048b1..0b801832 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 20.6.0
+ 20.7.0
pom
import
diff --git a/synth.metadata b/synth.metadata
index 7b64a76b..51676da8 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,22 +4,22 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-containeranalysis.git",
- "sha": "6deede3f7dec75fc5ccf0a43dd98bf91c55dd205"
+ "sha": "688200dd50ab5c4f3eba615aa4286e0af53631c0"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
- "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda",
- "internalRef": "377081269"
+ "sha": "551681f25e36b11829e87e580281350461f4f3f5",
+ "internalRef": "379784268"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
+ "sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
}
}
],
@@ -101,6 +101,7 @@
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
+ "SECURITY.md",
"codecov.yaml",
"google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient.java",
"google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisSettings.java",
diff --git a/versions.txt b/versions.txt
index b84ff6fc..39edd3aa 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-containeranalysis-v1:1.3.4:1.3.4
-proto-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.4
-grpc-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.4
-grpc-google-cloud-containeranalysis-v1:1.3.4:1.3.4
-google-cloud-containeranalysis:1.3.4:1.3.4
+proto-google-cloud-containeranalysis-v1:1.3.5:1.3.5
+proto-google-cloud-containeranalysis-v1beta1:0.89.5:0.89.5
+grpc-google-cloud-containeranalysis-v1beta1:0.89.5:0.89.5
+grpc-google-cloud-containeranalysis-v1:1.3.5:1.3.5
+google-cloud-containeranalysis:1.3.5:1.3.5