From 0e070b95e5aa29b79b78761346dc617bce3831b7 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 27 Jul 2020 14:01:56 -0700 Subject: [PATCH 1/7] chore: fix groupId to be com.google.analytics (#13) --- google-analytics-admin-bom/pom.xml | 2 +- google-analytics-admin/pom.xml | 4 ++-- grpc-google-analytics-admin-v1alpha/pom.xml | 2 +- pom.xml | 2 +- proto-google-analytics-admin-v1alpha/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/google-analytics-admin-bom/pom.xml b/google-analytics-admin-bom/pom.xml index e0c91a20..17a62509 100644 --- a/google-analytics-admin-bom/pom.xml +++ b/google-analytics-admin-bom/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.google.cloud + com.google.analytics google-analytics-admin-bom 0.1.0 pom diff --git a/google-analytics-admin/pom.xml b/google-analytics-admin/pom.xml index c269584f..05379ef8 100644 --- a/google-analytics-admin/pom.xml +++ b/google-analytics-admin/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.google.cloud + com.google.analytics google-analytics-admin 0.1.0 jar @@ -9,7 +9,7 @@ https://github.com/googleapis/java-analytics-admin allows you to manage Google Analytics accounts and properties. - com.google.cloud + com.google.analytics google-analytics-admin-parent 0.1.0 diff --git a/grpc-google-analytics-admin-v1alpha/pom.xml b/grpc-google-analytics-admin-v1alpha/pom.xml index f18d8c61..5724b0ea 100644 --- a/grpc-google-analytics-admin-v1alpha/pom.xml +++ b/grpc-google-analytics-admin-v1alpha/pom.xml @@ -8,7 +8,7 @@ grpc-google-analytics-admin-v1alpha GRPC library for grpc-google-analytics-admin-v1alpha - com.google.cloud + com.google.analytics google-analytics-admin-parent 0.1.0 diff --git a/pom.xml b/pom.xml index 2fba439b..650ed710 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.google.cloud + com.google.analytics google-analytics-admin-parent pom 0.1.0 diff --git a/proto-google-analytics-admin-v1alpha/pom.xml b/proto-google-analytics-admin-v1alpha/pom.xml index 2fbb5141..49b9c0a0 100644 --- a/proto-google-analytics-admin-v1alpha/pom.xml +++ b/proto-google-analytics-admin-v1alpha/pom.xml @@ -8,7 +8,7 @@ proto-google-analytics-admin-v1alpha PROTO library for proto-google-analytics-admin-v1alpha - com.google.cloud + com.google.analytics google-analytics-admin-parent 0.1.0 From dcfc6305010a26d236328294bff2cb73f503c3fd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 21:16:04 +0000 Subject: [PATCH 2/7] chore: release 0.1.1-SNAPSHOT (#14) :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). --- google-analytics-admin-bom/pom.xml | 8 ++++---- google-analytics-admin/pom.xml | 4 ++-- grpc-google-analytics-admin-v1alpha/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-analytics-admin-v1alpha/pom.xml | 4 ++-- versions.txt | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/google-analytics-admin-bom/pom.xml b/google-analytics-admin-bom/pom.xml index 17a62509..66cf310a 100644 --- a/google-analytics-admin-bom/pom.xml +++ b/google-analytics-admin-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.analytics google-analytics-admin-bom - 0.1.0 + 0.1.1-SNAPSHOT pom com.google.cloud @@ -68,17 +68,17 @@ com.google.analytics google-analytics-admin - 0.1.0 + 0.1.1-SNAPSHOT com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.1.0 + 0.1.1-SNAPSHOT com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.1.0 + 0.1.1-SNAPSHOT diff --git a/google-analytics-admin/pom.xml b/google-analytics-admin/pom.xml index 05379ef8..1332c2c9 100644 --- a/google-analytics-admin/pom.xml +++ b/google-analytics-admin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.analytics google-analytics-admin - 0.1.0 + 0.1.1-SNAPSHOT jar Google Analytics Admin https://github.com/googleapis/java-analytics-admin @@ -11,7 +11,7 @@ com.google.analytics google-analytics-admin-parent - 0.1.0 + 0.1.1-SNAPSHOT google-analytics-admin diff --git a/grpc-google-analytics-admin-v1alpha/pom.xml b/grpc-google-analytics-admin-v1alpha/pom.xml index 5724b0ea..7033510a 100644 --- a/grpc-google-analytics-admin-v1alpha/pom.xml +++ b/grpc-google-analytics-admin-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.1.0 + 0.1.1-SNAPSHOT grpc-google-analytics-admin-v1alpha GRPC library for grpc-google-analytics-admin-v1alpha com.google.analytics google-analytics-admin-parent - 0.1.0 + 0.1.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 650ed710..f8814f80 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.analytics google-analytics-admin-parent pom - 0.1.0 + 0.1.1-SNAPSHOT Google Analytics Admin Parent https://github.com/googleapis/java-analytics-admin @@ -70,17 +70,17 @@ com.google.analytics google-analytics-admin - 0.1.0 + 0.1.1-SNAPSHOT com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.1.0 + 0.1.1-SNAPSHOT com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.1.0 + 0.1.1-SNAPSHOT diff --git a/proto-google-analytics-admin-v1alpha/pom.xml b/proto-google-analytics-admin-v1alpha/pom.xml index 49b9c0a0..1326735f 100644 --- a/proto-google-analytics-admin-v1alpha/pom.xml +++ b/proto-google-analytics-admin-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.1.0 + 0.1.1-SNAPSHOT proto-google-analytics-admin-v1alpha PROTO library for proto-google-analytics-admin-v1alpha com.google.analytics google-analytics-admin-parent - 0.1.0 + 0.1.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 45b23538..1d91a248 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-analytics-admin:0.1.0:0.1.0 -proto-google-analytics-admin-v1alpha:0.1.0:0.1.0 -grpc-google-analytics-admin-v1alpha:0.1.0:0.1.0 \ No newline at end of file +google-analytics-admin:0.1.0:0.1.1-SNAPSHOT +proto-google-analytics-admin-v1alpha:0.1.0:0.1.1-SNAPSHOT +grpc-google-analytics-admin-v1alpha:0.1.0:0.1.1-SNAPSHOT \ No newline at end of file From dde01446cb6e73c568f1f778a3b03427ad9135ab Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 31 Jul 2020 15:56:17 -0700 Subject: [PATCH 3/7] chore(docs): add cloud-RAD (#16) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * Add cloud-RAD for Java Co-authored-by: Jeff Ching Source-Author: Les Vogel Source-Date: Thu Jul 30 13:09:50 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: dd230c816f88d0141fcd0be83498986287220d1b Source-Link: https://github.com/googleapis/synthtool/commit/dd230c816f88d0141fcd0be83498986287220d1b --- .kokoro/release/publish_javadoc.cfg | 10 ++ .kokoro/release/publish_javadoc.sh | 25 ++- README.md | 4 +- synth.metadata | 255 +++++++++++++++++++++++++++- 4 files changed, 287 insertions(+), 7 deletions(-) diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index 762d5764..af1270c1 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -1,14 +1,24 @@ # Format: //devtools/kokoro/config/proto/build.proto + +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/" + env_vars: { key: "STAGING_BUCKET" value: "docs-staging" } +env_vars: { + key: "STAGING_BUCKET_V2" + value: "docs-staging-v2-staging" + # Production will be at: docs-staging-v2 +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-analytics-admin/.kokoro/release/publish_javadoc.sh" } + before_action { fetch_keystore { keystore_resource { diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 9e92937d..0a87e6a4 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -24,6 +24,11 @@ if [[ -z "${STAGING_BUCKET}" ]]; then exit 1 fi +if [[ -z "${STAGING_BUCKET_V2}" ]]; then + echo "Need to set STAGING_BUCKET_V2 environment variable" + exit 1 +fi + # work from the git root directory pushd $(dirname "$0")/../../ @@ -31,13 +36,13 @@ pushd $(dirname "$0")/../../ python3 -m pip install gcp-docuploader # compile all packages -mvn clean install -B -DskipTests=true +mvn clean install -B -q -DskipTests=true NAME=google-analytics-admin VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs -mvn site -B +mvn site -B -q pushd target/site/apidocs @@ -53,3 +58,19 @@ python3 -m docuploader upload . \ --staging-bucket ${STAGING_BUCKET} popd + +# V2 +mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" + +pushd target/devsite + +# create metadata +python3 -m docuploader create-metadata \ + --name ${NAME} \ + --version ${VERSION} \ + --language java + +# upload docs +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET_V2} diff --git a/README.md b/README.md index 30c08c6b..ba33c162 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,11 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.analytics:google-analytics-admin:0.1.0' +compile 'com.google.analytics:google-analytics-admin:0.0.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.1.0" +libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.0.0" ``` [//]: # ({x-version-update-end}) diff --git a/synth.metadata b/synth.metadata index 5d72c841..d56873a8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -3,8 +3,8 @@ { "git": { "name": ".", - "remote": "sso://devrel/cloud/libraries/java/repo-splitter", - "sha": "675497fd5cb08180b14228cbcdf5a5716083f540" + "remote": "https://github.com/googleapis/java-analytics-admin.git", + "sha": "dcfc6305010a26d236328294bff2cb73f503c3fd" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "3a89215abd0e66dfc4f21d07d552d0b543abf082" + "sha": "dd230c816f88d0141fcd0be83498986287220d1b" } } ], @@ -33,5 +33,254 @@ "generator": "bazel" } } + ], + "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/release-please.yml", + ".github/trusted-contribution.yml", + ".github/workflows/ci.yaml", + ".kokoro/build.bat", + ".kokoro/build.sh", + ".kokoro/coerce_logs.sh", + ".kokoro/common.cfg", + ".kokoro/common.sh", + ".kokoro/continuous/common.cfg", + ".kokoro/continuous/dependencies.cfg", + ".kokoro/continuous/integration.cfg", + ".kokoro/continuous/java11.cfg", + ".kokoro/continuous/java7.cfg", + ".kokoro/continuous/java8-osx.cfg", + ".kokoro/continuous/java8-win.cfg", + ".kokoro/continuous/java8.cfg", + ".kokoro/continuous/lint.cfg", + ".kokoro/continuous/propose_release.cfg", + ".kokoro/continuous/samples.cfg", + ".kokoro/dependencies.sh", + ".kokoro/linkage-monitor.sh", + ".kokoro/nightly/common.cfg", + ".kokoro/nightly/dependencies.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/lint.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/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/snapshot.cfg", + ".kokoro/release/snapshot.sh", + ".kokoro/release/stage.cfg", + ".kokoro/release/stage.sh", + ".kokoro/trampoline.sh", + "CODE_OF_CONDUCT.md", + "CONTRIBUTING.md", + "LICENSE", + "README.md", + "codecov.yaml", + "google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java", + "google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings.java", + "google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/package-info.java", + "google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStub.java", + "google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings.java", + "google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/GrpcAnalyticsAdminServiceCallableFactory.java", + "google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/GrpcAnalyticsAdminServiceStub.java", + "google-analytics-admin/src/test/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClientTest.java", + "google-analytics-admin/src/test/java/com/google/analytics/admin/v1alpha/MockAnalyticsAdminService.java", + "google-analytics-admin/src/test/java/com/google/analytics/admin/v1alpha/MockAnalyticsAdminServiceImpl.java", + "grpc-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceGrpc.java", + "java.header", + "license-checks.xml", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/Account.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminProto.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AndroidAppDataStream.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AndroidAppDataStreamName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AndroidAppDataStreamOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AuditUserLink.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AuditUserLinkOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AuditUserLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AuditUserLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AuditUserLinksResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AuditUserLinksResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchCreateUserLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchCreateUserLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchCreateUserLinksResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchCreateUserLinksResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchDeleteUserLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchDeleteUserLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchGetUserLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchGetUserLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchGetUserLinksResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchGetUserLinksResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchUpdateUserLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchUpdateUserLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchUpdateUserLinksResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/BatchUpdateUserLinksResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateAndroidAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateAndroidAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateFirebaseLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateFirebaseLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateGoogleAdsLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateGoogleAdsLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateIosAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateIosAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreatePropertyRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreatePropertyRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateUserLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateUserLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateWebDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CreateWebDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DataSharingSettings.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DataSharingSettingsName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DataSharingSettingsOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteAccountRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteAccountRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteAndroidAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteAndroidAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteFirebaseLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteFirebaseLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteGoogleAdsLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteGoogleAdsLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteIosAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteIosAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeletePropertyRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeletePropertyRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteUserLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteUserLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteWebDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DeleteWebDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/EnhancedMeasurementSettings.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/EnhancedMeasurementSettingsName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/EnhancedMeasurementSettingsOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/FirebaseLink.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/FirebaseLinkName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/FirebaseLinkOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetAccountRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetAccountRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetAndroidAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetAndroidAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetDataSharingSettingsRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetDataSharingSettingsRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetEnhancedMeasurementSettingsRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetEnhancedMeasurementSettingsRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetGlobalSiteTagRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetGlobalSiteTagRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetIosAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetIosAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetPropertyRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetPropertyRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetUserLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetUserLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetWebDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GetWebDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GlobalSiteTag.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GlobalSiteTagName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GlobalSiteTagOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleAdsLink.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleAdsLinkName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleAdsLinkOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IndustryCategory.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IosAppDataStream.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IosAppDataStreamName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IosAppDataStreamOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAccountsRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAccountsRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAccountsResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAccountsResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAndroidAppDataStreamsRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAndroidAppDataStreamsRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAndroidAppDataStreamsResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListAndroidAppDataStreamsResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListFirebaseLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListFirebaseLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListFirebaseLinksResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListFirebaseLinksResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListGoogleAdsLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListGoogleAdsLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListGoogleAdsLinksResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListGoogleAdsLinksResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListIosAppDataStreamsRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListIosAppDataStreamsRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListIosAppDataStreamsResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListIosAppDataStreamsResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListPropertiesRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListPropertiesRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListPropertiesResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListPropertiesResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListUserLinksRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListUserLinksRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListUserLinksResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListUserLinksResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListWebDataStreamsRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListWebDataStreamsRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListWebDataStreamsResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ListWebDataStreamsResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/MaximumUserAccess.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/Property.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/PropertyName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/PropertyOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ProvisionAccountTicketRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ProvisionAccountTicketRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ProvisionAccountTicketResponse.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ProvisionAccountTicketResponseOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ResourcesProto.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateAccountRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateAccountRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateAndroidAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateAndroidAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateEnhancedMeasurementSettingsRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateEnhancedMeasurementSettingsRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateFirebaseLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateFirebaseLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateGoogleAdsLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateGoogleAdsLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateIosAppDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateIosAppDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdatePropertyRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdatePropertyRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateUserLinkRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateUserLinkRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateWebDataStreamRequest.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UpdateWebDataStreamRequestOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UserLink.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UserLinkName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UserLinkOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/WebDataStream.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/WebDataStreamName.java", + "proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/WebDataStreamOrBuilder.java", + "proto-google-analytics-admin-v1alpha/src/main/proto/google/analytics/admin/v1alpha/analytics_admin.proto", + "proto-google-analytics-admin-v1alpha/src/main/proto/google/analytics/admin/v1alpha/resources.proto", + "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 From fa85f0054b31fc225f718502af404d3b90740c8a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 6 Aug 2020 16:46:47 -0700 Subject: [PATCH 4/7] chore: regenerate common templates (#20) * cleanup: removes unused kokoro config files * cleanup: removes unused kokoro config files Removes unused kokoro files from the java library template. We have stopped running some of these due to Github quota issues. * fix:reverts back samples.cfg files The files presubmit/samples.cfg and nightly/samples.cfg should remain in the java template repository. Co-authored-by: Jeffrey Rennie Source-Author: Thiago Nunes Source-Date: Thu Aug 6 09:48:58 2020 +1000 Source-Repo: googleapis/synthtool Source-Sha: 4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4 Source-Link: https://github.com/googleapis/synthtool/commit/4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4 * build: update dependencies check to only check for runtime and compile scopes * change:Updated dependencies check to only use runtime & compile scope * Update dependencies.sh * feat: update dependencies check to only check for runtime and compile scopes Co-authored-by: Saleh Mostafa Co-authored-by: Jeffrey Rennie Source-Author: salehsquared Source-Date: Thu Aug 6 13:01:02 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: f8823dec98277a9516f2fb6fae9f58b3a59a23e1 Source-Link: https://github.com/googleapis/synthtool/commit/f8823dec98277a9516f2fb6fae9f58b3a59a23e1 --- .kokoro/continuous/dependencies.cfg | 12 ------ .kokoro/continuous/integration.cfg | 7 ---- .kokoro/continuous/java11.cfg | 7 ---- .kokoro/continuous/java7.cfg | 7 ---- .kokoro/continuous/java8-osx.cfg | 3 -- .kokoro/continuous/java8-win.cfg | 3 -- .kokoro/continuous/lint.cfg | 13 ------- .kokoro/continuous/propose_release.cfg | 53 -------------------------- .kokoro/continuous/samples.cfg | 31 --------------- .kokoro/dependencies.sh | 9 +++-- .kokoro/nightly/dependencies.cfg | 12 ------ .kokoro/nightly/lint.cfg | 13 ------- synth.metadata | 15 +------- 13 files changed, 7 insertions(+), 178 deletions(-) delete mode 100644 .kokoro/continuous/dependencies.cfg delete mode 100644 .kokoro/continuous/integration.cfg delete mode 100644 .kokoro/continuous/java11.cfg delete mode 100644 .kokoro/continuous/java7.cfg delete mode 100644 .kokoro/continuous/java8-osx.cfg delete mode 100644 .kokoro/continuous/java8-win.cfg delete mode 100644 .kokoro/continuous/lint.cfg delete mode 100644 .kokoro/continuous/propose_release.cfg delete mode 100644 .kokoro/continuous/samples.cfg delete mode 100644 .kokoro/nightly/dependencies.cfg delete mode 100644 .kokoro/nightly/lint.cfg diff --git a/.kokoro/continuous/dependencies.cfg b/.kokoro/continuous/dependencies.cfg deleted file mode 100644 index e203a4cf..00000000 --- a/.kokoro/continuous/dependencies.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-analytics-admin/.kokoro/dependencies.sh" -} diff --git a/.kokoro/continuous/integration.cfg b/.kokoro/continuous/integration.cfg deleted file mode 100644 index 3b017fc8..00000000 --- a/.kokoro/continuous/integration.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} diff --git a/.kokoro/continuous/java11.cfg b/.kokoro/continuous/java11.cfg deleted file mode 100644 index 709f2b4c..00000000 --- a/.kokoro/continuous/java11.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java11" -} diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg deleted file mode 100644 index cb24f44e..00000000 --- a/.kokoro/continuous/java7.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" -} diff --git a/.kokoro/continuous/java8-osx.cfg b/.kokoro/continuous/java8-osx.cfg deleted file mode 100644 index 8adc9e78..00000000 --- a/.kokoro/continuous/java8-osx.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "java-analytics-admin/.kokoro/build.sh" diff --git a/.kokoro/continuous/java8-win.cfg b/.kokoro/continuous/java8-win.cfg deleted file mode 100644 index 35288db3..00000000 --- a/.kokoro/continuous/java8-win.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "java-analytics-admin/.kokoro/build.bat" diff --git a/.kokoro/continuous/lint.cfg b/.kokoro/continuous/lint.cfg deleted file mode 100644 index 6d323c8a..00000000 --- a/.kokoro/continuous/lint.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "lint" -} \ No newline at end of file diff --git a/.kokoro/continuous/propose_release.cfg b/.kokoro/continuous/propose_release.cfg deleted file mode 100644 index cef3ebbf..00000000 --- a/.kokoro/continuous/propose_release.cfg +++ /dev/null @@ -1,53 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "java-analytics-admin/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-analytics-admin/.kokoro/continuous/propose_release.sh" -} - -# tokens used by release-please to keep an up-to-date release PR. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-key-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-token-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-url-release-please" - } - } -} diff --git a/.kokoro/continuous/samples.cfg b/.kokoro/continuous/samples.cfg deleted file mode 100644 index fa7b493d..00000000 --- a/.kokoro/continuous/samples.cfg +++ /dev/null @@ -1,31 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "samples" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } -} diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index cee4f11e..c91e5a56 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -43,12 +43,13 @@ function completenessCheck() { # Output dep list with compile scope generated using the original pom # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency. # 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 -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt - # Output dep list generated using the flattened pom (test scope deps are ommitted) + # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt # Compare two dependency lists msg "Comparing dependency lists..." @@ -85,4 +86,4 @@ then else msg "Errors found. See log statements above." exit 1 -fi +fi \ No newline at end of file diff --git a/.kokoro/nightly/dependencies.cfg b/.kokoro/nightly/dependencies.cfg deleted file mode 100644 index e203a4cf..00000000 --- a/.kokoro/nightly/dependencies.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-analytics-admin/.kokoro/dependencies.sh" -} diff --git a/.kokoro/nightly/lint.cfg b/.kokoro/nightly/lint.cfg deleted file mode 100644 index 6d323c8a..00000000 --- a/.kokoro/nightly/lint.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "lint" -} \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index d56873a8..041c3105 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-analytics-admin.git", - "sha": "dcfc6305010a26d236328294bff2cb73f503c3fd" + "sha": "dde01446cb6e73c568f1f778a3b03427ad9135ab" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "dd230c816f88d0141fcd0be83498986287220d1b" + "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1" } } ], @@ -49,27 +49,16 @@ ".kokoro/common.cfg", ".kokoro/common.sh", ".kokoro/continuous/common.cfg", - ".kokoro/continuous/dependencies.cfg", - ".kokoro/continuous/integration.cfg", - ".kokoro/continuous/java11.cfg", - ".kokoro/continuous/java7.cfg", - ".kokoro/continuous/java8-osx.cfg", - ".kokoro/continuous/java8-win.cfg", ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/lint.cfg", - ".kokoro/continuous/propose_release.cfg", - ".kokoro/continuous/samples.cfg", ".kokoro/dependencies.sh", ".kokoro/linkage-monitor.sh", ".kokoro/nightly/common.cfg", - ".kokoro/nightly/dependencies.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/lint.cfg", ".kokoro/nightly/samples.cfg", ".kokoro/populate-secrets.sh", ".kokoro/presubmit/clirr.cfg", From 6461e4c7935c15a3e553263fa44c689769370369 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 8 Aug 2020 00:22:35 +0200 Subject: [PATCH 5/7] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8814f80..5a33cb4f 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ com.google.cloud google-cloud-shared-dependencies - 0.8.3 + 0.8.6 pom import From ef21bb87b1c265d10bed8d2dbe438cad9ae39081 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 11 Aug 2020 04:34:44 +0200 Subject: [PATCH 6/7] chore(deps): update dependency com.google.analytics:google-analytics-admin to v0.1.0 (#23) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 7cfeb4c8..34399ae3 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.analytics google-analytics-admin - 0.0.0 + 0.1.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f7131e9c..3aab9258 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.analytics google-analytics-admin - 0.0.0 + 0.1.0 From 758e0b57160774a8ef5e47e37cde44f09e1ea7a8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2020 14:43:33 -0400 Subject: [PATCH 7/7] chore: release 0.1.1 * chore: updated CHANGELOG.md [ci skip] * chore: updated README.md [ci skip] * chore: updated versions.txt [ci skip] * chore: updated samples/snippets/pom.xml [ci skip] * chore: updated samples/pom.xml [ci skip] * chore: updated samples/install-without-bom/pom.xml [ci skip] * chore: updated samples/snapshot/pom.xml [ci skip] * chore: updated google-analytics-admin-bom/pom.xml [ci skip] * chore: updated google-analytics-admin/pom.xml [ci skip] * chore: updated grpc-google-analytics-admin-v1alpha/pom.xml [ci skip] * chore: updated proto-google-analytics-admin-v1alpha/pom.xml [ci skip] * chore: updated pom.xml Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- google-analytics-admin-bom/pom.xml | 8 ++++---- google-analytics-admin/pom.xml | 4 ++-- grpc-google-analytics-admin-v1alpha/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-analytics-admin-v1alpha/pom.xml | 4 ++-- versions.txt | 6 +++--- 8 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 573de4f0..81655553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.1.1](https://www.github.com/googleapis/java-analytics-admin/compare/v0.1.0...v0.1.1) (2020-08-11) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.6 ([6461e4c](https://www.github.com/googleapis/java-analytics-admin/commit/6461e4c7935c15a3e553263fa44c689769370369)) + ## 0.1.0 (2020-07-24) diff --git a/README.md b/README.md index ba33c162..27c7ff76 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,11 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.analytics:google-analytics-admin:0.0.0' +compile 'com.google.analytics:google-analytics-admin:0.1.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.0.0" +libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.1.1" ``` [//]: # ({x-version-update-end}) diff --git a/google-analytics-admin-bom/pom.xml b/google-analytics-admin-bom/pom.xml index 66cf310a..4f59291d 100644 --- a/google-analytics-admin-bom/pom.xml +++ b/google-analytics-admin-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.analytics google-analytics-admin-bom - 0.1.1-SNAPSHOT + 0.1.1 pom com.google.cloud @@ -68,17 +68,17 @@ com.google.analytics google-analytics-admin - 0.1.1-SNAPSHOT + 0.1.1 com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.1.1-SNAPSHOT + 0.1.1 com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.1.1-SNAPSHOT + 0.1.1 diff --git a/google-analytics-admin/pom.xml b/google-analytics-admin/pom.xml index 1332c2c9..05275359 100644 --- a/google-analytics-admin/pom.xml +++ b/google-analytics-admin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.analytics google-analytics-admin - 0.1.1-SNAPSHOT + 0.1.1 jar Google Analytics Admin https://github.com/googleapis/java-analytics-admin @@ -11,7 +11,7 @@ com.google.analytics google-analytics-admin-parent - 0.1.1-SNAPSHOT + 0.1.1 google-analytics-admin diff --git a/grpc-google-analytics-admin-v1alpha/pom.xml b/grpc-google-analytics-admin-v1alpha/pom.xml index 7033510a..b6cc9e57 100644 --- a/grpc-google-analytics-admin-v1alpha/pom.xml +++ b/grpc-google-analytics-admin-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.1.1-SNAPSHOT + 0.1.1 grpc-google-analytics-admin-v1alpha GRPC library for grpc-google-analytics-admin-v1alpha com.google.analytics google-analytics-admin-parent - 0.1.1-SNAPSHOT + 0.1.1 diff --git a/pom.xml b/pom.xml index 5a33cb4f..d98efa87 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.analytics google-analytics-admin-parent pom - 0.1.1-SNAPSHOT + 0.1.1 Google Analytics Admin Parent https://github.com/googleapis/java-analytics-admin @@ -70,17 +70,17 @@ com.google.analytics google-analytics-admin - 0.1.1-SNAPSHOT + 0.1.1 com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.1.1-SNAPSHOT + 0.1.1 com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.1.1-SNAPSHOT + 0.1.1 diff --git a/proto-google-analytics-admin-v1alpha/pom.xml b/proto-google-analytics-admin-v1alpha/pom.xml index 1326735f..75405ab7 100644 --- a/proto-google-analytics-admin-v1alpha/pom.xml +++ b/proto-google-analytics-admin-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.1.1-SNAPSHOT + 0.1.1 proto-google-analytics-admin-v1alpha PROTO library for proto-google-analytics-admin-v1alpha com.google.analytics google-analytics-admin-parent - 0.1.1-SNAPSHOT + 0.1.1 diff --git a/versions.txt b/versions.txt index 1d91a248..0da9a109 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-analytics-admin:0.1.0:0.1.1-SNAPSHOT -proto-google-analytics-admin-v1alpha:0.1.0:0.1.1-SNAPSHOT -grpc-google-analytics-admin-v1alpha:0.1.0:0.1.1-SNAPSHOT \ No newline at end of file +google-analytics-admin:0.1.1:0.1.1 +proto-google-analytics-admin-v1alpha:0.1.1:0.1.1 +grpc-google-analytics-admin-v1alpha:0.1.1:0.1.1 \ No newline at end of file