Skip to content

Commit f5a8402

Browse files
alixhamialixhami
authored
---
yaml --- r: 9739 b: refs/heads/spanner-gapic-migration c: 70adcab h: refs/heads/master i: 9737: b49ac6b 9735: 51ff487
1 parent 2b0060f commit f5a8402

629 files changed

Lines changed: 22479 additions & 113387 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.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ refs/tags/v0.34.0: bf31760a31a66acb239322a70dcd03dbe1d0c7ca
8080
refs/tags/v0.35.0: c28951c5f4cc97a1be07900d19df6984115a4bd6
8181
refs/tags/v0.36.0: 6b75c61f73e6827b3ca379bd54f88f750290162f
8282
refs/tags/v0.37.0: db2e142f92601709fdd48db159776f905742e30f
83-
refs/heads/spanner-gapic-migration: 277eebc2d3abd73fa376a1d6f39fcb93a9f0335d
83+
refs/heads/spanner-gapic-migration: 70adcab22e9bca56bc4130cd7db3e4697f878d41
8484
refs/tags/v0.38.0: c235ee4df5e1248e1769dae3f86a0d7ab7fd8301
8585
refs/tags/v0.39.0: ab231c9d22475242a43d6d9554aa4a3f736dab01
8686
refs/tags/v0.40.0: a1d5b05206cce7734365f1b910396a2c9d6605ec

‎branches/spanner-gapic-migration/README.md‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ This library supports the following Google Cloud Platform services with clients
3333
- [Cloud Video Intelligence](google-cloud-clients/google-cloud-video-intelligence) (Beta)
3434
- [Stackdriver Trace](google-cloud-clients/google-cloud-trace) (Beta)
3535
- [Text-to-Speech](google-cloud-clients/google-cloud-texttospeech) (Beta)
36+
- [IoT](google-cloud-clients/google-cloud-iot) (Beta)
3637

3738
This library supports the following Google Cloud Platform services with clients at an [Alpha](#versioning) quality level:
3839

@@ -43,6 +44,7 @@ This library supports the following Google Cloud Platform services with clients
4344
- [Cloud Resource Manager](google-cloud-clients/google-cloud-resourcemanager) (Alpha)
4445
- [Cloud Speech](google-cloud-clients/google-cloud-speech) (Alpha)
4546
- [Dialogflow](google-cloud-clients/google-cloud-dialogflow) (Alpha)
47+
- [Web Security Scanner](google-cloud-clients/google-cloud-websecurityscanner) (Alpha)
4648

4749
These libraries are deprecated and no longer receive updates:
4850

@@ -51,32 +53,27 @@ These libraries are deprecated and no longer receive updates:
5153
Quickstart
5254
----------
5355

54-
The easy way to get started is to add the umbrella package which pulls in all of the supported clients as
55-
dependencies. Note that even though the version of the umbrella package is Alpha, the individual clients are
56-
at different support levels (Alpha, Beta, and GA).
56+
To call any of the supported Google Cloud Services simply add a corresponding client library artifact as a dependency to your project. The following instructions use `google-cloud-storage` as an example (specific instructions can be found in the README of each client).
5757

58-
[//]: # ({x-version-update-start:google-cloud:released})
58+
[//]: # ({x-version-update-start:google-cloud-storage:released})
5959
If you are using Maven, add this to your pom.xml file
6060
```xml
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
63-
<artifactId>google-cloud</artifactId>
64-
<version>0.47.0-alpha</version>
63+
<artifactId>google-cloud-storage</artifactId>
64+
<version>1.30.0</version>
6565
</dependency>
6666
```
6767
If you are using Gradle, add this to your dependencies
6868
```Groovy
69-
compile 'com.google.cloud:google-cloud:0.47.0-alpha'
69+
compile 'com.google.cloud:google-cloud-storage:1.30.0'
7070
```
7171
If you are using SBT, add this to your dependencies
7272
```Scala
73-
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.47.0-alpha"
73+
libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0"
7474
```
7575
[//]: # ({x-version-update-end})
7676

77-
It also works just as well to declare a dependency only on the specific clients that you need. See the README of
78-
each client for instructions.
79-
8077
If you're using IntelliJ or Eclipse, you can add client libraries to your project using these IDE plugins:
8178
* [Cloud Tools for IntelliJ](https://cloud.google.com/tools/intellij/docs/client-libraries)
8279
* [Cloud Tools for Eclipse](https://cloud.google.com/eclipse/docs/libraries)
@@ -294,7 +291,7 @@ The easiest way to solve version conflicts is to use google-cloud's BOM. In Mave
294291
<dependency>
295292
<groupId>com.google.cloud</groupId>
296293
<artifactId>google-cloud-bom</artifactId>
297-
<version>0.47.0-alpha</version>
294+
<version>0.48.0-alpha</version>
298295
<type>pom</type>
299296
<scope>import</scope>
300297
</dependency>
@@ -361,4 +358,4 @@ Apache 2.0 - See [LICENSE] for more information.
361358
362359
[cloud-platform]: https://cloud.google.com/
363360
[cloud-platform-docs]: https://cloud.google.com/docs/
364-
[client-lib-docs]: http://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/
361+
[client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html

‎branches/spanner-gapic-migration/RELEASING.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,27 +91,27 @@ To push a release version
9191

9292
7. To ensure a clean build, remove *all* Maven targets (including subdirectories not handled by `mvn clean`) by running `rm -rf target */target`.
9393

94-
8. Run `utilities/stage_release.sh`.
95-
This script builds and stages the release artifact on the Maven Central Repository, updates the README.md files with the release version + commits them locally, and finally generates a new site version for the gh-pages branch under a temporary directory named `tmp_gh-pages`. If you haven't run the release process before, it's worth verifying everything; check the staged release on the Sonatype website, and verify that the local commits have the right version updates.
94+
8. Run `python utilities/stage_sites.py`.
95+
This script checks out `gh-pages` branch of the repository, builds the documentation site and javadocs, copies them to the branch and commits it. This script does not push the docs and it must be done manually on the later step. The script assumes that there is no directory called `tmp_gh-pages` in the repository root, remove that directory, if exists, before running the script.
9696

97-
If you experience failures, you may need to:
98-
- repeat the clean step above
99-
- remove the temporary directory created to store docs by running `rm -rf tmp_gh-pages`
100-
- remove staged repositories from Sonatype (to prevent them from being released in subsequent steps): if a staged repository appears [here](https://oss.sonatype.org/#nexus-search;quick~com.google.cloud), remove it by running `mvn nexus-staging:drop`.
97+
9. Check that you are not trying to release a SNAPSHOT build (the artifacts versions do not have "-SNAPSHOT" suffix) and then run `mvn clean deploy -DskipTests=true --settings ~/.m2/settings.xml -P release` command. It will build and deploy artifacts to the staging repository.
10198

102-
9. Run `utilities/finalize_release.sh`.
103-
This script will release the staged artifact on the Maven Central Repository and push the README.md and gh-pages updates to github.
99+
10. Run `mvn nexus-staging:release` to release the artifacts.
104100

105-
10. Publish a release on Github manually.
101+
11. Run `cd tmp_gh-pages && git push && cd ..` to push the previously generated docs (step 8).
102+
103+
12. Run `rm -rf tmp_gh-pages` to remove the generated docs directory from your local machine.
104+
105+
13. Publish a release on Github manually.
106106
Go to the [releases page](https://github.com/GoogleCloudPlatform/google-cloud-java/releases) and open the appropriate release draft. Make sure the "Tag Version" is `vX.Y.Z` and the "Release Title" is `X.Y.Z`, where `X.Y.Z` is the release version as listed in the `pom.xml` files.
107107

108108
Add the commits since the last release into the release draft. Try to group them into sections with related changes. Anything that is a breaking change needs to be marked with `*breaking change*`. Such changes are only allowed for alpha/beta modules and `@BetaApi` features.
109109

110110
Ensure that the format is consistent with previous releases (for an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/google-cloud-java/releases/tag/v0.1.0)). After adding any missing updates and reformatting as necessary, publish the draft.
111111

112-
11. Run `python utilities/bump_versions.py next_snapshot patch` to include "-SNAPSHOT" in the current project version (Alternatively, update the versions in `versions.txt` to the correct versions for the next release.). Then, run `python utilities/replace_versions.py` to update the `pom.xml` files. (If you see updates in `README.md` files at this step, you probably did something wrong.)
112+
14. Run `python utilities/bump_versions.py next_snapshot patch` to include "-SNAPSHOT" in the current project version (Alternatively, update the versions in `versions.txt` to the correct versions for the next release.). Then, run `python utilities/replace_versions.py` to update the `pom.xml` files. (If you see updates in `README.md` files at this step, you probably did something wrong.)
113113

114-
13. Create and merge in another PR to reflect the updated project version.
114+
15. Create and merge in another PR to reflect the updated project version.
115115

116116
Improvements
117117
============

‎branches/spanner-gapic-migration/codacy-conf.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@
698698
},
699699
{
700700
"patternId": "design_FieldDeclarationsShouldBeAtStartOfClass",
701-
"enabled": true
701+
"enabled": false
702702
},
703703
{
704704
"patternId": "unnecessary_UnnecessaryConversionTemporary",
@@ -986,15 +986,15 @@
986986
},
987987
{
988988
"patternId": "unnecessary_UselessParentheses",
989-
"enabled": true
989+
"enabled": false
990990
},
991991
{
992992
"patternId": "design_IdempotentOperations",
993993
"enabled": true
994994
},
995995
{
996996
"patternId": "braces_IfStmtsMustUseBraces",
997-
"enabled": true
997+
"enabled": false
998998
},
999999
{
10001000
"patternId": "strings_UseIndexOfChar",

‎branches/spanner-gapic-migration/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-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-bigquerydatatransfer-v1</artifactId>
6-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerydatatransfer-v1:current} -->
6+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerydatatransfer-v1:current} -->
77
<name>grpc-google-cloud-bigquerydatatransfer-v1</name>
88
<description>GRPC library for grpc-google-cloud-bigquerydatatransfer-v1</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

‎branches/spanner-gapic-migration/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/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-bigtable-admin-v2</artifactId>
6-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
6+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
77
<name>grpc-google-cloud-bigtable-admin-v2</name>
88
<description>GRPC library for grpc-google-cloud-bigtable-admin-v2</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

‎branches/spanner-gapic-migration/google-api-grpc/grpc-google-cloud-bigtable-v2/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-bigtable-v2</artifactId>
6-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
6+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
77
<name>grpc-google-cloud-bigtable-v2</name>
88
<description>GRPC library for grpc-google-cloud-bigtable-v2</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

‎branches/spanner-gapic-migration/google-api-grpc/grpc-google-cloud-container-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-container-v1</artifactId>
6-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
6+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
77
<name>grpc-google-cloud-container-v1</name>
88
<description>GRPC library for grpc-google-cloud-container-v1</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

‎branches/spanner-gapic-migration/google-api-grpc/grpc-google-cloud-dataproc-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-dataproc-v1</artifactId>
6-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dataproc-v1:current} -->
6+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dataproc-v1:current} -->
77
<name>grpc-google-cloud-dataproc-v1</name>
88
<description>GRPC library for grpc-google-cloud-dataproc-v1</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

‎branches/spanner-gapic-migration/google-api-grpc/grpc-google-cloud-dialogflow-v2/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-dialogflow-v2</artifactId>
6-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2:current} -->
6+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2:current} -->
77
<name>grpc-google-cloud-dialogflow-v2</name>
88
<description>GRPC library for grpc-google-cloud-dialogflow-v2</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.12.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.13.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

0 commit comments

Comments
 (0)