diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 74c19915b..fb8a44691 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-logging.git",
- "sha": "d3bd6440e378d645a8ae5ccef6a89cc772c21edc"
+ "sha": "f88cdc7bf7783906579ce9fda4983d0f6e22ef96"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "c3e41da0fa256ad7f6b4bc76b9d069dedecdfef4"
+ "sha": "9763f20e4b7bb1091082462b2f7970e965d0d414"
}
}
]
diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
index 5cf7ba49e..46edbf7f2 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 59d2aafc7..9030ba8f9 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 64bf64116..2813784ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
# Changelog
+### [2.3.2](https://www.github.com/googleapis/java-logging/compare/v2.3.1...v2.3.2) (2021-07-01)
+
+
+### Bug Fixes
+
+* Add `shopt -s nullglob` to dependencies script ([#564](https://www.github.com/googleapis/java-logging/issues/564)) ([5a5f737](https://www.github.com/googleapis/java-logging/commit/5a5f7371569f3e5656a3e40fcc2d72b7a8e0e916))
+* Update dependencies.sh to not break on mac ([#559](https://www.github.com/googleapis/java-logging/issues/559)) ([5877a06](https://www.github.com/googleapis/java-logging/commit/5877a068ae466b0e61d240674263ddb772b43cb2))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#568](https://www.github.com/googleapis/java-logging/issues/568)) ([623a85b](https://www.github.com/googleapis/java-logging/commit/623a85b0ca9ab893b925522fe38f1b03ab822d7e))
+
### [2.3.1](https://www.github.com/googleapis/java-logging/compare/v2.3.0...v2.3.1) (2021-06-04)
diff --git a/README.md b/README.md
index a9aef138d..32b628ccd 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.5.0
+ 20.7.0
pom
import
@@ -39,25 +39,25 @@ If you are using Maven without BOM, add this to your dependencies:
com.google.cloud
google-cloud-logging
- 2.3.0
+ 2.3.1
```
If you are using Gradle 5.x or later, add this to your dependencies
```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.5.0')
+implementation platform('com.google.cloud:libraries-bom:20.7.0')
compile 'com.google.cloud:google-cloud-logging'
```
If you are using Gradle without BOM, add this to your dependencies
```Groovy
-compile 'com.google.cloud:google-cloud-logging:2.3.0'
+compile 'com.google.cloud:google-cloud-logging:2.3.1'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "2.3.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "2.3.1"
```
## Authentication
diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml
index c9fe32ab3..a41cbbbff 100644
--- a/google-cloud-logging-bom/pom.xml
+++ b/google-cloud-logging-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-logging-bom
- 2.3.1
+ 2.3.2
pom
com.google.cloud
@@ -64,17 +64,17 @@
com.google.api.grpc
proto-google-cloud-logging-v2
- 0.88.1
+ 0.88.2
com.google.api.grpc
grpc-google-cloud-logging-v2
- 0.88.1
+ 0.88.2
com.google.cloud
google-cloud-logging
- 2.3.1
+ 2.3.2
diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml
index 4faf081bc..90baf257d 100644
--- a/google-cloud-logging/pom.xml
+++ b/google-cloud-logging/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-logging
- 2.3.1
+ 2.3.2
jar
Google Cloud Logging
https://github.com/googleapis/java-logging
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-logging-parent
- 2.3.1
+ 2.3.2
google-cloud-logging
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
index bfeba9f0a..7c30359c1 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
@@ -514,6 +514,11 @@ public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
+ /** Returns the default mTLS service endpoint. */
+ public static String getDefaultMtlsEndpoint() {
+ return "logging.mtls.googleapis.com:443";
+ }
+
/** Returns the default service scopes. */
public static List getDefaultServiceScopes() {
return DEFAULT_SERVICE_SCOPES;
@@ -792,6 +797,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-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
index d1fa3db87..bd2e07a52 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
@@ -444,6 +444,11 @@ public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
+ /** Returns the default mTLS service endpoint. */
+ public static String getDefaultMtlsEndpoint() {
+ return "logging.mtls.googleapis.com:443";
+ }
+
/** Returns the default service scopes. */
public static List getDefaultServiceScopes() {
return DEFAULT_SERVICE_SCOPES;
@@ -626,6 +631,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-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
index 3fd951caa..634af2b28 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
@@ -212,6 +212,11 @@ public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
+ /** Returns the default mTLS service endpoint. */
+ public static String getDefaultMtlsEndpoint() {
+ return "logging.mtls.googleapis.com:443";
+ }
+
/** Returns the default service scopes. */
public static List getDefaultServiceScopes() {
return DEFAULT_SERVICE_SCOPES;
@@ -371,6 +376,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-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java
index eae56d2c3..d64a22ea0 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java
@@ -97,8 +97,8 @@
public class ConfigClientTest {
private static MockConfigServiceV2 mockConfigServiceV2;
private static MockServiceHelper mockServiceHelper;
- private ConfigClient client;
private LocalChannelProvider channelProvider;
+ private ConfigClient client;
@BeforeClass
public static void startStaticServer() {
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java
index d6bc3e6fa..34c69dc87 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java
@@ -75,8 +75,8 @@
public class LoggingClientTest {
private static MockLoggingServiceV2 mockLoggingServiceV2;
private static MockServiceHelper mockServiceHelper;
- private LoggingClient client;
private LocalChannelProvider channelProvider;
+ private LoggingClient client;
@BeforeClass
public static void startStaticServer() {
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java
index d6bc8e11f..a81e0368a 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java
@@ -58,8 +58,8 @@
public class MetricsClientTest {
private static MockMetricsServiceV2 mockMetricsServiceV2;
private static MockServiceHelper mockServiceHelper;
- private MetricsClient client;
private LocalChannelProvider channelProvider;
+ private MetricsClient client;
@BeforeClass
public static void startStaticServer() {
diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml
index 9ad97680f..b29789227 100644
--- a/grpc-google-cloud-logging-v2/pom.xml
+++ b/grpc-google-cloud-logging-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-logging-v2
- 0.88.1
+ 0.88.2
grpc-google-cloud-logging-v2
GRPC library for grpc-google-cloud-logging-v2
com.google.cloud
google-cloud-logging-parent
- 2.3.1
+ 2.3.2
diff --git a/pom.xml b/pom.xml
index 2cf264003..69e58a46b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-logging-parent
pom
- 2.3.1
+ 2.3.2
Google Cloud Logging Parent
https://github.com/googleapis/java-logging
@@ -70,23 +70,23 @@
com.google.api.grpc
proto-google-cloud-logging-v2
- 0.88.1
+ 0.88.2
com.google.api.grpc
grpc-google-cloud-logging-v2
- 0.88.1
+ 0.88.2
com.google.cloud
google-cloud-logging
- 2.3.1
+ 2.3.2
com.google.cloud
google-cloud-shared-dependencies
- 1.3.0
+ 1.4.0
pom
import
diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml
index b218c48e8..f16dfdf0b 100644
--- a/proto-google-cloud-logging-v2/pom.xml
+++ b/proto-google-cloud-logging-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-logging-v2
- 0.88.1
+ 0.88.2
proto-google-cloud-logging-v2
PROTO library for proto-google-cloud-logging-v2
com.google.cloud
google-cloud-logging-parent
- 2.3.1
+ 2.3.2
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java
index 0201fe976..d2b9e2c05 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java
@@ -184,8 +184,8 @@ public Builder setLocation(String location) {
}
private Builder(BillingAccountLocationName billingAccountLocationName) {
- billingAccount = billingAccountLocationName.billingAccount;
- location = billingAccountLocationName.location;
+ this.billingAccount = billingAccountLocationName.billingAccount;
+ this.location = billingAccountLocationName.location;
}
public BillingAccountLocationName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java
index 42f46677c..b6d13b3b2 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java
@@ -158,7 +158,7 @@ public Builder setBillingAccount(String billingAccount) {
}
private Builder(BillingAccountName billingAccountName) {
- billingAccount = billingAccountName.billingAccount;
+ this.billingAccount = billingAccountName.billingAccount;
}
public BillingAccountName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
index f6643d671..ec5232b4e 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
@@ -313,7 +313,7 @@ private Builder(CmekSettingsName cmekSettingsName) {
Preconditions.checkArgument(
Objects.equals(cmekSettingsName.pathTemplate, PROJECT),
"toBuilder is only supported when CmekSettingsName has the pattern of projects/{project}/cmekSettings");
- project = cmekSettingsName.project;
+ this.project = cmekSettingsName.project;
}
public CmekSettingsName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java
index c380821f0..08cca56bc 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java
@@ -181,8 +181,8 @@ public Builder setLocation(String location) {
}
private Builder(FolderLocationName folderLocationName) {
- folder = folderLocationName.folder;
- location = folderLocationName.location;
+ this.folder = folderLocationName.folder;
+ this.location = folderLocationName.location;
}
public FolderLocationName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java
index 4da442ed8..8b76cb8fc 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java
@@ -158,7 +158,7 @@ public Builder setFolder(String folder) {
}
private Builder(FolderName folderName) {
- folder = folderName.folder;
+ this.folder = folderName.folder;
}
public FolderName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java
index 18069bd08..6fce45d9d 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java
@@ -181,8 +181,8 @@ public Builder setLocation(String location) {
}
private Builder(LocationName locationName) {
- project = locationName.project;
- location = locationName.location;
+ this.project = locationName.project;
+ this.location = locationName.location;
}
public LocationName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java
index c373feeea..7dcdc6bc2 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java
@@ -415,9 +415,9 @@ private Builder(LogBucketName logBucketName) {
Preconditions.checkArgument(
Objects.equals(logBucketName.pathTemplate, PROJECT_LOCATION_BUCKET),
"toBuilder is only supported when LogBucketName has the pattern of projects/{project}/locations/{location}/buckets/{bucket}");
- project = logBucketName.project;
- location = logBucketName.location;
- bucket = logBucketName.bucket;
+ this.project = logBucketName.project;
+ this.location = logBucketName.location;
+ this.bucket = logBucketName.bucket;
}
public LogBucketName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java
index 04bf41356..71b6aca5a 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java
@@ -354,8 +354,8 @@ private Builder(LogExclusionName logExclusionName) {
Preconditions.checkArgument(
Objects.equals(logExclusionName.pathTemplate, PROJECT_EXCLUSION),
"toBuilder is only supported when LogExclusionName has the pattern of projects/{project}/exclusions/{exclusion}");
- project = logExclusionName.project;
- exclusion = logExclusionName.exclusion;
+ this.project = logExclusionName.project;
+ this.exclusion = logExclusionName.exclusion;
}
public LogExclusionName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java
index cbeb10b80..f271ecf0c 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java
@@ -180,8 +180,8 @@ public Builder setMetric(String metric) {
}
private Builder(LogMetricName logMetricName) {
- project = logMetricName.project;
- metric = logMetricName.metric;
+ this.project = logMetricName.project;
+ this.metric = logMetricName.metric;
}
public LogMetricName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java
index af30905c7..056e80cc8 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java
@@ -340,8 +340,8 @@ private Builder(LogName logName) {
Preconditions.checkArgument(
Objects.equals(logName.pathTemplate, PROJECT_LOG),
"toBuilder is only supported when LogName has the pattern of projects/{project}/logs/{log}");
- project = logName.project;
- log = logName.log;
+ this.project = logName.project;
+ this.log = logName.log;
}
public LogName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java
index efef17874..6fcfb8a2f 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java
@@ -344,8 +344,8 @@ private Builder(LogSinkName logSinkName) {
Preconditions.checkArgument(
Objects.equals(logSinkName.pathTemplate, PROJECT_SINK),
"toBuilder is only supported when LogSinkName has the pattern of projects/{project}/sinks/{sink}");
- project = logSinkName.project;
- sink = logSinkName.sink;
+ this.project = logSinkName.project;
+ this.sink = logSinkName.sink;
}
public LogSinkName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java
index 3875d5c5c..85788f744 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java
@@ -472,10 +472,10 @@ private Builder(LogViewName logViewName) {
Preconditions.checkArgument(
Objects.equals(logViewName.pathTemplate, PROJECT_LOCATION_BUCKET_VIEW),
"toBuilder is only supported when LogViewName has the pattern of projects/{project}/locations/{location}/buckets/{bucket}/views/{view}");
- project = logViewName.project;
- location = logViewName.location;
- bucket = logViewName.bucket;
- view = logViewName.view;
+ this.project = logViewName.project;
+ this.location = logViewName.location;
+ this.bucket = logViewName.bucket;
+ this.view = logViewName.view;
}
public LogViewName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java
index 6f358bef8..316fdec7e 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java
@@ -181,8 +181,8 @@ public Builder setLocation(String location) {
}
private Builder(OrganizationLocationName organizationLocationName) {
- organization = organizationLocationName.organization;
- location = organizationLocationName.location;
+ this.organization = organizationLocationName.organization;
+ this.location = organizationLocationName.location;
}
public OrganizationLocationName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java
index a4bb999c2..b04b9c43d 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java
@@ -158,7 +158,7 @@ public Builder setOrganization(String organization) {
}
private Builder(OrganizationName organizationName) {
- organization = organizationName.organization;
+ this.organization = organizationName.organization;
}
public OrganizationName build() {
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java
index 2e4f45190..4975232f6 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/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/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index dfde5990e..830c6faf8 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-logging
- 2.3.0
+ 2.3.1
diff --git a/samples/pom.xml b/samples/pom.xml
index 75d3ca836..cb47a36ec 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 19fa94284..a0b846f2d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-logging
- 2.3.1
+ 2.3.2
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 794e2170b..1e15a0443 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
@@ -29,7 +29,7 @@
com.google.cloud
libraries-bom
- 20.5.0
+ 20.7.0
pom
import
diff --git a/synth.metadata b/synth.metadata
index cd07f4fef..1a163bd85 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,22 +4,22 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-logging.git",
- "sha": "dce8fe5596a0bbd4a0c3756d35d92c898f6321ce"
+ "sha": "8933ae11ff1bb5ce5b1a0c105c26100572fe1de9"
}
},
{
"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"
}
}
],
@@ -98,6 +98,7 @@
".kokoro/trampoline.sh",
"CODE_OF_CONDUCT.md",
"LICENSE",
+ "SECURITY.md",
"codecov.yaml",
"google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java",
"google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java",
diff --git a/versions.txt b/versions.txt
index 064d510f4..8da86bd22 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-logging-v2:0.88.1:0.88.1
-grpc-google-cloud-logging-v2:0.88.1:0.88.1
-google-cloud-logging:2.3.1:2.3.1
\ No newline at end of file
+proto-google-cloud-logging-v2:0.88.2:0.88.2
+grpc-google-cloud-logging-v2:0.88.2:0.88.2
+google-cloud-logging:2.3.2:2.3.2
\ No newline at end of file