Skip to content

Commit 2182970

Browse files
dpebotdpebot
authored
Auto-update dependencies. (GoogleCloudPlatform#636)
* Auto-update dependencies. * Roll back speech & Vision due to weird GAX issues. Fix for GA Datastore, Storage, and more. * Fix pom.xml Downgrade to prior version.
1 parent 91547b7 commit 2182970

File tree

49 files changed

+163
-165
lines changed

Some content is hidden

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

49 files changed

+163
-165
lines changed

‎appengine/endpoints-frameworks-v2/backend/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333

34-
<endpoints.framework.version>2.0.6</endpoints.framework.version>
34+
<endpoints.framework.version>2.0.7</endpoints.framework.version>
3535
<endpoints.management.version>1.0.3</endpoints.management.version>
3636

3737
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>

‎appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
<dependency>
6565
<groupId>com.fasterxml.jackson.core</groupId>
6666
<artifactId>jackson-core</artifactId>
67-
<version>2.9.0.pr2</version>
67+
<version>2.9.0.pr3</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>com.fasterxml.jackson.core</groupId>
7171
<artifactId>jackson-databind</artifactId>
72-
<version>2.9.0.pr2</version>
72+
<version>2.9.0.pr3</version>
7373
</dependency>
7474

7575
<!-- Test Dependencies -->

‎bigquery/cloud-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-bigquery</artifactId>
40-
<version>0.13.0-beta</version>
40+
<version>0.17.1-beta</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>commons-cli</groupId>
4444
<artifactId>commons-cli</artifactId>
45-
<version>1.3.1</version>
45+
<version>1.4</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>joda-time</groupId>

‎compute/cmdline/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ limitations under the License.
8989
</dependency>
9090
</dependencies>
9191
<properties>
92-
<project.compute.version>v1-rev143-1.22.0</project.compute.version>
92+
<project.compute.version>v1-rev144-1.22.0</project.compute.version>
9393
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9494
</properties>
9595
</project>

‎datastore/cloud-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-datastore</artifactId>
40-
<version>0.13.0-beta</version>
40+
<version>1.0.0</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

‎datastore/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>0.13.0-beta</version>
44+
<version>1.0.0</version>
4545
</dependency>
4646

4747
<!-- Test dependencies -->

‎datastore/src/main/java/com/google/datastore/snippets/TaskList.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.google.datastore.snippets;
1818

19+
import com.google.cloud.Timestamp;
1920
import com.google.cloud.datastore.Datastore;
2021
import com.google.cloud.datastore.DatastoreOptions;
21-
import com.google.cloud.datastore.DateTime;
2222
import com.google.cloud.datastore.Entity;
2323
import com.google.cloud.datastore.Key;
2424
import com.google.cloud.datastore.KeyFactory;
@@ -57,7 +57,7 @@ Key addTask(String description) {
5757
Key key = datastore.allocateId(keyFactory.newKey());
5858
Entity task = Entity.newBuilder(key)
5959
.set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build())
60-
.set("created", DateTime.now())
60+
.set("created", Timestamp.now())
6161
.set("done", false)
6262
.build();
6363
datastore.put(task);
@@ -131,7 +131,7 @@ static List<String> formatTasks(Iterator<Entity> tasks) {
131131
String.format("%d : %s (done)", task.getKey().getId(), task.getString("description")));
132132
} else {
133133
strings.add(String.format("%d : %s (created %s)", task.getKey().getId(),
134-
task.getString("description"), task.getDateTime("created")));
134+
task.getString("description"), task.getTimestamp("created")));
135135
}
136136
}
137137
return strings;

‎datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import static org.junit.Assert.assertNotNull;
2424
import static org.junit.Assert.assertNull;
2525

26+
import com.google.cloud.Timestamp;
2627
import com.google.cloud.datastore.Cursor;
2728
import com.google.cloud.datastore.Datastore;
2829
import com.google.cloud.datastore.DatastoreException;
29-
import com.google.cloud.datastore.DateTime;
3030
import com.google.cloud.datastore.Entity;
3131
import com.google.cloud.datastore.EntityQuery;
3232
import com.google.cloud.datastore.FullEntity;
@@ -51,7 +51,6 @@
5151
import com.google.common.collect.ImmutableSet;
5252
import com.google.common.collect.Iterators;
5353

54-
import org.joda.time.Duration;
5554
import org.junit.AfterClass;
5655
import org.junit.Before;
5756
import org.junit.BeforeClass;
@@ -60,6 +59,7 @@
6059
import org.junit.rules.ExpectedException;
6160
import org.junit.runner.RunWith;
6261
import org.junit.runners.JUnit4;
62+
import org.threeten.bp.Duration;
6363

6464
import java.io.IOException;
6565
import java.util.ArrayList;
@@ -88,9 +88,9 @@ public class ConceptsTest {
8888
private KeyFactory keyFactory;
8989
private Key taskKey;
9090
private Entity testEntity;
91-
private DateTime startDate;
92-
private DateTime endDate;
93-
private DateTime includedDate;
91+
private Timestamp startDate;
92+
private Timestamp endDate;
93+
private Timestamp includedDate;
9494

9595
@Rule
9696
public ExpectedException thrown = ExpectedException.none();
@@ -121,11 +121,11 @@ public void setUp() {
121121
testEntity = Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build();
122122
Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
123123
calendar.set(1990, JANUARY, 1);
124-
startDate = DateTime.copyFrom(calendar);
124+
startDate = Timestamp.of(calendar.getTime());
125125
calendar.set(2000, JANUARY, 1);
126-
endDate = DateTime.copyFrom(calendar);
126+
endDate = Timestamp.of(calendar.getTime());
127127
calendar.set(1999, DECEMBER, 31);
128-
includedDate = DateTime.copyFrom(calendar);
128+
includedDate = Timestamp.of(calendar.getTime());
129129
}
130130

131131
/**
@@ -136,7 +136,7 @@ public void setUp() {
136136
*/
137137
@AfterClass
138138
public static void afterClass() throws IOException, InterruptedException, TimeoutException {
139-
HELPER.stop(Duration.standardMinutes(1));
139+
HELPER.stop(Duration.ofMinutes(1));
140140
}
141141

142142
private void assertValidKey(Key taskKey) {
@@ -209,7 +209,7 @@ public void testProperties() {
209209
// [START properties]
210210
Entity task = Entity.newBuilder(taskKey)
211211
.set("category", "Personal")
212-
.set("created", DateTime.now())
212+
.set("created", Timestamp.now())
213213
.set("done", false)
214214
.set("priority", 4)
215215
.set("percent_complete", 10.0)
@@ -752,7 +752,7 @@ public void testExplodingProperties() {
752752
Entity task = Entity.newBuilder(taskKey)
753753
.set("tags", "fun", "programming", "learn")
754754
.set("collaborators", "alice", "bob", "charlie")
755-
.set("created", DateTime.now())
755+
.set("created", Timestamp.now())
756756
.build();
757757
// [END exploding_properties]
758758
assertValidEntity(task);

‎flexible/analytics/pom.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,12 @@
3131
<maven.compiler.target>1.8</maven.compiler.target>
3232
<maven.compiler.source>1.8</maven.compiler.source>
3333

34-
<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
35-
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
34+
<appengine.maven.plugin>1.3.0</appengine.maven.plugin>
35+
<jetty>9.4.4.v20170414</jetty>
3636

3737
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
3838
</properties>
3939

40-
<prerequisites> <!-- Optional, but suggested -->
41-
<maven>3.3.9</maven> <!-- Recommended minimum maven version -->
42-
</prerequisites>
43-
4440
<dependencies>
4541
<dependency>
4642
<groupId>org.apache.httpcomponents</groupId>
@@ -70,7 +66,7 @@
7066
<plugin>
7167
<groupId>org.eclipse.jetty</groupId>
7268
<artifactId>jetty-maven-plugin</artifactId>
73-
<version>${jetty.maven.plugin}</version>
69+
<version>${jetty}</version>
7470
</plugin>
7571
</plugins>
7672
</build>

‎flexible/async-rest/pom.xml‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,20 @@
3131
<properties>
3232
<places.appkey>YOUR_PLACES_APP_KEY</places.appkey>
3333

34-
<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
35-
<jetty.version>9.3.8.v20160314</jetty.version>
34+
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
35+
36+
<appengine.maven.plugin>1.3.0</appengine.maven.plugin>
37+
<jetty>9.4.4.v20170414</jetty>
3638

3739
<maven.compiler.target>1.8</maven.compiler.target>
3840
<maven.compiler.source>1.8</maven.compiler.source>
39-
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
4041
</properties>
4142
<build>
4243
<plugins>
4344
<plugin>
4445
<groupId>org.eclipse.jetty</groupId>
4546
<artifactId>jetty-maven-plugin</artifactId>
46-
<version>${jetty.version}</version>
47+
<version>${jetty}</version>
4748
<configuration>
4849
<systemProperties>
4950
<systemProperty>
@@ -58,39 +59,23 @@
5859
<artifactId>appengine-maven-plugin</artifactId>
5960
<version>${appengine.maven.plugin}</version>
6061
</plugin>
61-
<plugin>
62-
<groupId>org.apache.maven.plugins</groupId>
63-
<artifactId>maven-war-plugin</artifactId>
64-
<version>2.6</version>
65-
<configuration>
66-
<archiveClasses>true</archiveClasses>
67-
<failOnMissingWebXml>false</failOnMissingWebXml>
68-
<webResources>
69-
<resource>
70-
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
71-
<filtering>true</filtering>
72-
<targetPath>WEB-INF</targetPath>
73-
</resource>
74-
</webResources>
75-
</configuration>
76-
</plugin>
7762
</plugins>
7863
</build>
7964
<dependencies>
8065
<dependency>
8166
<groupId>org.eclipse.jetty</groupId>
8267
<artifactId>jetty-client</artifactId>
83-
<version>${jetty.version}</version>
68+
<version>${jetty}</version>
8469
</dependency>
8570
<dependency>
8671
<groupId>org.eclipse.jetty</groupId>
8772
<artifactId>jetty-util-ajax</artifactId>
88-
<version>${jetty.version}</version>
73+
<version>${jetty}</version>
8974
</dependency>
9075
<dependency>
9176
<groupId>org.eclipse.jetty</groupId>
9277
<artifactId>jetty-webapp</artifactId>
93-
<version>${jetty.version}</version>
78+
<version>${jetty}</version>
9479
<scope>test</scope>
9580
</dependency>
9681
<dependency>

0 commit comments

Comments
 (0)