Skip to content

Commit 3ea3dc9

Browse files
sduskissduskis
committed
Merge branch 'master' into pubsub-ordering-keys
2 parents da6dd3c + cf6d528 commit 3ea3dc9

1,097 files changed

Lines changed: 189596 additions & 10074 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.kokoro/build.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ if [[ "${SKIP_INTEGRATION_TESTS_IF_NO_CHANGES}" == "true" ]] &&
5151
fi
5252
fi
5353

54-
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V
54+
mvn install -B -V \
55+
-DskipTests=true \
56+
-Dmaven.javadoc.skip=true \
57+
-Dgcloud.download.skip=true \
58+
-T 1C
5559

5660
# prepend Kokoro root directory onto GOOGLE_APPLICATION_CREDENTIALS path
5761
if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then

‎.kokoro/continuous/notification-it.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "INTEGRATION_TEST_ARGS"
11-
value: "google-cloud-clients/google-cloud-notification"
11+
value: "google-cloud-clients/google-cloud-contrib/google-cloud-notification"
1212
}
1313

1414
env_vars: {

‎.kokoro/nightly/notification-it.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "INTEGRATION_TEST_ARGS"
11-
value: "google-cloud-clients/google-cloud-notification"
11+
value: "google-cloud-clients/google-cloud-contrib/google-cloud-notification"
1212
}
1313

1414
env_vars: {

‎.kokoro/presubmit/notification-it.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "INTEGRATION_TEST_ARGS"
11-
value: "google-cloud-clients/google-cloud-notification"
11+
value: "google-cloud-clients/google-cloud-contrib/google-cloud-notification"
1212
}
1313

1414
env_vars: {

‎.kokoro/release/publish_javadoc.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pushd $(dirname "$0")/../../
3131
python3 -m pip install gcp-docuploader
3232

3333
# compile all packages
34-
mvn clean install -B -DskipTests=true
34+
mvn clean install -B -DskipTests=true -T 1C
3535

3636
build_and_publish_site() {
3737
DIRECTORY=$1
@@ -41,8 +41,8 @@ build_and_publish_site() {
4141
pushd ${DIRECTORY}
4242

4343
# build the docs
44-
mvn site
45-
mvn site:stage -DtopSiteURL=https://googleapis.dev/java/${NAME}/${VERSION}
44+
mvn site -B
45+
mvn site:stage -B -DtopSiteURL=https://googleapis.dev/java/${NAME}/${VERSION}
4646

4747
pushd target/staging/site/${NAME}/apidocs
4848

@@ -63,4 +63,4 @@ build_and_publish_site() {
6363

6464
# TODO (chingor): split all the artifacts
6565
build_and_publish_site google-api-grpc
66-
build_and_publish_site google-cloud-clients
66+
build_and_publish_site google-cloud-clients

‎.kokoro/release/stage.cfg‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,33 @@ action {
1414
fail_if_no_artifacts: true
1515
}
1616
}
17+
18+
# Fetch the token needed for reporting release status to GitHub
19+
before_action {
20+
fetch_keystore {
21+
keystore_resource {
22+
keystore_config_id: 73713
23+
keyname: "yoshi-automation-github-key"
24+
}
25+
}
26+
}
27+
28+
# Fetch magictoken to use with Magic Github Proxy
29+
before_action {
30+
fetch_keystore {
31+
keystore_resource {
32+
keystore_config_id: 73713
33+
keyname: "releasetool-magictoken"
34+
}
35+
}
36+
}
37+
38+
# Fetch api key to use with Magic Github Proxy
39+
before_action {
40+
fetch_keystore {
41+
keystore_resource {
42+
keystore_config_id: 73713
43+
keyname: "magic-github-proxy-api-key"
44+
}
45+
}
46+
}

‎.kokoro/release/stage.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,28 @@
1515

1616
set -eo pipefail
1717

18+
# Start the releasetool reporter
19+
python3 -m pip install gcp-releasetool
20+
python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
21+
1822
source $(dirname "$0")/common.sh
1923
MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
2024
pushd $(dirname "$0")/../../
2125

2226
setup_environment_secrets
2327
create_settings_xml_file "settings.xml"
2428

29+
AUTORELEASE="false"
30+
if [[ -n "${AUTORELEASE_PR}" ]]
31+
then
32+
AUTORELEASE="true"
33+
fi
34+
2535
mvn clean deploy -B \
2636
-DskipTests=true \
2737
--settings ${MAVEN_SETTINGS_FILE} \
2838
-Dgpg.executable=gpg \
2939
-Dgpg.passphrase=${GPG_PASSPHRASE} \
3040
-Dgpg.homedir=${GPG_HOMEDIR} \
31-
-P release
41+
-P release \
42+
-Ddeploy.autorelease=${AUTORELEASE}

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ This library supports the following Google Cloud Platform services with clients
1717
- [Cloud KMS](google-cloud-clients/google-cloud-kms) (GA)
1818
- [Cloud Natural Language](google-cloud-clients/google-cloud-language) (GA)
1919
- [Cloud Pub/Sub](google-cloud-clients/google-cloud-pubsub) (GA)
20+
- [Cloud Scheduler](google-cloud-clients/google-cloud-scheduler) (GA)
2021
- [Cloud Spanner](google-cloud-clients/google-cloud-spanner) (GA)
2122
- [Cloud Speech](google-cloud-clients/google-cloud-speech) (GA)
2223
- [Cloud Storage](google-cloud-clients/google-cloud-storage) (GA)
@@ -35,7 +36,7 @@ This library supports the following Google Cloud Platform services with clients
3536
- [Cloud Data Loss Prevention](google-cloud-clients/google-cloud-dlp) (Beta)
3637
- [Cloud IoT Core](google-cloud-clients/google-cloud-iot) (Beta)
3738
- [Cloud Phishing Protection](google-cloud-clients/google-cloud-phishingprotection) (Beta)
38-
- [Cloud Scheduler](google-cloud-clients/google-cloud-scheduler) (Beta)
39+
- [Cloud Security Scanner](google-cloud-clients/google-cloud-websecurityscanner) (Beta)
3940
- [Cloud Talent Solution](google-cloud-clients/google-cloud-talent) (Beta)
4041
- [Cloud Text-to-Speech](google-cloud-clients/google-cloud-texttospeech) (Beta)
4142
- [Cloud Video Intelligence](google-cloud-clients/google-cloud-video-intelligence) (Beta)
@@ -57,7 +58,6 @@ This library supports the following Google Cloud Platform services with clients
5758
- [Cloud OS Login](google-cloud-clients/google-cloud-os-login) (Alpha)
5859
- [Cloud Memorystore for Redis](google-cloud-clients/google-cloud-redis) (Alpha)
5960
- [Cloud Resource Manager](google-cloud-clients/google-cloud-resourcemanager) (Alpha)
60-
- [Cloud Security Scanner](google-cloud-clients/google-cloud-websecurityscanner) (Alpha)
6161
- [Cloud Web Risk](google-cloud-clients/google-cloud-webrisk) (Alpha)
6262
- [Dialogflow](google-cloud-clients/google-cloud-dialogflow) (Alpha)
6363

@@ -76,7 +76,7 @@ If you are using Maven, add this to your pom.xml file
7676
<dependency>
7777
<groupId>com.google.cloud</groupId>
7878
<artifactId>google-cloud-bom</artifactId>
79-
<version>0.94.0-alpha</version>
79+
<version>0.95.0-alpha</version>
8080
<type>pom</type>
8181
<scope>import</scope>
8282
</dependency>
@@ -95,11 +95,11 @@ If you are using Maven, add this to your pom.xml file
9595
[//]: # ({x-version-update-start:google-cloud-storage:released})
9696
If you are using Gradle, add this to your dependencies
9797
```Groovy
98-
compile 'com.google.cloud:google-cloud-storage:1.76.0'
98+
compile 'com.google.cloud:google-cloud-storage:1.77.0'
9999
```
100100
If you are using SBT, add this to your dependencies
101101
```Scala
102-
libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.76.0"
102+
libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.77.0"
103103
```
104104
[//]: # ({x-version-update-end})
105105

@@ -120,7 +120,7 @@ If you are running into problems with version conflicts, the easiest way to solv
120120
<dependency>
121121
<groupId>com.google.cloud</groupId>
122122
<artifactId>google-cloud-bom</artifactId>
123-
<version>0.94.0-alpha</version>
123+
<version>0.95.0-alpha</version>
124124
<type>pom</type>
125125
<scope>import</scope>
126126
</dependency>

‎RELEASING.md‎

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,15 @@ need python 3.6+ to run this tool.
1919
3. Verify that all unit and integration tests for the last commit have passed.
2020

2121
4. Run `releasetool start`. Select "minor" or "patch" for the release type. This will bump the
22-
artifact versions, ask you to edit release notes, and create the release pull request.
22+
artifact versions, ask you to edit release notes, and create the release pull request. When
23+
prompted, select yes for autorelease.
2324

2425
**Note:** be sure to make these notes nice as they will be used for the release notes as well.
2526

26-
## Pushing a release to Maven using Kokoro
27+
5. When tests pass on the release PR and you have a review from a code owner, merge the release PR.
28+
This will trigger automation to stage and release google-cloud-java.
2729

28-
To manually publish the artifacts to Maven (rather than using Kokoro), you will need to follow the
29-
"Additional setup for manual publishing" steps below and follow the instructions in the
30-
"Manually publishing" section.
31-
32-
1. Trigger the `google-cloud-java/release/stage` Kokoro job and wait for it to complete. This will
33-
stage the built artifacts and prepare them for publishing.
34-
35-
2. Look through the logs for the `google-cloud-java/release/stage` and find the staging repository
36-
ids used. They will look like `comgoogleapi-XYZ` and `comgooglecloud-XYZ`.
37-
38-
3. Promote or drop the staged repository.
39-
40-
a. To publish the staged repository, trigger the `google-cloud-java/release/promote` Kokoro job for
41-
each staging repository. To specify the staging repository, add an environment variable
42-
configuration with `STAGING_REPOSITORY_ID=<staging repository id>` from the UI. **Note: thi
43-
will need to be run for each staging repository. It may take a few hours for the released
44-
versions to be available for users to download.**
45-
46-
b. To drop (abort) the staged repository, trigger the `google-cloud-java/release/drop` Kokoro job
47-
with the same staging repository id configuration as if you were publishing.
48-
49-
## Publish Javadoc
50-
51-
1. Run `git clean -x -f -d` to put the repo in a clean state.
52-
53-
2. Locally build the repo by running `mvn install -DskipTests`.
54-
55-
3. Run `python utilities/stage_sites.py`. This script checks out `gh-pages` branch of the
56-
repository, builds the documentation site and javadocs, copies them to the branch and commits it.
57-
This script does not push the docs and it must be done manually on the later step. The script
58-
assumes that there is no directory called `tmp_gh-pages` in the repository root. If it is
59-
present, remove it before running the script.
60-
61-
4. Run `cd tmp_gh-pages && git push && cd ..`.
62-
63-
5. (Optional) Run `rm -rf tmp_gh-pages` to remove the generated docs directory from your local
64-
machine.
65-
66-
## Tag the release
67-
68-
1. Run `releasetool tag` to publish a release on Github. It will list the last few merged PRs.
69-
Select the newly merged release PR. Releasetool will create the GitHub release with notes
70-
extracted from the pull request and tag the new release.
30+
6. After the artifacts have been pushed, automation will publish the javadocs to googleapis.dev
7131

7232
## Prepare the next snapshot version
7333

‎google-api-grpc/grpc-google-cloud-asset-v1/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>grpc-google-cloud-asset-v1</artifactId>
6-
<version>0.59.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-asset-v1:current} -->
6+
<version>0.60.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-asset-v1:current} -->
77
<name>grpc-google-cloud-asset-v1</name>
88
<description>GRPC library for grpc-google-cloud-asset-v1</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.59.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.60.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

0 commit comments

Comments
 (0)