diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 3f7432a5..b6721276 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/repo-automation-bots/owlbot-java:latest
- digest: sha256:12cbdc4f137152a1a8b83f50ebc1a4098be0d3baff78b46efaec306f7cfafd13
+ digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db
diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
deleted file mode 100644
index 0d428482..00000000
--- a/.github/readme/synth.metadata/synth.metadata
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "sources": [
- {
- "git": {
- "name": ".",
- "remote": "https://github.com/googleapis/java-analytics-admin.git",
- "sha": "d22e529264c18408c18e708cfc1c050aae945b7c"
- }
- },
- {
- "git": {
- "name": "synthtool",
- "remote": "https://github.com/googleapis/synthtool.git",
- "sha": "3d32990b6f4b57be77455e3ca89e6e21cd0c06b3"
- }
- }
- ]
-}
\ No newline at end of file
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-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 b795051a..462eb75f 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -10,7 +10,6 @@ branchProtectionRules:
requiredStatusCheckContexts:
- dependencies (8)
- dependencies (11)
- - linkage-monitor
- lint
- clirr
- units (8)
@@ -26,7 +25,6 @@ branchProtectionRules:
requiredStatusCheckContexts:
- dependencies (8)
- dependencies (11)
- - linkage-monitor
- lint
- clirr
- units (7)
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/.kokoro/build.sh b/.kokoro/build.sh
index 6774be95..c9598877 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -115,7 +115,7 @@ fi
# fix output location of logs
bash .kokoro/coerce_logs.sh
-if [[ "${ENABLE_BUILD_COP}" == "true" ]]
+if [[ "${ENABLE_FLAKYBOT}" == "true" ]]
then
chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-analytics-admin
diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
deleted file mode 100644
index 983d7867..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-analytics-admin/.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/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 0048c8ec..e51c7b4c 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -22,7 +22,7 @@ env_vars: {
}
env_vars: {
- key: "ENABLE_BUILD_COP"
+ key: "ENABLE_FLAKYBOT"
value: "true"
}
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
index f2542931..9761fd86 100644
--- a/.kokoro/nightly/samples.cfg
+++ b/.kokoro/nightly/samples.cfg
@@ -33,6 +33,6 @@ env_vars: {
}
env_vars: {
- key: "ENABLE_BUILD_COP"
+ key: "ENABLE_FLAKYBOT"
value: "true"
}
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 2f21b274..f2b48327 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 399bc969..8dcd4365 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 09688372..b6a0df8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
# Changelog
+## [0.6.0](https://www.github.com/googleapis/java-analytics-admin/compare/v0.5.0...v0.6.0) (2021-09-15)
+
+
+### Features
+
+* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-analytics-admin/issues/1196)) ([#273](https://www.github.com/googleapis/java-analytics-admin/issues/273)) ([dd7bfaa](https://www.github.com/googleapis/java-analytics-admin/commit/dd7bfaa111cf32a7e3f415ec43fcd53c7010769e))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.0.1 ([#264](https://www.github.com/googleapis/java-analytics-admin/issues/264)) ([a1c4442](https://www.github.com/googleapis/java-analytics-admin/commit/a1c444255cf6d0e14f81b679f7f41e4c8c5bbfa3))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.1.0 ([#268](https://www.github.com/googleapis/java-analytics-admin/issues/268)) ([1ef6fd5](https://www.github.com/googleapis/java-analytics-admin/commit/1ef6fd5631f6380ea10dbeb56959b93088fd7bab))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#275](https://www.github.com/googleapis/java-analytics-admin/issues/275)) ([98c2fc5](https://www.github.com/googleapis/java-analytics-admin/commit/98c2fc502d1640021c84e3c739c74b0f48fbed9b))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#283](https://www.github.com/googleapis/java-analytics-admin/issues/283)) ([498c5bf](https://www.github.com/googleapis/java-analytics-admin/commit/498c5bf2459a813d12f796362e113e782aa78114))
+
## [0.5.0](https://www.github.com/googleapis/java-analytics-admin/compare/v0.4.0...v0.5.0) (2021-08-06)
diff --git a/README.md b/README.md
index da04879e..000289be 100644
--- a/README.md
+++ b/README.md
@@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file:
com.google.analytics
google-analytics-admin
- 0.4.0
+ 0.5.0
```
If you are using Gradle without BOM, add this to your dependencies
```Groovy
-compile 'com.google.analytics:google-analytics-admin:0.4.0'
+implementation 'com.google.analytics:google-analytics-admin:0.5.0'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.4.0"
+libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.5.0"
```
## Authentication
diff --git a/google-analytics-admin-bom/pom.xml b/google-analytics-admin-bom/pom.xml
index 25247b11..1758fc8f 100644
--- a/google-analytics-admin-bom/pom.xml
+++ b/google-analytics-admin-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.analytics
google-analytics-admin-bom
- 0.5.0
+ 0.6.0
pom
com.google.cloud
google-cloud-shared-config
- 1.0.0
+ 1.0.2
Google Analytics Admin BOM
@@ -56,17 +56,17 @@
com.google.analytics
google-analytics-admin
- 0.5.0
+ 0.6.0
com.google.api.grpc
grpc-google-analytics-admin-v1alpha
- 0.5.0
+ 0.6.0
com.google.api.grpc
proto-google-analytics-admin-v1alpha
- 0.5.0
+ 0.6.0
diff --git a/google-analytics-admin/pom.xml b/google-analytics-admin/pom.xml
index 5b113ff9..c49f6b45 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.5.0
+ 0.6.0
jar
Google Analytics Admin
https://github.com/googleapis/java-analytics-admin
@@ -11,7 +11,7 @@
com.google.analytics
google-analytics-admin-parent
- 0.5.0
+ 0.6.0
google-analytics-admin
diff --git a/grpc-google-analytics-admin-v1alpha/pom.xml b/grpc-google-analytics-admin-v1alpha/pom.xml
index a879255e..298adbc7 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.5.0
+ 0.6.0
grpc-google-analytics-admin-v1alpha
GRPC library for grpc-google-analytics-admin-v1alpha
com.google.analytics
google-analytics-admin-parent
- 0.5.0
+ 0.6.0
diff --git a/pom.xml b/pom.xml
index a2fc5114..ec2b6213 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.analytics
google-analytics-admin-parent
pom
- 0.5.0
+ 0.6.0
Google Analytics Admin Parent
https://github.com/googleapis/java-analytics-admin
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.0.0
+ 1.0.2
@@ -61,23 +61,23 @@
com.google.analytics
google-analytics-admin
- 0.5.0
+ 0.6.0
com.google.api.grpc
proto-google-analytics-admin-v1alpha
- 0.5.0
+ 0.6.0
com.google.api.grpc
grpc-google-analytics-admin-v1alpha
- 0.5.0
+ 0.6.0
com.google.cloud
google-cloud-shared-dependencies
- 2.0.0
+ 2.2.1
pom
import
@@ -147,7 +147,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.3.0
+ 3.3.1
html
diff --git a/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml b/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml
index df768a74..61e61691 100644
--- a/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml
+++ b/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml
@@ -16,23 +16,4 @@
com/google/analytics/admin/v1alpha/*OrBuilder
boolean has*(*)
-
-
- 6011
- com/google/analytics/admin/v1alpha/Property
- *FIELD_NUMBER
-
-
- 7002
- com/google/analytics/admin/v1alpha/Property*
- * *Deleted(*)
-
-
- 8001
- com/google/analytics/admin/v1alpha/Create*
-
-
- 8001
- com/google/analytics/admin/v1alpha/AccountSummary*
-
diff --git a/proto-google-analytics-admin-v1alpha/pom.xml b/proto-google-analytics-admin-v1alpha/pom.xml
index 8ba11960..fe466dfc 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.5.0
+ 0.6.0
proto-google-analytics-admin-v1alpha
PROTO library for proto-google-analytics-admin-v1alpha
com.google.analytics
google-analytics-admin-parent
- 0.5.0
+ 0.6.0
diff --git a/renovate.json b/renovate.json
index 683b5f76..c30acf35 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/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 00362710..4bbb7b23 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.4.0
+ 0.5.0
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 728d24fa..208af56d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.analytics
google-analytics-admin
- 0.5.0
+ 0.6.0
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 850bd409..d5f88ee8 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -27,7 +27,7 @@
com.google.analytics
google-analytics-admin
- 0.5.0
+ 0.6.0
diff --git a/versions.txt b/versions.txt
index 24a18b81..3effd0bb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version
-google-analytics-admin:0.5.0:0.5.0
-grpc-google-analytics-admin-v1alpha:0.5.0:0.5.0
-proto-google-analytics-admin-v1alpha:0.5.0:0.5.0
+google-analytics-admin:0.6.0:0.6.0
+grpc-google-analytics-admin-v1alpha:0.6.0:0.6.0
+proto-google-analytics-admin-v1alpha:0.6.0:0.6.0