diff --git a/.github/readme/synth.py b/.github/readme/synth.py
deleted file mode 100644
index 7b48cc28..00000000
--- a/.github/readme/synth.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020 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.
-
-"""This script is used to synthesize generated the README for this library."""
-
-from synthtool.languages import java
-
-java.custom_templates(["java_library/README.md"])
diff --git a/.github/release-please.yml b/.github/release-please.yml
index 5b1fe57a..7190cc4c 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -1,6 +1,7 @@
releaseType: java-yoshi
+handleGHRelease: true
branches:
- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
- branch: java7
\ No newline at end of file
+ branch: java7
diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
new file mode 100644
index 00000000..d4ca9418
--- /dev/null
+++ b/.github/release-trigger.yml
@@ -0,0 +1 @@
+enabled: true
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 5eac3ab6..5ea1b2d5 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -31,7 +31,6 @@ branchProtectionRules:
requiredStatusCheckContexts:
- "dependencies (8)"
- "dependencies (11)"
- - "linkage-monitor"
- "lint"
- "clirr"
- "units (8)"
@@ -64,7 +63,6 @@ branchProtectionRules:
requiredStatusCheckContexts:
- "dependencies (8)"
- "dependencies (11)"
- - "linkage-monitor"
- "lint"
- "clirr"
- "units (8)"
@@ -78,4 +76,4 @@ permissionRules:
- team: yoshi-java-admins
permission: admin
- team: yoshi-java
- permission: push
\ No newline at end of file
+ permission: push
diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
index f247d5c7..a0ba1f7d 100644
--- a/.github/trusted-contribution.yml
+++ b/.github/trusted-contribution.yml
@@ -1,2 +1,3 @@
trustedContributors:
-- renovate-bot
\ No newline at end of file
+- renovate-bot
+- gcf-owl-bot[bot]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 65ae6ecd..3becb5c0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,6 +12,9 @@ jobs:
java: [8, 11]
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: ${{matrix.java}}
@@ -23,6 +26,9 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: 8
@@ -37,28 +43,21 @@ jobs:
java: [8, 11]
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
- linkage-monitor:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-java@v1
- with:
- java-version: 8
- - run: java -version
- - name: Install artifacts to local Maven repository
- run: .kokoro/build.sh
- shell: bash
- - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
- uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: 8
@@ -70,6 +69,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: 8
diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml
index d049858d..d0963125 100644
--- a/.github/workflows/downstream.yaml
+++ b/.github/workflows/downstream.yaml
@@ -19,6 +19,9 @@ jobs:
- java-pubsub
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: ${{matrix.java}}
diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
deleted file mode 100644
index c41a0ae8..00000000
--- a/.kokoro/continuous/readme.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020 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.
-
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
- key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
-}
-
-env_vars: {
- key: "TRAMPOLINE_BUILD_FILE"
- value: "github/java-shared-config/.kokoro/readme.sh"
-}
-
-# Build logs will be here
-action {
- define_artifacts {
- regex: "**/*sponge_log.xml"
- regex: "**/*sponge_log.log"
- }
-}
-
-# The github token is stored here.
-before_action {
- fetch_keystore {
- keystore_resource {
- keystore_config_id: 73713
- keyname: "yoshi-automation-github-key"
- # TODO(theacodes): remove this after secrets have globally propagated
- backend_type: FASTCONFIGPUSH
- }
- }
-}
-
-# Common env vars for all repositories and builds.
-env_vars: {
- key: "GITHUB_USER"
- value: "yoshi-automation"
-}
-env_vars: {
- key: "GITHUB_EMAIL"
- value: "yoshi-automation@google.com"
-}
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
index 6e3f6599..7f78ee41 100755
--- a/.kokoro/release/common.sh
+++ b/.kokoro/release/common.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
index 5c4551ef..742ec1a8 100755
--- a/.kokoro/release/drop.sh
+++ b/.kokoro/release/drop.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
index 1fa95fa5..3cac3d8a 100755
--- a/.kokoro/release/promote.sh
+++ b/.kokoro/release/promote.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index c9b3f549..a05ceb71 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2019 Google Inc.
+# Copyright 2019 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 0a329f70..e12f72f5 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2021 Google Inc.
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 8a103384..77dc4e8f 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
index 9da0f839..8b69b793 100644
--- a/.kokoro/trampoline.sh
+++ b/.kokoro/trampoline.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74016613..8f1d5797 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
# Changelog
+### [1.0.2](https://www.github.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2) (2021-09-13)
+
+
+### Bug Fixes
+
+* specify animal-sniffer-maven-plugin version ([#308](https://www.github.com/googleapis/java-shared-config/issues/308)) ([378bf43](https://www.github.com/googleapis/java-shared-config/commit/378bf431383306c1cdd0a4f922956c87edf321b5))
+* update java docfx doclet version ([#312](https://www.github.com/googleapis/java-shared-config/issues/312)) ([dd7f6e0](https://www.github.com/googleapis/java-shared-config/commit/dd7f6e0c1a7cc73831b74b4475457611a8c097d3))
+
+
+### Dependencies
+
+* update dependency com.puppycrawl.tools:checkstyle to v9 ([#303](https://www.github.com/googleapis/java-shared-config/issues/303)) ([71faea3](https://www.github.com/googleapis/java-shared-config/commit/71faea38d4132407598550e2bb4c77f9d4a4d83d))
+
### [1.0.1](https://www.github.com/googleapis/java-shared-config/compare/v1.0.0...v1.0.1) (2021-08-18)
diff --git a/README.md b/README.md
index 03abec17..5866b881 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent.
com.google.cloud
google-cloud-shared-config
- 1.0.1
+ 1.0.2
```
diff --git a/pom.xml b/pom.xml
index f39d39ad..50517c44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.google.cloud
google-cloud-shared-config
pom
- 1.0.1
+ 1.0.2
Google Cloud
https://github.com/googleapis/java-shared-config
@@ -413,6 +413,7 @@
org.codehaus.mojo
animal-sniffer-maven-plugin
+ 1.20
java8
@@ -464,7 +465,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.3.0
+ 3.3.1
html
@@ -564,7 +565,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.3.0
+ 3.3.1
attach-javadocs
@@ -631,7 +632,7 @@
com.puppycrawl.tools
checkstyle
- 8.45.1
+ 9.0
@@ -684,7 +685,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.3.0
+ 3.3.1
docFX
@@ -698,7 +699,7 @@
com.microsoft.doclet.DocFxDoclet
false
- ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.1.1.jar
+ ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.0.jar
-outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId}
none
protected
diff --git a/renovate.json b/renovate.json
index 59333bfb..c46915be 100644
--- a/renovate.json
+++ b/renovate.json
@@ -50,7 +50,8 @@
"^junit:junit",
"^com.google.truth:truth",
"^org.mockito:mockito-core",
- "^org.objenesis:objenesis"
+ "^org.objenesis:objenesis",
+ "^com.google.cloud:google-cloud-conformance-tests"
],
"semanticCommitType": "test",
"semanticCommitScope": "deps"
diff --git a/synth.metadata b/synth.metadata
index 9cc4d39f..8c24a9be 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-shared-config.git",
- "sha": "a721f40ada9a6198b9b0da1cfcf1b5b367132ec4"
+ "sha": "6504eada4851f554d25a8fa3479904e8b44e738d"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d"
+ "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e"
}
}
],
@@ -23,7 +23,7 @@
".github/PULL_REQUEST_TEMPLATE.md",
".github/blunderbuss.yml",
".github/generated-files-bot.yml",
- ".github/readme/synth.py",
+ ".github/release-trigger.yml",
".github/snippet-bot.yml",
".github/sync-repo-settings.yaml",
".github/trusted-contribution.yml",
@@ -36,7 +36,6 @@
".kokoro/common.sh",
".kokoro/continuous/common.cfg",
".kokoro/continuous/java8.cfg",
- ".kokoro/continuous/readme.cfg",
".kokoro/dependencies.sh",
".kokoro/nightly/common.cfg",
".kokoro/nightly/integration.cfg",
diff --git a/versions.txt b/versions.txt
index 2c3840fd..350e5a4d 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-shared-config:1.0.1:1.0.1
+google-cloud-shared-config:1.0.2:1.0.2