Skip to content

Commit bc0e519

Browse files
authored
Merge branch 'main' into gce-instance-from-template-samples
2 parents 6ff6644 + 150aa2d commit bc0e519

File tree

193 files changed

+1680
-394
lines changed

Some content is hidden

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

193 files changed

+1680
-394
lines changed

appengine-java11/cloudsql/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>com.google.cloud.sql</groupId>
8181
<artifactId>mysql-socket-factory-connector-j-8</artifactId>
82-
<version>1.3.4</version>
82+
<version>1.4.0</version>
8383
<scope>provided</scope>
8484
</dependency>
8585
<dependency>
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>org.mockito</groupId>
9494
<artifactId>mockito-core</artifactId>
95-
<version>4.0.0</version>
95+
<version>4.1.0</version>
9696
<scope>test</scope>
9797
</dependency>
9898
<dependency>

appengine-java11/gaeinfo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Copyright 2019 Google LLC
5959
<dependency>
6060
<groupId>com.squareup.okhttp3</groupId>
6161
<artifactId>okhttp</artifactId>
62-
<version>4.9.2</version>
62+
<version>4.9.3</version>
6363
<scope>provided</scope>
6464
</dependency>
6565

appengine-java11/kotlin-ktor/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ limitations under the License.
5959
<dependency>
6060
<groupId>io.ktor</groupId>
6161
<artifactId>ktor-bom</artifactId>
62-
<version>1.6.4</version>
62+
<version>1.6.5</version>
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>
@@ -70,7 +70,7 @@ limitations under the License.
7070
<dependency>
7171
<groupId>org.jetbrains.kotlin</groupId>
7272
<artifactId>kotlin-stdlib-jdk8</artifactId>
73-
<version>1.5.31</version>
73+
<version>1.6.0</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>io.ktor</groupId>
@@ -97,7 +97,7 @@ limitations under the License.
9797
<dependency>
9898
<groupId>org.jetbrains.kotlin</groupId>
9999
<artifactId>kotlin-test-junit</artifactId>
100-
<version>1.5.31</version>
100+
<version>1.6.0</version>
101101
<scope>test</scope>
102102
</dependency>
103103

@@ -123,7 +123,7 @@ limitations under the License.
123123
<plugin>
124124
<artifactId>kotlin-maven-plugin</artifactId>
125125
<groupId>org.jetbrains.kotlin</groupId>
126-
<version>1.5.31</version>
126+
<version>1.6.0</version>
127127
<executions>
128128
<execution>
129129
<id>compile</id>

appengine-java11/micronaut-helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<exec.mainClass>com.example.appengine.Application</exec.mainClass>
3434
<maven.compiler.target>11</maven.compiler.target>
3535
<maven.compiler.source>11</maven.compiler.source>
36-
<micronaut.version>3.1.3</micronaut.version>
36+
<micronaut.version>3.2.0</micronaut.version>
3737
</properties>
3838

3939
<dependencies>

appengine-java11/quarkus-helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ limitations under the License.
3232
<surefire-plugin.version>2.22.2</surefire-plugin.version>
3333
<maven.compiler.target>11</maven.compiler.target>
3434
<maven.compiler.source>11</maven.compiler.source>
35-
<quarkus.version>2.4.0.Final</quarkus.version>
35+
<quarkus.version>2.5.0.Final</quarkus.version>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
</properties>
3838

appengine-java11/vertx-helloworld/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ limitations under the License.
4141
<dependency>
4242
<groupId>io.vertx</groupId>
4343
<artifactId>vertx-core</artifactId>
44-
<version>4.2.0</version>
44+
<version>4.2.1</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>io.vertx</groupId>
4848
<artifactId>vertx-web</artifactId>
49-
<version>4.2.0</version>
49+
<version>4.2.1</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>io.vertx</groupId>
5353
<artifactId>vertx-web-client</artifactId>
54-
<version>4.2.0</version>
54+
<version>4.2.1</version>
5555
</dependency>
5656

5757
<dependency>
@@ -68,7 +68,7 @@ limitations under the License.
6868
<dependency>
6969
<groupId>io.vertx</groupId>
7070
<artifactId>vertx-unit</artifactId>
71-
<version>4.2.0</version>
71+
<version>4.2.1</version>
7272
</dependency>
7373
</dependencies>
7474
<build>

appengine-java8/analytics/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
<properties>
3434
<maven.compiler.target>1.8</maven.compiler.target>
3535
<maven.compiler.source>1.8</maven.compiler.source>
36-
<appengine.sdk.version>1.9.91</appengine.sdk.version>
36+
<appengine.sdk.version>1.9.92</appengine.sdk.version>
3737
</properties>
3838

3939
<dependencies>
4040
<!-- Compile/runtime dependencies -->
4141
<dependency>
4242
<groupId>com.google.appengine</groupId>
4343
<artifactId>appengine-api-1.0-sdk</artifactId>
44-
<version>1.9.91</version>
44+
<version>1.9.92</version>
4545
</dependency>
4646

4747
<dependency>
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.google.appengine</groupId>
7676
<artifactId>appengine-api-stubs</artifactId>
77-
<version>1.9.91</version>
77+
<version>1.9.92</version>
7878
<scope>test</scope>
7979
</dependency>
8080

@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>org.mockito</groupId>
8989
<artifactId>mockito-core</artifactId>
90-
<version>4.0.0</version>
90+
<version>4.1.0</version>
9191
<scope>test</scope>
9292
</dependency>
9393
<dependency>

appengine-java8/appidentity/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.91</version>
42+
<version>1.9.92</version>
4343
</dependency>
4444

4545
<dependency>
@@ -66,13 +66,13 @@
6666
<dependency>
6767
<groupId>com.google.appengine</groupId>
6868
<artifactId>appengine-api-stubs</artifactId>
69-
<version>1.9.91</version>
69+
<version>1.9.92</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.appengine</groupId>
7474
<artifactId>appengine-tools-sdk</artifactId>
75-
<version>1.9.91</version>
75+
<version>1.9.92</version>
7676
<scope>test</scope>
7777
</dependency>
7878

@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>com.google.appengine</groupId>
9393
<artifactId>appengine-testing</artifactId>
94-
<version>1.9.91</version>
94+
<version>1.9.92</version>
9595
<scope>test</scope>
9696
</dependency>
9797
<dependency>

appengine-java8/bigquery/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.91</version>
42+
<version>1.9.92</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
@@ -75,13 +75,13 @@
7575
<dependency>
7676
<groupId>com.google.appengine</groupId>
7777
<artifactId>appengine-api-stubs</artifactId>
78-
<version>1.9.91</version>
78+
<version>1.9.92</version>
7979
<scope>test</scope>
8080
</dependency>
8181
<dependency>
8282
<groupId>com.google.appengine</groupId>
8383
<artifactId>appengine-tools-sdk</artifactId>
84-
<version>1.9.91</version>
84+
<version>1.9.92</version>
8585
<scope>test</scope>
8686
</dependency>
8787

@@ -94,13 +94,13 @@
9494
<dependency>
9595
<groupId>org.mockito</groupId>
9696
<artifactId>mockito-core</artifactId>
97-
<version>4.0.0</version>
97+
<version>4.1.0</version>
9898
<scope>test</scope>
9999
</dependency>
100100
<dependency>
101101
<groupId>com.google.appengine</groupId>
102102
<artifactId>appengine-testing</artifactId>
103-
<version>1.9.91</version>
103+
<version>1.9.92</version>
104104
<scope>test</scope>
105105
</dependency>
106106
<dependency>

appengine-java8/bigtable/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ repositories {
4646

4747
dependencies {
4848
compile group: 'com.google.cloud.bigtable', name: 'bigtable-hbase-1.2', version:'1.0.0-pre3'
49-
compile group: 'org.apache.hbase', name: 'hbase-client', version:'2.4.7'
50-
compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version:'2.0.44.Final'
49+
compile group: 'org.apache.hbase', name: 'hbase-client', version:'2.4.8'
50+
compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version:'2.0.46.Final'
5151
compile group: 'jstl', name: 'jstl', version:'1.2'
5252

5353
providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'

appengine-java8/bigtable/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip

appengine-java8/datastore-indexes-exploding/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.91</version>
42+
<version>1.9.92</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
@@ -65,19 +65,19 @@
6565
<dependency>
6666
<groupId>com.google.appengine</groupId>
6767
<artifactId>appengine-testing</artifactId>
68-
<version>1.9.91</version>
68+
<version>1.9.92</version>
6969
<scope>test</scope>
7070
</dependency>
7171
<dependency>
7272
<groupId>com.google.appengine</groupId>
7373
<artifactId>appengine-api-stubs</artifactId>
74-
<version>1.9.91</version>
74+
<version>1.9.92</version>
7575
<scope>test</scope>
7676
</dependency>
7777
<dependency>
7878
<groupId>com.google.appengine</groupId>
7979
<artifactId>appengine-tools-sdk</artifactId>
80-
<version>1.9.91</version>
80+
<version>1.9.92</version>
8181
<scope>test</scope>
8282
</dependency>
8383
<dependency>

appengine-java8/datastore-indexes-perfect/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.91</version>
42+
<version>1.9.92</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
@@ -65,19 +65,19 @@
6565
<dependency>
6666
<groupId>com.google.appengine</groupId>
6767
<artifactId>appengine-testing</artifactId>
68-
<version>1.9.91</version>
68+
<version>1.9.92</version>
6969
<scope>test</scope>
7070
</dependency>
7171
<dependency>
7272
<groupId>com.google.appengine</groupId>
7373
<artifactId>appengine-api-stubs</artifactId>
74-
<version>1.9.91</version>
74+
<version>1.9.92</version>
7575
<scope>test</scope>
7676
</dependency>
7777
<dependency>
7878
<groupId>com.google.appengine</groupId>
7979
<artifactId>appengine-tools-sdk</artifactId>
80-
<version>1.9.91</version>
80+
<version>1.9.92</version>
8181
<scope>test</scope>
8282
</dependency>
8383
<dependency>

appengine-java8/datastore-indexes/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.91</version>
42+
<version>1.9.92</version>
4343
</dependency>
4444

4545
<dependency>
@@ -66,19 +66,19 @@
6666
<dependency>
6767
<groupId>com.google.appengine</groupId>
6868
<artifactId>appengine-testing</artifactId>
69-
<version>1.9.91</version>
69+
<version>1.9.92</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.appengine</groupId>
7474
<artifactId>appengine-api-stubs</artifactId>
75-
<version>1.9.91</version>
75+
<version>1.9.92</version>
7676
<scope>test</scope>
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.appengine</groupId>
8080
<artifactId>appengine-tools-sdk</artifactId>
81-
<version>1.9.91</version>
81+
<version>1.9.92</version>
8282
<scope>test</scope>
8383
</dependency>
8484
<dependency>

appengine-java8/datastore-schedule-export/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.appengine</groupId>
3333
<artifactId>appengine-api-1.0-sdk</artifactId>
34-
<version>1.9.91</version>
34+
<version>1.9.92</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.google.guava</groupId>
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.google.appengine</groupId>
5757
<artifactId>appengine-testing</artifactId>
58-
<version>1.9.91</version>
58+
<version>1.9.92</version>
5959
<scope>test</scope>
6060
</dependency>
6161
<dependency>

appengine-java8/datastore/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.91</version>
42+
<version>1.9.92</version>
4343
</dependency>
4444

4545
<dependency>
@@ -98,19 +98,19 @@
9898
<dependency>
9999
<groupId>com.google.appengine</groupId>
100100
<artifactId>appengine-testing</artifactId>
101-
<version>1.9.91</version>
101+
<version>1.9.92</version>
102102
<scope>test</scope>
103103
</dependency>
104104
<dependency>
105105
<groupId>com.google.appengine</groupId>
106106
<artifactId>appengine-api-stubs</artifactId>
107-
<version>1.9.91</version>
107+
<version>1.9.92</version>
108108
<scope>test</scope>
109109
</dependency>
110110
<dependency>
111111
<groupId>com.google.appengine</groupId>
112112
<artifactId>appengine-tools-sdk</artifactId>
113-
<version>1.9.91</version>
113+
<version>1.9.92</version>
114114
<scope>test</scope>
115115
</dependency>
116116
<dependency>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)