diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b28d9107..776ef8f9 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:d63f88abaa7cefc60021d1a86b6a2fb7c02948f8d6448142df4e3012a52308a2 + digest: sha256:af35098ce0a91b8c82091230f72e0fda6c16c382dfe99eebbb9c5070c9a08761 image: gcr.io/repo-automation-bots/owlbot-java:latest diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 05d88a1a..a618e43a 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -22,9 +22,8 @@ deep-remove-regex: deep-copy-regex: - source: "/google/appengine/(v.*)/.*-java/proto-google-.*/src" - dest: "/proto-google-cloud-appengine-admin-$1/src" + dest: "/owl-bot-staging/$1/proto-google-cloud-appengine-admin-$1/src" - source: "/google/appengine/(v.*)/.*-java/grpc-google-.*/src" - dest: "/grpc-google-cloud-appengine-admin-$1/src" -- source: "/google/appengine/v.*/.*-java/gapic-google-.*/src" - dest: "/google-cloud-appengine-admin/src" - \ No newline at end of file + dest: "/owl-bot-staging/$1/grpc-google-cloud-appengine-admin-$1/src" +- source: "/google/appengine/(v.*)/.*-java/gapic-google-.*/src" + dest: "/owl-bot-staging/$1/google-cloud-appengine-admin/src" diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata new file mode 100644 index 00000000..154cc2d3 --- /dev/null +++ b/.github/readme/synth.metadata/synth.metadata @@ -0,0 +1,18 @@ +{ + "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-appengine-admin.git", + "sha": "e6043d0f3d2f725450647351a6182805e932fbf8" + } + }, + { + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "ff6b759fcb58f216f62b48d5be0bb85fafbc3bb2" + } + } + ] +} \ No newline at end of file diff --git a/.github/release-please.yml b/.github/release-please.yml index dce2c845..8ca7f9ca 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,2 +1,3 @@ +bumpMinorPreMajor: true +handleGHRelease: true releaseType: java-yoshi -bumpMinorPreMajor: true \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0d7891cf..ca2889fa 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0fb8c843..59d2aafc 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a7..1f55b770 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2e..8a103384 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 14922e40..27cf7f86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [0.1.1](https://www.github.com/googleapis/java-appengine-admin/compare/v0.1.0...v0.1.1) (2021-05-14) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#27](https://www.github.com/googleapis/java-appengine-admin/issues/27)) ([b198994](https://www.github.com/googleapis/java-appengine-admin/commit/b1989947e17e6580c5543396fe1962fb2e4d837b)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#31](https://www.github.com/googleapis/java-appengine-admin/issues/31)) ([9a2bfa0](https://www.github.com/googleapis/java-appengine-admin/commit/9a2bfa075b44e32fec99b2fcc25424515ee1eb2a)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#39](https://www.github.com/googleapis/java-appengine-admin/issues/39)) ([e58d04a](https://www.github.com/googleapis/java-appengine-admin/commit/e58d04a60a8547ccea0c829c62fbdb7e441d8a37)) + ## 0.1.0 (2021-04-13) diff --git a/README.md b/README.md index 5067049d..235db5cd 100644 --- a/README.md +++ b/README.md @@ -20,18 +20,18 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.0 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-appengine-admin:0.0.0' +compile 'com.google.cloud:google-cloud-appengine-admin:0.1.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "0.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "0.1.0" ``` ## Authentication diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..8b58ae9c --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,7 @@ +# Security Policy + +To report a security issue, please use [g.co/vulnz](https://g.co/vulnz). + +The Google Security Team will respond within 5 working days of your report on g.co/vulnz. + +We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue. diff --git a/google-cloud-appengine-admin-bom/pom.xml b/google-cloud-appengine-admin-bom/pom.xml index 6a27264c..5c56a2f3 100644 --- a/google-cloud-appengine-admin-bom/pom.xml +++ b/google-cloud-appengine-admin-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-appengine-admin-bom - 0.1.0 + 0.1.1 pom com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 Google App Engine Admin API BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-appengine-admin - 0.1.0 + 0.1.1 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 0.1.0 + 0.1.1 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 0.1.0 + 0.1.1 diff --git a/google-cloud-appengine-admin/pom.xml b/google-cloud-appengine-admin/pom.xml index dc4d4450..9d2e1e0a 100644 --- a/google-cloud-appengine-admin/pom.xml +++ b/google-cloud-appengine-admin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-appengine-admin - 0.1.0 + 0.1.1 jar Google App Engine Admin API https://github.com/googleapis/java-appengine-admin @@ -11,7 +11,7 @@ com.google.cloud google-cloud-appengine-admin-parent - 0.1.0 + 0.1.1 google-cloud-appengine-admin diff --git a/grpc-google-cloud-appengine-admin-v1/pom.xml b/grpc-google-cloud-appengine-admin-v1/pom.xml index 63fbbc07..e5d320f5 100644 --- a/grpc-google-cloud-appengine-admin-v1/pom.xml +++ b/grpc-google-cloud-appengine-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 0.1.0 + 0.1.1 grpc-google-cloud-appengine-admin-v1 GRPC library for google-cloud-appengine-admin com.google.cloud google-cloud-appengine-admin-parent - 0.1.0 + 0.1.1 diff --git a/synth.py b/owlbot.py similarity index 66% rename from synth.py rename to owlbot.py index 892e8d91..dca9d867 100644 --- a/synth.py +++ b/owlbot.py @@ -4,7 +4,7 @@ # 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 +# 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, @@ -12,6 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import synthtool.languages.java as java +import synthtool as s +from synthtool.languages import java -java.common_templates() \ No newline at end of file + +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) + +s.remove_staging_dirs() +java.common_templates() diff --git a/pom.xml b/pom.xml index 5e368471..c20faf7a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-appengine-admin-parent pom - 0.1.0 + 0.1.1 Google App Engine Admin API Parent https://github.com/googleapis/java-appengine-admin @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 @@ -60,23 +60,23 @@ com.google.cloud google-cloud-appengine-admin - 0.1.0 + 0.1.1 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 0.1.0 + 0.1.1 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 0.1.0 + 0.1.1 com.google.cloud google-cloud-shared-dependencies - 0.21.0 + 1.1.0 pom import @@ -112,7 +112,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.1 + 3.1.2 diff --git a/proto-google-cloud-appengine-admin-v1/pom.xml b/proto-google-cloud-appengine-admin-v1/pom.xml index 089d1fa1..948935d5 100644 --- a/proto-google-cloud-appengine-admin-v1/pom.xml +++ b/proto-google-cloud-appengine-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 0.1.0 + 0.1.1 proto-google-cloud-appengine-admin-v1 Proto library for google-cloud-appengine-admin com.google.cloud google-cloud-appengine-admin-parent - 0.1.0 + 0.1.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 37282c11..48c91dd3 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.12 + 1.0.22 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.0 @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/pom.xml b/samples/pom.xml index 15fc7d8b..151cc638 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.22 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 42f54e25..4031279f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.22 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.0 @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index ee5e3e71..1bc07fb1 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.22 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.0 diff --git a/synth.metadata b/synth.metadata index 0f930e8c..e9b644b8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -3,92 +3,24 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/java-appengine-admin.git", - "sha": "8cb351b8dc4412f8080f5ffd972269a8fa22ff08" + "remote": "git@github.com:googleapis/java-appengine-admin.git", + "sha": "b1989947e17e6580c5543396fe1962fb2e4d837b" + } + }, + { + "git": { + "name": "googleapis-gen", + "remote": "https://github.com/googleapis/googleapis-gen.git", + "sha": "32337a2c2ec4d35de81519661e279ada7e3bfcf2", + "internalRef": "369574301" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1f5e6bc8dc8e3661ee550905fc070e55e1b6cea1" + "sha": "5a6f30b8bb7672cf237c4f75d5aa96bfba170e7f" } } - ], - "generatedFiles": [ - ".github/CODEOWNERS", - ".github/ISSUE_TEMPLATE/bug_report.md", - ".github/ISSUE_TEMPLATE/feature_request.md", - ".github/ISSUE_TEMPLATE/support_request.md", - ".github/PULL_REQUEST_TEMPLATE.md", - ".github/blunderbuss.yml", - ".github/generated-files-bot.yml", - ".github/readme/synth.py", - ".github/release-please.yml", - ".github/snippet-bot.yml", - ".github/sync-repo-settings.yaml", - ".github/trusted-contribution.yml", - ".github/workflows/approve-readme.yaml", - ".github/workflows/auto-release.yaml", - ".github/workflows/ci.yaml", - ".github/workflows/samples.yaml", - ".kokoro/build.bat", - ".kokoro/build.sh", - ".kokoro/coerce_logs.sh", - ".kokoro/common.cfg", - ".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", - ".kokoro/nightly/java11.cfg", - ".kokoro/nightly/java7.cfg", - ".kokoro/nightly/java8-osx.cfg", - ".kokoro/nightly/java8-win.cfg", - ".kokoro/nightly/java8.cfg", - ".kokoro/nightly/samples.cfg", - ".kokoro/populate-secrets.sh", - ".kokoro/presubmit/clirr.cfg", - ".kokoro/presubmit/common.cfg", - ".kokoro/presubmit/dependencies.cfg", - ".kokoro/presubmit/integration.cfg", - ".kokoro/presubmit/java11.cfg", - ".kokoro/presubmit/java7.cfg", - ".kokoro/presubmit/java8-osx.cfg", - ".kokoro/presubmit/java8-win.cfg", - ".kokoro/presubmit/java8.cfg", - ".kokoro/presubmit/linkage-monitor.cfg", - ".kokoro/presubmit/lint.cfg", - ".kokoro/presubmit/samples.cfg", - ".kokoro/readme.sh", - ".kokoro/release/bump_snapshot.cfg", - ".kokoro/release/common.cfg", - ".kokoro/release/common.sh", - ".kokoro/release/drop.cfg", - ".kokoro/release/drop.sh", - ".kokoro/release/promote.cfg", - ".kokoro/release/promote.sh", - ".kokoro/release/publish_javadoc.cfg", - ".kokoro/release/publish_javadoc.sh", - ".kokoro/release/publish_javadoc11.cfg", - ".kokoro/release/publish_javadoc11.sh", - ".kokoro/release/snapshot.cfg", - ".kokoro/release/snapshot.sh", - ".kokoro/release/stage.cfg", - ".kokoro/release/stage.sh", - ".kokoro/trampoline.sh", - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.md", - "LICENSE", - "codecov.yaml", - "java.header", - "license-checks.xml", - "renovate.json", - "samples/install-without-bom/pom.xml", - "samples/pom.xml", - "samples/snapshot/pom.xml", - "samples/snippets/pom.xml" ] } \ No newline at end of file diff --git a/versions.txt b/versions.txt index 617a2c9d..d15490a0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-appengine-admin:0.1.0:0.1.0 -grpc-google-cloud-appengine-admin-v1:0.1.0:0.1.0 -proto-google-cloud-appengine-admin-v1:0.1.0:0.1.0 +google-cloud-appengine-admin:0.1.1:0.1.1 +grpc-google-cloud-appengine-admin-v1:0.1.1:0.1.1 +proto-google-cloud-appengine-admin-v1:0.1.1:0.1.1