diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 00000000..6e758e72 --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:5ba0bc6649b2d147f7dea0836e5b484afba15e10db96e0e5bf01d4edf095041e diff --git a/synth.py b/.github/.OwlBot.yaml similarity index 60% rename from synth.py rename to .github/.OwlBot.yaml index 88e27983..8c5f03b4 100644 --- a/synth.py +++ b/.github/.OwlBot.yaml @@ -1,4 +1,4 @@ -# Copyright 2019 Google LLC +# 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. @@ -12,17 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""This script is used to synthesize generated parts of this library.""" - -import synthtool.languages.java as java - -AUTOSYNTH_MULTIPLE_COMMITS = True - -java.common_templates(excludes=[ - "README.md", - ".github/release-please.yml", - '.github/workflows/auto-release.yaml', - '.github/workflows/samples.yaml', - "samples/*" -]) - +docker: + image: "gcr.io/repo-automation-bots/owlbot-java:latest" diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1a23ea42..2176b054 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5ea1b2d5..c2d7ab05 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -11,11 +11,11 @@ squashMergeAllowed: true # Defaults to `false` mergeCommitAllowed: false -# Rules for master branch protection +# Rules for main branch protection branchProtectionRules: # Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master +# Defaults to `main` +- pattern: main # Can admins overwrite branch protection. # Defaults to `true` isAdminEnforced: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3becb5c0..3932a70d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index d0963125..88de3ec2 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: downstream jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ff5a272..4d7624ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [1.1.0](https://www.github.com/googleapis/java-shared-config/compare/v1.0.3...v1.1.0) (2021-10-12) + + +### Features + +* introduce Maven configuration for GraalVM testing ([#314](https://www.github.com/googleapis/java-shared-config/issues/314)) ([28fbeb8](https://www.github.com/googleapis/java-shared-config/commit/28fbeb86c4466a58a05d6933584564dbf3352e79)) + + +### Bug Fixes + +* update doclet version ([#332](https://www.github.com/googleapis/java-shared-config/issues/332)) ([3fd0350](https://www.github.com/googleapis/java-shared-config/commit/3fd035030e4f0954dd1f62f7b8ea62583685880c)) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v9.0.1 ([#327](https://www.github.com/googleapis/java-shared-config/issues/327)) ([b6c9b65](https://www.github.com/googleapis/java-shared-config/commit/b6c9b657550db2dee6b36edbb9a6084baee125e2)) +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.6 ([#330](https://www.github.com/googleapis/java-shared-config/issues/330)) ([271ed7d](https://www.github.com/googleapis/java-shared-config/commit/271ed7dba35623e22fc8a7f7d477e6043e772014)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.6 ([#331](https://www.github.com/googleapis/java-shared-config/issues/331)) ([4f9ba15](https://www.github.com/googleapis/java-shared-config/commit/4f9ba1551df0a2d4fc8c9acca8a951afbe8cb78a)) +* update dependency org.junit.vintage:junit-vintage-engine to v5.8.1 ([#329](https://www.github.com/googleapis/java-shared-config/issues/329)) ([4a8789e](https://www.github.com/googleapis/java-shared-config/commit/4a8789ee814ba8a3480beecc76c16fd1cb4e5f12)) + ### [1.0.3](https://www.github.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3) (2021-09-21) diff --git a/README.md b/README.md index 056fa1e8..ce91bac1 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.3 + 1.1.0 ``` @@ -42,6 +42,6 @@ Apache 2.0 - See [LICENSE][license] for more information. [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-shared-config.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-shared-config&core=gav -[contributing]: https://github.com/googleapis/java-shared-config/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-shared-config/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-shared-config/blob/master/LICENSE \ No newline at end of file +[contributing]: https://github.com/googleapis/java-shared-config/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-shared-config/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-shared-config/blob/main/LICENSE \ No newline at end of file diff --git a/owlbot.py b/owlbot.py new file mode 100644 index 00000000..095f961b --- /dev/null +++ b/owlbot.py @@ -0,0 +1,32 @@ +# 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. +# You may obtain a copy of the License at +# +# https://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. + +import synthtool as s +from synthtool.languages import java + + +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) + +s.remove_staging_dirs() +java.common_templates( + excludes=[ + "README.md", + ".github/release-please.yml", + ".github/workflows/auto-release.yaml", + ".github/workflows/samples.yaml", + "samples/*", + ] +) diff --git a/pom.xml b/pom.xml index cbc1c9ab..d632d10a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.3 + 1.1.0 Google Cloud https://github.com/googleapis/java-shared-config @@ -632,7 +632,7 @@ com.puppycrawl.tools checkstyle - 9.0 + 9.0.1 @@ -699,7 +699,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.1.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId} none protected @@ -778,5 +778,69 @@ + + + native + + + + com.google.cloud + native-image-support + 0.8.0 + test + + + + org.junit.vintage + junit-vintage-engine + 5.8.1 + test + + + + org.graalvm.buildtools + junit-platform-native + 0.9.6 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 2.22.2 + + + + + + + + org.graalvm.buildtools + native-maven-plugin + 0.9.6 + + + test-native + + test + + test + + + + + --no-fallback + --no-server + + + + + + + diff --git a/renovate.json b/renovate.json index c46915be..a9ec0209 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } diff --git a/versions.txt b/versions.txt index ab3c9db4..d68b414f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.3:1.0.3 +google-cloud-shared-config:1.1.0:1.1.0