Skip to content

Commit 9ac6a82

Browse files
committed
Merge pull request #782 from mderka/merge-master
Merge master
2 parents 17442b0 + e946b76 commit 9ac6a82

File tree

100 files changed

+2772
-1197
lines changed

Some content is hidden

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

100 files changed

+2772
-1197
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ If you are using Maven, add this to your pom.xml file
3030
<dependency>
3131
<groupId>com.google.gcloud</groupId>
3232
<artifactId>gcloud-java</artifactId>
33-
<version>0.1.4</version>
33+
<version>0.1.5</version>
3434
</dependency>
3535
```
3636
If you are using Gradle, add this to your dependencies
3737
```Groovy
38-
compile 'com.google.gcloud:gcloud-java:0.1.4'
38+
compile 'com.google.gcloud:gcloud-java:0.1.5'
3939
```
4040
If you are using SBT, add this to your dependencies
4141
```Scala
42-
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.4"
42+
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.5"
4343
```
4444

4545
Example Applications

gcloud-java-bigquery/README.md

Lines changed: 4 additions & 4 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.5</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.5'
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.5"
3535
```
3636

3737
Example Application
@@ -185,7 +185,7 @@ Then add the following code to run the query and wait for the result:
185185
QueryRequest queryRequest =
186186
QueryRequest.builder("SELECT * FROM my_dataset_id.my_table_id")
187187
.maxWaitTime(60000L)
188-
.maxResults(1000L)
188+
.pageSize(1000L)
189189
.build();
190190
// Request query to be executed and wait for results
191191
QueryResponse queryResponse = bigquery.query(queryRequest);

gcloud-java-bigquery/pom.xml

Lines changed: 8 additions & 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.6-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<site.installationModule>gcloud-java-bigquery</site.installationModule>
@@ -39,6 +39,13 @@
3939
</exclusion>
4040
</exclusions>
4141
</dependency>
42+
<dependency>
43+
<groupId>${project.groupId}</groupId>
44+
<artifactId>gcloud-java-core</artifactId>
45+
<version>${project.version}</version>
46+
<type>test-jar</type>
47+
<scope>test</scope>
48+
</dependency>
4249
<dependency>
4350
<groupId>junit</groupId>
4451
<artifactId>junit</artifactId>

0 commit comments

Comments
 (0)