From 2938cec9c6367bc44157476bc0dd269d56dcc5a6 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 19:45:02 +0000
Subject: [PATCH 1/7] chore: add kokoro config to run nightly integration test
on java11.0.14 (#1347) (#60)
---
.github/.OwlBot.lock.yaml | 2 +-
.kokoro/nightly/java11-integration.cfg | 37 ++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 .kokoro/nightly/java11-integration.cfg
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index be3b9bde..8807efca 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:7062473f423f339256346ddbee3d81fb1de6b784fabc2a4d959d7df2c720e375
+ digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846
diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg
new file mode 100644
index 00000000..58049cc3
--- /dev/null
+++ b/.kokoro/nightly/java11-integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+ key: "TRAMPOLINE_IMAGE"
+ value: "gcr.io/cloud-devrel-public-resources/java11014"
+}
+
+env_vars: {
+ key: "JOB_TYPE"
+ value: "integration"
+}
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+ key: "GCLOUD_PROJECT"
+ value: "gcloud-devel"
+}
+
+env_vars: {
+ key: "GOOGLE_CLOUD_PROJECT"
+ value: "gcloud-devel"
+}
+
+env_vars: {
+ key: "ENABLE_FLAKYBOT"
+ value: "true"
+}
+
+env_vars: {
+ key: "GOOGLE_APPLICATION_CREDENTIALS"
+ value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+ key: "SECRET_MANAGER_KEYS"
+ value: "java-it-service-account"
+}
From ff4db4b06a088557201ce15fa5b3164d56f9a8d9 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 21:02:55 +0000
Subject: [PATCH 2/7] chore(main): release 0.1.5-alpha-SNAPSHOT (#61)
:robot: I have created a release *beep* *boop*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
pom.xml | 2 +-
samples/snapshot/pom.xml | 2 +-
versions.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index f8728a65..c0d48946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
google-cloud-logging-servlet-initializer
- 0.1.4-alpha
+ 0.1.5-alpha-SNAPSHOT
jar
Google Cloud Logging Servlet Container Initializer
https://github.com/googleapis/java-logging-servlet-initializer
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 152fe06d..ecc0d62e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-logging-servlet-initializer
- 0.1.4-alpha
+ 0.1.5-alpha-SNAPSHOT
diff --git a/versions.txt b/versions.txt
index 4ecda656..b93aa105 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-logging-servlet-initializer:0.1.4-alpha:0.1.4-alpha
+google-cloud-logging-servlet-initializer:0.1.4-alpha:0.1.5-alpha-SNAPSHOT
From 820b49bc276f998f74f7a5ce08158b488779243e Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 00:57:13 +0000
Subject: [PATCH 3/7] chore: update auto-release script to fix breaking changes
in v5 (#1350) (#68)
Source-Link: https://github.com/googleapis/synthtool/commit/53a58c23eb4decb3a17fab07388d42799e158b5f
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
---
.github/.OwlBot.lock.yaml | 2 +-
.github/workflows/approve-readme.yaml | 15 +++++++++++++++
.github/workflows/auto-release.yaml | 27 +++++++++++++++++++++------
.github/workflows/ci.yaml | 15 +++++++++++++++
.github/workflows/samples.yaml | 15 +++++++++++++++
.kokoro/build.bat | 15 +++++++++++++++
6 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 8807efca..9786771c 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846
+ digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index c5132427..1bb18232 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
pull_request:
name: auto-merge-readme
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 59c7cadd..18e23230 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
pull_request:
name: auto-release
@@ -16,13 +31,13 @@ jobs:
return;
}
- // only approve PRs like "chore: release "
- if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+ // only approve PRs like "chore(main): release "
+ if ( !context.payload.pull_request.title.startsWith("chore(main): release") ) {
return;
}
// only approve PRs with pom.xml and versions.txt changes
- const filesPromise = github.pulls.listFiles.endpoint({
+ const filesPromise = github.rest.pulls.listFiles.endpoint({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
@@ -54,7 +69,7 @@ jobs:
return;
}
- const promise = github.pulls.list.endpoint({
+ const promise = github.rest.pulls.list.endpoint({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open'
@@ -71,7 +86,7 @@ jobs:
}
// approve release PR
- await github.pulls.createReview({
+ await github.rest.pulls.createReview({
owner: context.repo.owner,
repo: context.repo.repo,
body: 'Rubber stamped release!',
@@ -80,7 +95,7 @@ jobs:
});
// attach kokoro:force-run and automerge labels
- await github.issues.addLabels({
+ await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 05de1f60..6b5e56aa 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
push:
branches:
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index c46230a7..d5d964df 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
pull_request:
name: samples
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
index 05826ad9..cc602c9e 100644
--- a/.kokoro/build.bat
+++ b/.kokoro/build.bat
@@ -1,3 +1,18 @@
:: See documentation in type-shell-output.bat
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
From 6f6318ba446d1152022668fb703d7cdfec6acddd Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 8 Feb 2022 20:37:57 +0100
Subject: [PATCH 4/7] build(deps): update dependency
com.google.cloud:google-cloud-shared-config to v1.2.7 (#69)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c0d48946..25ba2a49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
com.google.cloud
google-cloud-shared-config
- 1.2.6
+ 1.2.7
From b46f1d67a6fbf2d2035a435b207b10981246cea3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 8 Feb 2022 20:38:29 +0100
Subject: [PATCH 5/7] deps: update dependency
com.google.cloud:google-cloud-logging to v3.6.2 (#63)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 25ba2a49..7aa72ee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
3.6
- 3.6.1
+ 3.6.2
4.0.4
9.4.44.v20210927
9.0.58
From 410bfa539b8fb62c83c9b70f5b00cd4c77c66767 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 8 Feb 2022 20:40:23 +0100
Subject: [PATCH 6/7] build(deps): update dependency
org.apache.maven.plugins:maven-project-info-reports-plugin to v3.2.1 (#64)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7aa72ee2..bdc4dd14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.1.2
+ 3.2.1
From 1594b468e2e2b0e3171ba75583ae26167235a1d9 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 19:52:40 +0000
Subject: [PATCH 7/7] chore(main): release 0.1.5-alpha (#71)
:robot: I have created a release *beep* *boop*
---
### [0.1.5-alpha](https://github.com/googleapis/java-logging-servlet-initializer/compare/v0.1.4-alpha...v0.1.5-alpha) (2022-02-08)
### Dependencies
* update dependency com.google.cloud:google-cloud-logging to v3.6.2 ([#63](https://github.com/googleapis/java-logging-servlet-initializer/issues/63)) ([b46f1d6](https://github.com/googleapis/java-logging-servlet-initializer/commit/b46f1d67a6fbf2d2035a435b207b10981246cea3))
---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
CHANGELOG.md | 7 +++++++
pom.xml | 2 +-
samples/snapshot/pom.xml | 2 +-
versions.txt | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd1db997..2c4d42f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+### [0.1.5-alpha](https://github.com/googleapis/java-logging-servlet-initializer/compare/v0.1.4-alpha...v0.1.5-alpha) (2022-02-08)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-logging to v3.6.2 ([#63](https://github.com/googleapis/java-logging-servlet-initializer/issues/63)) ([b46f1d6](https://github.com/googleapis/java-logging-servlet-initializer/commit/b46f1d67a6fbf2d2035a435b207b10981246cea3))
+
### [0.1.4-alpha](https://github.com/googleapis/java-logging-servlet-initializer/compare/v0.1.2...v0.1.4-alpha) (2022-02-03)
diff --git a/pom.xml b/pom.xml
index bdc4dd14..c4af7735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
google-cloud-logging-servlet-initializer
- 0.1.5-alpha-SNAPSHOT
+ 0.1.5-alpha
jar
Google Cloud Logging Servlet Container Initializer
https://github.com/googleapis/java-logging-servlet-initializer
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ecc0d62e..e86a5ba2 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-logging-servlet-initializer
- 0.1.5-alpha-SNAPSHOT
+ 0.1.5-alpha
diff --git a/versions.txt b/versions.txt
index b93aa105..27ee07bb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-logging-servlet-initializer:0.1.4-alpha:0.1.5-alpha-SNAPSHOT
+google-cloud-logging-servlet-initializer:0.1.5-alpha:0.1.5-alpha