Skip to content

Commit 81ca046

Browse files
aozarovaozarov
committed
---
yaml --- r: 6527 b: refs/heads/tswast-patch-1 c: 315a0eb h: refs/heads/master i: 6525: 7ca1d49 6523: 7a4a0a9 6519: b556585 6511: 66c2e50 6495: 7934a65 6463: 3fce4c3 6399: 3fe0ccd
1 parent 07871cd commit 81ca046

19 files changed

Lines changed: 50 additions & 37 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 33119695a9cc05bc7fa0c46fdc1291b2c1a8baf4
60+
refs/heads/tswast-patch-1: 315a0eb44b3bbebdd963f69376f5a4145ded5d7c
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
2525
<dependency>
2626
<groupId>com.google.gcloud</groupId>
2727
<artifactId>gcloud-java</artifactId>
28-
<version>0.0.11</version>
28+
<version>0.0.12</version>
2929
</dependency>
3030
```
3131
If you are using Gradle, add this to your dependencies
3232
```Groovy
33-
compile 'com.google.gcloud:gcloud-java:jar:0.0.11'
33+
compile 'com.google.gcloud:gcloud-java:jar:0.0.12'
3434
```
3535
If you are using SBT, add this to your dependencies
3636
```Scala
37-
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.11"
37+
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
3838
```
3939

4040
Example Applications

‎branches/tswast-patch-1/RELEASING.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ This script takes an optional argument denoting the new version. By default, if
1010
2. Create a PR to update the pom.xml version.
1111
The PR should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225). After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
1212

13-
3. Create a release on Github manually.
13+
3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository. Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR. Be sure that you are not opening the "Pull Request" build logs. When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed. You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number. If the deployment didn't succeed because of a flaky test, rerun the build.
14+
15+
4. Create a release on Github manually.
1416
Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and click "Draft a new release." Use `vX.Y.Z` as the "Tag Version" and `X.Y.Z` as the "Release Title", where `X.Y.Z` is the release version as listed in the `pom.xml` files.
1517

16-
4. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
18+
5. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
1719
As mentioned before, there is an optional version argument. By default, the script will update the version from "X.Y.Z" to "X.Y.Z+1-SNAPSHOT". Suppose a different version is desired, for example X+1.0.0-SNAPSHOT. Then the appropriate command to run would be `utilities/update_pom_version.sh X+1.0.0-SNAPSHOT`.
1820

19-
5. Create and merge in another PR to reflect the updated project version. For an example of what this PR should look like, see [#227](https://github.com/GoogleCloudPlatform/gcloud-java/pull/227).
21+
6. Create and merge in another PR to reflect the updated project version. For an example of what this PR should look like, see [#227](https://github.com/GoogleCloudPlatform/gcloud-java/pull/227).
2022

2123
### To push a snapshot version
2224

‎branches/tswast-patch-1/gcloud-java-core/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
1717
<dependency>
1818
<groupId>com.google.gcloud</groupId>
1919
<artifactId>gcloud-java-core</artifactId>
20-
<version>0.0.11</version>
20+
<version>0.0.12</version>
2121
</dependency>
2222
```
2323
If you are using Gradle, add this to your dependencies
2424
```Groovy
25-
compile 'com.google.gcloud:gcloud-java-core:jar:0.0.11'
25+
compile 'com.google.gcloud:gcloud-java-core:jar:0.0.12'
2626
```
2727
If you are using SBT, add this to your dependencies
2828
```Scala
29-
libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.11"
29+
libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.12"
3030
```
3131

3232
Java Versions

‎branches/tswast-patch-1/gcloud-java-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.gcloud</groupId>
1313
<artifactId>gcloud-java-pom</artifactId>
14-
<version>0.0.12-SNAPSHOT</version>
14+
<version>0.0.13-SNAPSHOT</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>gcloud-java-core</site.installationModule>

‎branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,11 @@ protected static String getAppEngineProjectId() {
450450
try {
451451
Class<?> factoryClass =
452452
Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");
453+
Class<?> serviceClass =
454+
Class.forName("com.google.appengine.api.appidentity.AppIdentityService");
453455
Method method = factoryClass.getMethod("getAppIdentityService");
454456
Object appIdentityService = method.invoke(null);
455-
method = appIdentityService.getClass().getMethod("getServiceAccountName");
457+
method = serviceClass.getMethod("getServiceAccountName");
456458
String serviceAccountName = (String) method.invoke(appIdentityService);
457459
int indexOfAtSign = serviceAccountName.indexOf('@');
458460
return serviceAccountName.substring(0, indexOfAtSign);

‎branches/tswast-patch-1/gcloud-java-datastore/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
2020
<dependency>
2121
<groupId>com.google.gcloud</groupId>
2222
<artifactId>gcloud-java-datastore</artifactId>
23-
<version>0.0.11</version>
23+
<version>0.0.12</version>
2424
</dependency>
2525
```
2626
If you are using Gradle, add this to your dependencies
2727
```Groovy
28-
compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.11'
28+
compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.12'
2929
```
3030
If you are using SBT, add this to your dependencies
3131
```Scala
32-
libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.11"
32+
libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.12"
3333
```
3434

3535
Example Application

‎branches/tswast-patch-1/gcloud-java-datastore/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.gcloud</groupId>
1313
<artifactId>gcloud-java-pom</artifactId>
14-
<version>0.0.12-SNAPSHOT</version>
14+
<version>0.0.13-SNAPSHOT</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>gcloud-java-datastore</site.installationModule>

‎branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
/**
1818
* A client to the Google Cloud Datastore.
1919
*
20-
* <p>A simple usage example:
20+
* <p>Here's a simple usage example for using gcloud-java from App/Compute Engine:
2121
* <pre> {@code
22-
* DatastoreOptions options = DatastoreOptions.builder().projectId(PROJECT_ID).build();
23-
* Datastore datastore = options.service();
22+
* Datastore datastore = DatastoreOptions.defaultInstance().service();
2423
* KeyFactory keyFactory = datastore.newKeyFactory().kind(kind);
2524
* Key key = keyFactory.newKey(keyName);
2625
* Entity entity = datastore.get(key);
@@ -47,6 +46,11 @@
4746
* }
4847
* } </pre>
4948
*
49+
* <p>When using gcloud-java from outside of App/Compute Engine, you have to <a
50+
* href="https://github.com/GoogleCloudPlatform/gcloud-java#specifying-a-project-id">specify a
51+
* project ID</a> and
52+
* <a href="https://github.com/GoogleCloudPlatform/gcloud-java#authentication">provide
53+
* credentials</a>.
5054
* @see <a href="https://cloud.google.com/datastore/">Google Cloud Datastore</a>
5155
*/
5256
package com.google.gcloud.datastore;

‎branches/tswast-patch-1/gcloud-java-examples/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
1717
<dependency>
1818
<groupId>com.google.gcloud</groupId>
1919
<artifactId>gcloud-java-examples</artifactId>
20-
<version>0.0.11</version>
20+
<version>0.0.12</version>
2121
</dependency>
2222
```
2323
If you are using Gradle, add this to your dependencies
2424
```Groovy
25-
compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.11'
25+
compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.12'
2626
```
2727
If you are using SBT, add this to your dependencies
2828
```Scala
29-
libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.11"
29+
libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.12"
3030
```
3131

3232
To run examples from your command line:

0 commit comments

Comments
 (0)