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

Auto-update dependencies. #1467

Merged
merged 8 commits into from
Jun 14, 2019
Merged

Auto-update dependencies. #1467

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d92378
Auto-update dependencies.
dpebot Jun 12, 2019
23651d8
Rollback
averikitsch Jun 12, 2019
f4f038c
Auto-update dependencies.
dpebot Jun 13, 2019
dda48e9
Merged
averikitsch Jun 13, 2019
fd863cd
Fix merge errors
averikitsch Jun 13, 2019
97a10a9
Rollback
averikitsch Jun 13, 2019
50acd99
Fix tests
averikitsch Jun 13, 2019
aad8cbb
Fix test
averikitsch Jun 13, 2019
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
10 changes: 5 additions & 5 deletions appengine-java11/appengine-simple-jetty-main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,30 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.18.v20190429</version>
<version>9.4.19.v20190610</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.18.v20190429</version>
<version>9.4.19.v20190610</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>9.4.18.v20190429</version>
<version>9.4.19.v20190610</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>9.4.18.v20190429</version>
<version>9.4.19.v20190610</version>
<type>jar</type>
</dependency>
<!-- extra explicit dependency needed because there is a JSP in the sample-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>9.4.18.v20190429</version>
<version>9.4.19.v20190610</version>
</dependency>
</dependencies>
<!-- [END gae_java11_server_dependencies] -->
Expand Down
4 changes: 2 additions & 2 deletions appengine-java11/cloudsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@
<dependency>
<groupId>com.google.cloud.sql</groupId>
<artifactId>mysql-socket-factory-connector-j-8</artifactId>
<version>1.0.12</version>
<version>1.0.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/gaeinfo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Copyright 2019 Google LLC
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.12.1</version>
<version>4.0.0-RC1</version>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/guestbook-cloud-firestore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore</artifactId>
<version>0.81.0-beta</version>
<version>1.7.0</version>
<scope>provided</scope>
</dependency>
<!-- [END gae_java11_firestore_pom] -->
Expand Down
12 changes: 6 additions & 6 deletions appengine-java11/kotlin-ktor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,32 @@ limitations under the License.
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>1.3.30</version>
<version>1.3.31</version>
</dependency>
<dependency>
<groupId>io.ktor</groupId>
<artifactId>ktor-server-netty</artifactId>
<version>1.1.3</version>
<version>1.2.1-1.3.40-eap-67</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.3.0-alpha4</version>
</dependency>
<dependency>
<groupId>io.ktor</groupId>
<artifactId>ktor-server-core</artifactId>
<version>1.1.3</version>
<version>1.2.1-1.3.40-eap-67</version>
</dependency>
<dependency>
<groupId>io.ktor</groupId>
<artifactId>ktor-server-host-common</artifactId>
<version>1.1.3</version>
<version>1.2.1-1.3.40-eap-67</version>
</dependency>
<dependency>
<groupId>io.ktor</groupId>
<artifactId>ktor-server-tests</artifactId>
<version>1.1.3</version>
<version>1.2.1-1.3.40-eap-67</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java11/micronaut-helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.3.0-alpha4</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand All @@ -102,7 +102,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<version>4.13-beta-3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java11/oauth2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
<version>1.29.0</version>
<version>1.30.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-servlet</artifactId>
<version>1.29.0</version>
<version>1.30.1</version>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/spanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>1.7.0</version>
<version>1.22.0</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions appengine-java11/sparkjava-helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ limitations under the License.
<dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13-beta-3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/springboot-helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.5.RELEASE</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions appengine-java11/tasks-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ limitations under the License.
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.5.RELEASE</version>
<exclusions>
<!-- Exclude the Tomcat dependency -->
<exclusion>
Expand All @@ -74,7 +74,7 @@ limitations under the License.
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.5.RELEASE</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/tasks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Copyright 2019 Google LLC
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-tasks</artifactId>
<version>0.87.0-beta</version>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>
<!-- [END gae_java11_task_pom] -->
Expand Down
10 changes: 5 additions & 5 deletions appengine-java11/vertx-helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ limitations under the License.
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>3.6.3</version>
<version>3.7.1</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web</artifactId>
<version>3.6.3</version>
<version>3.7.1</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-client</artifactId>
<version>3.6.3</version>
<version>3.7.1</version>
</dependency>

<dependency>
Expand All @@ -63,12 +63,12 @@ limitations under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13-beta-3</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
<version>3.6.3</version>
<version>3.7.1</version>
</dependency>
</dependencies>
<build>
Expand Down
14 changes: 7 additions & 7 deletions appengine-java8/analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<appengine.sdk.version>1.9.73</appengine.sdk.version>
<appengine.sdk.version>1.9.75</appengine.sdk.version>
</properties>

<dependencies>
<!-- Compile/runtime dependencies -->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.73</version>
<version>1.9.75</version>
</dependency>

<dependency>
Expand All @@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.8</version>
<version>4.5.9</version>
</dependency>

<dependency>
Expand All @@ -74,20 +74,20 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>1.9.73</version>
<version>1.9.75</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13-beta-2</version>
<version>4.13-beta-3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.27.0</version>
<version>2.28.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -98,7 +98,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.44</version>
<version>0.45</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions appengine-java8/appidentity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.73</version>
<version>1.9.75</version>
</dependency>

<dependency>
Expand All @@ -66,20 +66,20 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>1.9.73</version>
<version>1.9.75</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>1.9.73</version>
<version>1.9.75</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13-beta-2</version>
<version>4.13-beta-3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -91,13 +91,13 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>1.9.73</version>
<version>1.9.75</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.44</version>
<version>0.45</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading