Skip to content

Commit 5c5f50f

Browse files
mziccardmziccard
committed
---
yaml --- r: 2479 b: refs/heads/update-datastore c: 2ffac2d h: refs/heads/master i: 2477: 968e505 2475: b3293f2 2471: 815b418 2463: e7e6102
1 parent 79abe1e commit 5c5f50f

28 files changed

Lines changed: 359 additions & 125 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: 29d8ec3bc54fcecee40d0cce5c7f945eea3e48a7
8+
refs/heads/update-datastore: 2ffac2db4744375d2c5cbd8e1f84475ffcca4347
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
1010
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
1111
refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2

‎branches/update-datastore/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.12</version>
28+
<version>0.0.11</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.12'
33+
compile 'com.google.gcloud:gcloud-java:jar:0.0.11'
3434
```
3535
If you are using SBT, add this to your dependencies
3636
```Scala
37-
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
37+
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.11"
3838
```
3939

4040
Example Applications

‎branches/update-datastore/RELEASING.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ 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. 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.
13+
3. Create a release on Github manually.
1614
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.
1715

18-
5. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
16+
4. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
1917
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`.
2018

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).
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).
2220

2321
### To push a snapshot version
2422

‎branches/update-datastore/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.12</version>
20+
<version>0.0.11</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.12'
25+
compile 'com.google.gcloud:gcloud-java-core:jar:0.0.11'
2626
```
2727
If you are using SBT, add this to your dependencies
2828
```Scala
29-
libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.12"
29+
libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.11"
3030
```
3131

3232
Java Versions

‎branches/update-datastore/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.13-SNAPSHOT</version>
14+
<version>0.0.12-SNAPSHOT</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>gcloud-java-core</site.installationModule>

‎branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,11 +450,9 @@ 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");
455453
Method method = factoryClass.getMethod("getAppIdentityService");
456454
Object appIdentityService = method.invoke(null);
457-
method = serviceClass.getMethod("getServiceAccountName");
455+
method = appIdentityService.getClass().getMethod("getServiceAccountName");
458456
String serviceAccountName = (String) method.invoke(appIdentityService);
459457
int indexOfAtSign = serviceAccountName.indexOf('@');
460458
return serviceAccountName.substring(0, indexOfAtSign);

‎branches/update-datastore/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.12</version>
23+
<version>0.0.11</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.12'
28+
compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.11'
2929
```
3030
If you are using SBT, add this to your dependencies
3131
```Scala
32-
libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.12"
32+
libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.11"
3333
```
3434

3535
Example Application

‎branches/update-datastore/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.13-SNAPSHOT</version>
14+
<version>0.0.12-SNAPSHOT</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>gcloud-java-datastore</site.installationModule>

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
/**
1818
* A client to the Google Cloud Datastore.
1919
*
20-
* <p>Here's a simple usage example for using gcloud-java from App/Compute Engine:
20+
* <p>A simple usage example:
2121
* <pre> {@code
22-
* Datastore datastore = DatastoreOptions.defaultInstance().service();
22+
* DatastoreOptions options = DatastoreOptions.builder().projectId(PROJECT_ID).build();
23+
* Datastore datastore = options.service();
2324
* KeyFactory keyFactory = datastore.newKeyFactory().kind(kind);
2425
* Key key = keyFactory.newKey(keyName);
2526
* Entity entity = datastore.get(key);
@@ -46,11 +47,6 @@
4647
* }
4748
* } </pre>
4849
*
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>.
5450
* @see <a href="https://cloud.google.com/datastore/">Google Cloud Datastore</a>
5551
*/
5652
package com.google.gcloud.datastore;

‎branches/update-datastore/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.12</version>
20+
<version>0.0.11</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.12'
25+
compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.11'
2626
```
2727
If you are using SBT, add this to your dependencies
2828
```Scala
29-
libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.12"
29+
libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.11"
3030
```
3131

3232
To run examples from your command line:

0 commit comments

Comments
 (0)