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. #636

Merged
merged 4 commits into from
May 1, 2017
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/endpoints-frameworks-v2/backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<endpoints.framework.version>2.0.6</endpoints.framework.version>
<endpoints.framework.version>2.0.7</endpoints.framework.version>
<endpoints.management.version>1.0.3</endpoints.management.version>

<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.0.pr2</version>
<version>2.9.0.pr3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.0.pr2</version>
<version>2.9.0.pr3</version>
</dependency>

<!-- Test Dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions bigquery/cloud-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>0.13.0-beta</version>
<version>0.17.1-beta</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.3.1</version>
<version>1.4</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compute/cmdline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ limitations under the License.
</dependency>
</dependencies>
<properties>
<project.compute.version>v1-rev143-1.22.0</project.compute.version>
<project.compute.version>v1-rev144-1.22.0</project.compute.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
2 changes: 1 addition & 1 deletion datastore/cloud-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>0.13.0-beta</version>
<version>1.0.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 @@ -41,7 +41,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>0.13.0-beta</version>
<version>1.0.0</version>
</dependency>

<!-- Test dependencies -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.google.datastore.snippets;

import com.google.cloud.Timestamp;
import com.google.cloud.datastore.Datastore;
import com.google.cloud.datastore.DatastoreOptions;
import com.google.cloud.datastore.DateTime;
import com.google.cloud.datastore.Entity;
import com.google.cloud.datastore.Key;
import com.google.cloud.datastore.KeyFactory;
Expand Down Expand Up @@ -57,7 +57,7 @@ Key addTask(String description) {
Key key = datastore.allocateId(keyFactory.newKey());
Entity task = Entity.newBuilder(key)
.set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build())
.set("created", DateTime.now())
.set("created", Timestamp.now())
.set("done", false)
.build();
datastore.put(task);
Expand Down Expand Up @@ -131,7 +131,7 @@ static List<String> formatTasks(Iterator<Entity> tasks) {
String.format("%d : %s (done)", task.getKey().getId(), task.getString("description")));
} else {
strings.add(String.format("%d : %s (created %s)", task.getKey().getId(),
task.getString("description"), task.getDateTime("created")));
task.getString("description"), task.getTimestamp("created")));
}
}
return strings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

import com.google.cloud.Timestamp;
import com.google.cloud.datastore.Cursor;
import com.google.cloud.datastore.Datastore;
import com.google.cloud.datastore.DatastoreException;
import com.google.cloud.datastore.DateTime;
import com.google.cloud.datastore.Entity;
import com.google.cloud.datastore.EntityQuery;
import com.google.cloud.datastore.FullEntity;
Expand All @@ -51,7 +51,6 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterators;

import org.joda.time.Duration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
Expand All @@ -60,6 +59,7 @@
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.threeten.bp.Duration;

import java.io.IOException;
import java.util.ArrayList;
Expand Down Expand Up @@ -88,9 +88,9 @@ public class ConceptsTest {
private KeyFactory keyFactory;
private Key taskKey;
private Entity testEntity;
private DateTime startDate;
private DateTime endDate;
private DateTime includedDate;
private Timestamp startDate;
private Timestamp endDate;
private Timestamp includedDate;

@Rule
public ExpectedException thrown = ExpectedException.none();
Expand Down Expand Up @@ -121,11 +121,11 @@ public void setUp() {
testEntity = Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build();
Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
calendar.set(1990, JANUARY, 1);
startDate = DateTime.copyFrom(calendar);
startDate = Timestamp.of(calendar.getTime());
calendar.set(2000, JANUARY, 1);
endDate = DateTime.copyFrom(calendar);
endDate = Timestamp.of(calendar.getTime());
calendar.set(1999, DECEMBER, 31);
includedDate = DateTime.copyFrom(calendar);
includedDate = Timestamp.of(calendar.getTime());
}

/**
Expand All @@ -136,7 +136,7 @@ public void setUp() {
*/
@AfterClass
public static void afterClass() throws IOException, InterruptedException, TimeoutException {
HELPER.stop(Duration.standardMinutes(1));
HELPER.stop(Duration.ofMinutes(1));
}

private void assertValidKey(Key taskKey) {
Expand Down Expand Up @@ -209,7 +209,7 @@ public void testProperties() {
// [START properties]
Entity task = Entity.newBuilder(taskKey)
.set("category", "Personal")
.set("created", DateTime.now())
.set("created", Timestamp.now())
.set("done", false)
.set("priority", 4)
.set("percent_complete", 10.0)
Expand Down Expand Up @@ -752,7 +752,7 @@ public void testExplodingProperties() {
Entity task = Entity.newBuilder(taskKey)
.set("tags", "fun", "programming", "learn")
.set("collaborators", "alice", "bob", "charlie")
.set("created", DateTime.now())
.set("created", Timestamp.now())
.build();
// [END exploding_properties]
assertValidEntity(task);
Expand Down
10 changes: 3 additions & 7 deletions flexible/analytics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,12 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
<appengine.maven.plugin>1.3.0</appengine.maven.plugin>
<jetty>9.4.4.v20170414</jetty>

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
</properties>

<prerequisites> <!-- Optional, but suggested -->
<maven>3.3.9</maven> <!-- Recommended minimum maven version -->
</prerequisites>

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down Expand Up @@ -70,7 +66,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
<version>${jetty}</version>
</plugin>
</plugins>
</build>
Expand Down
31 changes: 8 additions & 23 deletions flexible/async-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,20 @@
<properties>
<places.appkey>YOUR_PLACES_APP_KEY</places.appkey>

<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
<jetty.version>9.3.8.v20160314</jetty.version>
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>1.3.0</appengine.maven.plugin>
<jetty>9.4.4.v20170414</jetty>

<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
</properties>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<version>${jetty}</version>
<configuration>
<systemProperties>
<systemProperty>
Expand All @@ -58,39 +59,23 @@
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.maven.plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<archiveClasses>true</archiveClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
<webResources>
<resource>
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
<filtering>true</filtering>
<targetPath>WEB-INF</targetPath>
</resource>
</webResources>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>${jetty.version}</version>
<version>${jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>${jetty.version}</version>
<version>${jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
<version>${jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions flexible/cloudsql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>1.3.0</appengine.maven.plugin>
<jetty>9.4.4.v20170414</jetty>
<!-- [END_EXCLUDE] -->
<sqlURL>jdbc:mysql://google/${database}?cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}&amp;useSSL=false</sqlURL>
</properties>
Expand All @@ -54,17 +54,17 @@
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>1.21.0</version>
<version>1.22.0</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-appengine</artifactId>
<version>1.21.0</version>
<version>1.22.0</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-servlet</artifactId>
<version>1.21.0</version>
<version>1.22.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -124,7 +124,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
<version>${jetty}</version>
</plugin>
</plugins>
</build>
Expand Down
10 changes: 5 additions & 5 deletions flexible/cloudstorage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>1.3.0</appengine.maven.plugin>
<jetty>9.4.4.v20170414</jetty>
</properties>

<dependencies>
Expand All @@ -49,7 +49,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>0.13.0-beta</version>
<version>1.0.0</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand All @@ -68,7 +68,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
<version>${jetty}</version>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 4 additions & 4 deletions flexible/cron/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>1.3.0</appengine.maven.plugin>
<jetty>9.4.4.v20170414</jetty>
</properties>

<!-- [START dependencies] -->
Expand Down Expand Up @@ -64,7 +64,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
<version>${jetty}</version>
</plugin>
</plugins>
</build>
Expand Down
Loading