Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-update dependencies. #997

Merged
merged 3 commits into from
Jan 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appengine-java8/analytics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/cloudsql-postgres/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.1.4.jre7</version>
<version>42.2.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/guestbook-cloud-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud</artifactId>
<version>0.32.0-alpha</version>
<version>0.33.0-alpha</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/pubsub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/remote-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/spanner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appengine/analytics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appengine/remote/remote-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bigquery/cloud-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
<!-- [END dependencies] -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
import com.google.cloud.bigquery.FieldValue;
import com.google.cloud.bigquery.QueryJobConfiguration;
import com.google.cloud.bigquery.QueryParameterValue;
import com.google.cloud.bigquery.QueryResponse;
import com.google.cloud.bigquery.QueryResult;
import com.google.cloud.bigquery.TableResult;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -112,8 +111,7 @@ public static void main(final String[] args) throws IOException, InterruptedExce
// [START bigquery_query_params]
private static void runNamed(final String corpus, final long minWordCount)
throws InterruptedException {
BigQuery bigquery =
new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.getDefaultInstance());
BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();

String queryString =
"SELECT word, word_count\n"
Expand All @@ -131,25 +129,9 @@ private static void runNamed(final String corpus, final long minWordCount)
.build();

// Execute the query.
QueryResponse response = bigquery.query(queryRequest);

// Wait for the job to finish (if the query takes more than 10 seconds to complete).
while (!response.jobCompleted()) {
Thread.sleep(1000);
response = bigquery.getQueryResults(response.getJobId());
}

// Check for errors.
if (response.hasErrors()) {
String firstError = "";
if (response.getExecutionErrors().size() != 0) {
firstError = response.getExecutionErrors().get(0).getMessage();
}
throw new RuntimeException(firstError);
}
TableResult result = bigquery.query(queryRequest);

// Print all pages of the results.
QueryResult result = response.getResult();
while (result != null) {
for (List<FieldValue> row : result.iterateAll()) {
System.out.printf("%s: %d\n", row.get(0).getStringValue(), row.get(1).getLongValue());
Expand All @@ -165,8 +147,7 @@ private static void runNamed(final String corpus, final long minWordCount)
*/
// [START bigquery_query_params_arrays]
private static void runArray(String gender, String[] states) throws InterruptedException {
BigQuery bigquery =
new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.getDefaultInstance());
BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();

String queryString =
"SELECT name, sum(number) as count\n"
Expand All @@ -186,25 +167,9 @@ private static void runArray(String gender, String[] states) throws InterruptedE
.build();

// Execute the query.
QueryResponse response = bigquery.query(queryRequest);

// Wait for the job to finish (if the query takes more than 10 seconds to complete).
while (!response.jobCompleted()) {
Thread.sleep(1000);
response = bigquery.getQueryResults(response.getJobId());
}

// Check for errors.
if (response.hasErrors()) {
String firstError = "";
if (response.getExecutionErrors().size() != 0) {
firstError = response.getExecutionErrors().get(0).getMessage();
}
throw new RuntimeException(firstError);
}
TableResult result = bigquery.query(queryRequest);

// Print all pages of the results.
QueryResult result = response.getResult();
while (result != null) {
for (List<FieldValue> row : result.iterateAll()) {
System.out.printf("%s: %d\n", row.get(0).getStringValue(), row.get(1).getLongValue());
Expand All @@ -217,8 +182,7 @@ private static void runArray(String gender, String[] states) throws InterruptedE

// [START bigquery_query_params_timestamps]
private static void runTimestamp() throws InterruptedException {
BigQuery bigquery =
new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.getDefaultInstance());
BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();

DateTime timestamp = new DateTime(2016, 12, 7, 8, 0, 0, DateTimeZone.UTC);

Expand All @@ -236,25 +200,9 @@ private static void runTimestamp() throws InterruptedException {
.build();

// Execute the query.
QueryResponse response = bigquery.query(queryRequest);

// Wait for the job to finish (if the query takes more than 10 seconds to complete).
while (!response.jobCompleted()) {
Thread.sleep(1000);
response = bigquery.getQueryResults(response.getJobId());
}

// Check for errors.
if (response.hasErrors()) {
String firstError = "";
if (response.getExecutionErrors().size() != 0) {
firstError = response.getExecutionErrors().get(0).getMessage();
}
throw new RuntimeException(firstError);
}
TableResult result = bigquery.query(queryRequest);

// Print all pages of the results.
QueryResult result = response.getResult();
DateTimeFormatter formatter = ISODateTimeFormat.dateTimeNoMillis().withZoneUTC();
while (result != null) {
for (List<FieldValue> row : result.iterateAll()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
import com.google.cloud.bigquery.JobId;
import com.google.cloud.bigquery.JobInfo;
import com.google.cloud.bigquery.QueryJobConfiguration;
import com.google.cloud.bigquery.QueryResponse;
import com.google.cloud.bigquery.QueryResult;
import com.google.cloud.bigquery.TableId;
import com.google.cloud.bigquery.TableResult;
import java.io.IOException;
import java.util.List;
import java.util.UUID;
Expand Down Expand Up @@ -137,8 +136,7 @@ public static void runQuery(QueryJobConfiguration queryConfig)
}

// Get the results.
QueryResponse response = bigquery.getQueryResults(jobId);
QueryResult result = response.getResult();
TableResult result = queryJob.getQueryResults();

// Print all pages of the results.
while (result != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.google.cloud.bigquery.JobInfo;
import com.google.cloud.bigquery.QueryJobConfiguration;
import com.google.cloud.bigquery.QueryResponse;
import com.google.cloud.bigquery.QueryResult;
import com.google.cloud.bigquery.TableResult;
import java.util.UUID;
// [END bigquery_simple_app_deps]

Expand Down Expand Up @@ -71,7 +71,7 @@ public static void main(String... args) throws Exception {
// Get the results.
QueryResponse response = bigquery.getQueryResults(jobId);

QueryResult result = response.getResult();
TableResult result = queryJob.getQueryResults();

// Print all pages of the results.
for (FieldValueList row : result.iterateAll()) {
Expand Down
2 changes: 1 addition & 1 deletion bigquery/datatransfer/cloud-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquerydatatransfer</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
<!-- [END dependencies] -->

Expand Down
2 changes: 1 addition & 1 deletion cloud-tasks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-cloudtasks</artifactId>
<version>v2beta2-rev32-1.23.0</version>
<version>v2beta2-rev35-1.23.0</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dataflow/spanner-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>

<!-- Misc -->
Expand Down
2 changes: 1 addition & 1 deletion datastore/cloud-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>

<!-- Test dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>

<!-- Test dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion dlp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-dlp</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
<!-- [END dlp_maven] -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion errorreporting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-errorreporting</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
<!-- Test dependencies -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion flexible/analytics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flexible/cloud-tasks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-cloudtasks</artifactId>
<version>v2beta2-rev32-1.23.0</version>
<version>v2beta2-rev35-1.23.0</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flexible/cloudstorage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/errorreporting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-errorreporting</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion flexible/postgres/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.1.4.jre7</version>
<version>42.2.0</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions flexible/pubsub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>0.32.0-beta</version>
<version>0.33.0-beta</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>
<!-- [END dependencies] -->

Expand Down
2 changes: 1 addition & 1 deletion flexible/sparkjava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion kms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-cloudkms</artifactId>
<version>v1-rev32-1.23.0</version>
<version>v1-rev33-1.23.0</version>
<exclusions>
<exclusion> <!-- exclude an old version of Guava -->
<groupId>com.google.guava</groupId>
Expand Down
Loading