Skip to content

Commit 0a97185

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 6965 b: refs/heads/tswast-patch-1 c: ff20847 h: refs/heads/master i: 6963: a20b596
1 parent e746e62 commit 0a97185

45 files changed

Lines changed: 826 additions & 633 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
@@ -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: 7194201bb87f49ae01b231bde0b33ee3d96797f0
60+
refs/heads/tswast-patch-1: ff2084764b6c75612d04a02084f76bd715064b24
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ When changes are made to authentication and project ID-related code, authenticat
3232

3333
Known issue: If you have installed the Google Cloud SDK, be sure to log in (using `gcloud auth login`) before running tests. Though the Datastore tests use a local Datastore emulator that doesn't require authentication, they will not run if you have the Google Cloud SDK installed but aren't authenticated.
3434

35-
**Please, do not use your production projects for executing integration tests.** While we do our best to make our tests independent of your project's state and content, they do perform create, modify and deletes, and you do not want to have your production data accidentally modified.
36-
3735
Adding Features
3836
---------------
3937
In order to add a feature to gcloud-java:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ If you are using Maven, add this to your pom.xml file
2929
<dependency>
3030
<groupId>com.google.gcloud</groupId>
3131
<artifactId>gcloud-java</artifactId>
32-
<version>0.1.4</version>
32+
<version>0.1.3</version>
3333
</dependency>
3434
```
3535
If you are using Gradle, add this to your dependencies
3636
```Groovy
37-
compile 'com.google.gcloud:gcloud-java:0.1.4'
37+
compile 'com.google.gcloud:gcloud-java:0.1.3'
3838
```
3939
If you are using SBT, add this to your dependencies
4040
```Scala
41-
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.4"
41+
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.3"
4242
```
4343

4444
Example Applications

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
2222
<dependency>
2323
<groupId>com.google.gcloud</groupId>
2424
<artifactId>gcloud-java-bigquery</artifactId>
25-
<version>0.1.4</version>
25+
<version>0.1.3</version>
2626
</dependency>
2727
```
2828
If you are using Gradle, add this to your dependencies
2929
```Groovy
30-
compile 'com.google.gcloud:gcloud-java-bigquery:0.1.4'
30+
compile 'com.google.gcloud:gcloud-java-bigquery:0.1.3'
3131
```
3232
If you are using SBT, add this to your dependencies
3333
```Scala
34-
libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.4"
34+
libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.3"
3535
```
3636

3737
Example Application

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.google.gcloud</groupId>
1212
<artifactId>gcloud-java-pom</artifactId>
13-
<version>0.1.5-SNAPSHOT</version>
13+
<version>0.1.4-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<site.installationModule>gcloud-java-bigquery</site.installationModule>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.google.apis</groupId>
3232
<artifactId>google-api-services-bigquery</artifactId>
33-
<version>v2-rev270-1.21.0</version>
33+
<version>v2-rev261-1.21.0</version>
3434
<scope>compile</scope>
3535
<exclusions>
3636
<exclusion>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ If you are using Maven, add this to your pom.xml file
1616
<dependency>
1717
<groupId>com.google.gcloud</groupId>
1818
<artifactId>gcloud-java-contrib</artifactId>
19-
<version>0.1.4</version>
19+
<version>0.1.3</version>
2020
</dependency>
2121
```
2222
If you are using Gradle, add this to your dependencies
2323
```Groovy
24-
compile 'com.google.gcloud:gcloud-java-contrib:0.1.4'
24+
compile 'com.google.gcloud:gcloud-java-contrib:0.1.3'
2525
```
2626
If you are using SBT, add this to your dependencies
2727
```Scala
28-
libraryDependencies += "com.google.gcloud" % "gcloud-java-contrib" % "0.1.4"
28+
libraryDependencies += "com.google.gcloud" % "gcloud-java-contrib" % "0.1.3"
2929
```
3030

3131
Java Versions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.google.gcloud</groupId>
1212
<artifactId>gcloud-java-pom</artifactId>
13-
<version>0.1.5-SNAPSHOT</version>
13+
<version>0.1.4-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<site.installationModule>gcloud-java-contrib</site.installationModule>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
1919
<dependency>
2020
<groupId>com.google.gcloud</groupId>
2121
<artifactId>gcloud-java-core</artifactId>
22-
<version>0.1.4</version>
22+
<version>0.1.3</version>
2323
</dependency>
2424
```
2525
If you are using Gradle, add this to your dependencies
2626
```Groovy
27-
compile 'com.google.gcloud:gcloud-java-core:0.1.4'
27+
compile 'com.google.gcloud:gcloud-java-core:0.1.3'
2828
```
2929
If you are using SBT, add this to your dependencies
3030
```Scala
31-
libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.4"
31+
libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.3"
3232
```
3333

3434
Troubleshooting

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,24 @@
1010
<parent>
1111
<groupId>com.google.gcloud</groupId>
1212
<artifactId>gcloud-java-pom</artifactId>
13-
<version>0.1.5-SNAPSHOT</version>
13+
<version>0.1.4-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<site.installationModule>gcloud-java-core</site.installationModule>
1717
</properties>
1818
<dependencies>
19+
<dependency>
20+
<groupId>com.google.apis</groupId>
21+
<artifactId>google-api-services-cloudresourcemanager</artifactId>
22+
<version>v1beta1-rev10-1.21.0</version>
23+
<scope>compile</scope>
24+
<exclusions>
25+
<exclusion>
26+
<groupId>com.google.guava</groupId>
27+
<artifactId>guava-jdk5</artifactId>
28+
</exclusion>
29+
</exclusions>
30+
</dependency>
1931
<dependency>
2032
<groupId>com.google.auth</groupId>
2133
<artifactId>google-auth-library-credentials</artifactId>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.io.IOException;
2222
import java.io.Serializable;
2323
import java.nio.ByteBuffer;
24-
import java.nio.channels.ClosedChannelException;
2524
import java.util.Arrays;
2625
import java.util.Objects;
2726

@@ -115,9 +114,9 @@ private void flush() {
115114
}
116115
}
117116

118-
private void validateOpen() throws ClosedChannelException {
117+
private void validateOpen() throws IOException {
119118
if (!isOpen) {
120-
throw new ClosedChannelException();
119+
throw new IOException("stream is closed");
121120
}
122121
}
123122

0 commit comments

Comments
 (0)