Skip to content

Commit

Permalink
Merge branch 'master' into training-misspelled---issue-#1312
Browse files Browse the repository at this point in the history
  • Loading branch information
nnegrey authored Jun 12, 2019
2 parents 52072d8 + fb54a5c commit a2e7688
Show file tree
Hide file tree
Showing 138 changed files with 443 additions and 733 deletions.
6 changes: 3 additions & 3 deletions appengine-java11/tasks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ App Engine task attempts.
To create a queue using the Cloud SDK, use the following gcloud command:

```
gcloud beta tasks queues create my-appengine-queue
gcloud tasks queues create my-appengine-queue
```

Note: A newly created queue will route to the default App Engine service and
Expand Down Expand Up @@ -71,14 +71,14 @@ export GOOGLE_CLOUD_PROJECT="<YOUR_GOOGLE_CLOUD_PROJECT>"
```

Then the queue ID, as specified at queue creation time. Queue IDs already
created can be listed with `gcloud beta tasks queues list`.
created can be listed with `gcloud tasks queues list`.

```
export QUEUE_ID="my-appengine-queue"
```

And finally the location ID, which can be discovered with
`gcloud beta tasks queues describe $QUEUE_ID`, with the location embedded in
`gcloud tasks queues describe $QUEUE_ID`, with the location embedded in
the "name" value (for instance, if the name is
"projects/my-project/locations/us-central1/queues/my-appengine-queue", then the
location is "us-central1").
Expand Down
12 changes: 6 additions & 6 deletions appengine-java8/analytics/pom.xml
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.71</appengine.sdk.version>
<appengine.sdk.version>1.9.73</appengine.sdk.version>
</properties>

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

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

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

Expand All @@ -87,7 +87,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.24.0</version>
<version>2.27.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -98,7 +98,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.42</version>
<version>0.44</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions appengine-java8/appidentity/pom.xml
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.71</version>
<version>1.9.73</version>
</dependency>

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

Expand All @@ -91,13 +91,13 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.42</version>
<version>0.44</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
16 changes: 8 additions & 8 deletions appengine-java8/bigquery/pom.xml
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.71</version>
<version>1.9.73</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -52,12 +52,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>1.62.0</version>
<version>1.70.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-monitoring</artifactId>
<version>1.62.0</version>
<version>1.70.0</version>
</dependency>

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

Expand All @@ -94,19 +94,19 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.24.0</version>
<version>2.27.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.42</version>
<version>0.44</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>1.8.0</version>
<version>1.11.0</version>
</dependency>

<!-- Compile/runtime dependencies -->
Expand All @@ -68,7 +68,7 @@ limitations under the License.
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.42</version>
<version>0.44</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/cloudsql-postgres/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
</dependency>

<dependency>
Expand All @@ -79,7 +79,7 @@
<dependency>
<groupId>com.google.cloud.sql</groupId>
<artifactId>postgres-socket-factory</artifactId>
<version>1.0.12</version>
<version>1.0.13</version>
</dependency>
<!-- [END gae_java8_postgres_dependencies] -->
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appengine-java8/cloudsql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
</dependency>

<dependency>
Expand All @@ -80,7 +80,7 @@
<dependency>
<groupId>com.google.cloud.sql</groupId>
<artifactId>mysql-socket-factory</artifactId>
<version>1.0.12</version>
<version>1.0.13</version>
</dependency>
<!-- [END gae_java8_mysql_dependencies] -->
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public void doGet_emptyDatastore_writesNoWidgets() throws Exception {
.isEqualTo("Got 0 widgets.\n");
}

// CHECKSTYLE.OFF: VariableDeclarationUsageDistance
@SuppressWarnings("VariableDeclarationUsageDistance")
@Test
public void doGet_repeatedPropertyEntities_writesWidgets() throws Exception {
Expand Down
10 changes: 5 additions & 5 deletions appengine-java8/datastore-indexes-perfect/pom.xml
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.71</version>
<version>1.9.73</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -65,25 +65,25 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.42</version>
<version>0.44</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions appengine-java8/datastore-indexes/pom.xml
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.71</version>
<version>1.9.73</version>
</dependency>

<dependency>
Expand All @@ -66,25 +66,25 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>1.9.71</version>
<version>1.9.73</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.42</version>
<version>0.44</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit a2e7688

Please sign in to comment.