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.

Sign up for GitHub

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

Jump to bottom

Auto-update dependencies. #853

Merged
merged 3 commits into from
Sep 20, 2017
Merged

Auto-update dependencies. #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15c0561
Auto-update dependencies.
dpebot Sep 19, 2017
2093dd2
Merge branch 'master' into dpebot-repositorygardener
Sep 19, 2017
51a80cd
fixup stuff.
Sep 20, 2017
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
6 changes: 3 additions & 3 deletions appengine-java8/analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<appengine.sdk.version>1.9.54</appengine.sdk.version>
<appengine.sdk.version>1.9.56</appengine.sdk.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.8.47</version>
<version>2.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -96,7 +96,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.34</version>
<version>0.35</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/appidentity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<appengine.sdk.version>1.9.54</appengine.sdk.version>
<appengine.sdk.version>1.9.56</appengine.sdk.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -95,7 +95,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.34</version>
<version>0.35</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
74 changes: 45 additions & 29 deletions appengine-java8/bigtable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,11 @@ limitations under the License.
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<bigtable.version>0.9.6.2</bigtable.version>
<hbase.version>1.2.4</hbase.version>
<bigtable.version>1.0.0-pre3</bigtable.version>
<hbase.version>1.2.6</hbase.version>
<bigtable.projectID>YOUR_PROJECT_ID</bigtable.projectID>
<bigtable.instanceID>YOUR_INSTANCE_ID</bigtable.instanceID>

<hadoop.version>2.4.1</hadoop.version>
<compat.module>hbase-hadoop2-compat</compat.module>

<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<archiveClasses>true</archiveClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
Expand All @@ -53,16 +50,10 @@ limitations under the License.
<dependencies>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.2</artifactId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>${bigtable.version}</version>
</dependency>

<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
Expand All @@ -88,7 +79,7 @@ limitations under the License.
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.30</version>
<version>0.35</version>
<scope>test</scope>
</dependency>

Expand All @@ -110,20 +101,20 @@ limitations under the License.
<!-- for hot reload of the web application-->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>display-dependency-updates</goal>
<goal>display-plugin-updates</goal>
</goals>
</execution>
</executions>
</plugin>
<!--<plugin>-->
<!--<groupId>org.codehaus.mojo</groupId>-->
<!--<artifactId>versions-maven-plugin</artifactId>-->
<!--<version>2.4</version>-->
<!--<executions>-->
<!--<execution>-->
<!--<phase>compile</phase>-->
<!--<goals>-->
<!--<goal>display-dependency-updates</goal>-->
<!--<goal>display-plugin-updates</goal>-->
<!--</goals>-->
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -142,7 +133,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<configuration>
<archiveClasses>true</archiveClasses>
<webResources>
Expand All @@ -159,7 +150,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>2.20.1</version>
<configuration>
<systemPropertyVariables>
<BIGTABLE_PROJECT>${bigtable.projectID}</BIGTABLE_PROJECT>
Expand All @@ -175,6 +166,31 @@ limitations under the License.
<configuration>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.5.0,)</version>
</requireMavenVersion>
</rules>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
1 change: 1 addition & 0 deletions appengine-java8/bigtable/src/main/webapp/WEB-INF/appengine-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<system-properties>
<property name="BIGTABLE_PROJECT" value="@bigtable.projectID@" />
<property name="BIGTABLE_INSTANCE" value="@bigtable.instanceID@" />
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
</system-properties>
</appengine-web-app>
<!-- [END config] -->
13 changes: 13 additions & 0 deletions appengine-java8/bigtable/src/main/webapp/WEB-INF/logging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# A default java.util.logging configuration.
# (All App Engine logging is through java.util.logging by default).
#
# To use this configuration, copy it into your application's WEB-INF
# folder and add the following to your appengine-web.xml:
#
# <system-properties>
# <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
# </system-properties>
#

# Set the default logging level for all loggers to WARNING
.level = WARNING
2 changes: 1 addition & 1 deletion appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

/** Unit tests for {@link HelloAppEngine}. */
/** Unit tests for {@link BigtableHelloWorld}. */
@RunWith(JUnit4.class)
@SuppressWarnings("checkstyle:abbreviationaswordinname")
public class ITBigtableHelloWorld {
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/cloudsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.54</version>
<version>1.9.56</version>
</dependency>

<dependency>
Expand All @@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.cloud.sql</groupId>
<artifactId>mysql-socket-factory</artifactId> <!-- mysql-socket-factory-connector-j-6 if using 6.x.x -->
<version>1.0.3</version>
<version>1.0.4</version>
</dependency>
<!-- [END dependencies] -->
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/datastore-indexes-exploding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.34</version>
<version>0.35</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/datastore-indexes-perfect/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.34</version>
<version>0.35</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/datastore-indexes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.34</version>
<version>0.35</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>1.4.1</version>
<version>1.5</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.34</version>
<version>0.35</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions appengine-java8/endpoints-v2-backend/pom.xml
View file
Open in desktop
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.7</endpoints.framework.version>
<endpoints.framework.version>2.0.8</endpoints.framework.version>
<endpoints.management.version>1.0.4</endpoints.management.version>

<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
Expand All @@ -50,12 +50,12 @@
<dependency>
<groupId>com.google.endpoints</groupId>
<artifactId>endpoints-management-control-appengine-all</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.54</version>
<version>1.9.56</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
8 changes: 4 additions & 4 deletions appengine-java8/endpoints-v2-guice/pom.xml
View file
Open in desktop
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.7</endpoints.framework.version>
<endpoints.framework.version>2.0.8</endpoints.framework.version>
<endpoints.management.version>1.0.4</endpoints.management.version>

<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
Expand All @@ -55,12 +55,12 @@
<dependency>
<groupId>com.google.endpoints</groupId>
<artifactId>endpoints-management-control-appengine-all</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.54</version>
<version>1.9.56</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -117,7 +117,7 @@
<dependency>
<groupId>com.google.endpoints</groupId>
<artifactId>endpoints-management-control-appengine-all</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/endpoints-v2-migration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ limitations under the License.
<dependency>
<groupId>com.google.endpoints</groupId>
<artifactId>endpoints-framework</artifactId>
<version>2.0.7</version>
<version>2.0.8</version>
</dependency>
<!-- [END endpoints-frameworks] -->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.53</version>
<version>1.9.56</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/firebase-event-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.0.pr4</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.0.pr4</version>
<version>2.9.1</version>
</dependency>

<!-- Test Dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/firebase-tictactoe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<google-api-client.version>1.22.0</google-api-client.version>
<junit.version>4.12</junit.version>
<mockito.version>1.10.19</mockito.version>
<google-truth.version>0.34</google-truth.version>
<google-truth.version>0.35</google-truth.version>
<appengine-maven.version>1.3.1</appengine-maven.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/gaeinfo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Copyright 2017 Google Inc.
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.8.1</version>
<version>3.9.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/guestbook-cloud-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud</artifactId>
<version>0.21.1-alpha</version>
<version>0.24.0-alpha</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/guestbook-objectify/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.34</version>
<version>0.35</version>
<scope>test</scope>
</dependency>

Expand Down
Loading