Skip to content

Commit e1e0854

Browse files
daniel-sanchedaniel-sanche
authored
Merge branch 'master' into cloud-cdn
2 parents 37f86a6 + 3060ad4 commit e1e0854

File tree

103 files changed

+1558
-604
lines changed

Some content is hidden

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

103 files changed

+1558
-604
lines changed

‎.kokoro/tests/diff_tests.sh

+15-14
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mvn -v
2727
echo -e "\n ********** GRADLE INFO *********** "
2828
gradle -v
2929

30-
# Setup required enviormental variables
30+
# Setup required environmental variables
3131
export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json
3232
export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing
3333
source ${KOKORO_GFILE_DIR}/aws-secrets.sh
@@ -37,35 +37,36 @@ gcloud auth activate-service-account\
3737
--key-file=$GOOGLE_APPLICATION_CREDENTIALS \
3838
--project=$GOOGLE_CLOUD_PROJECT
3939

40-
echo -e "\n******************** CHECKING FOR AFFECTED FOLDERS ********************"
40+
echo -e "\n******************** TESTING AFFECTED PROJECTS ********************"
4141
# Diff to find out what has changed from master
4242
cd github/java-docs-samples
43-
find ./*/ -name pom.xml -print0 | sort -z | while read -d $'\0' file
43+
find * -name pom.xml -print0 | sort -z | while read -d $'\0' file
4444
do
45+
# Navigate to project
4546
file=$(dirname "$file")
46-
echo "------------------------------------------------------------"
47-
echo "- checking $file"
48-
echo "------------------------------------------------------------"
49-
50-
5147
pushd "$file" > /dev/null
48+
5249
set +e
50+
# Only tests changed projects
5351
git diff --quiet master.. .
54-
RTN=$?
52+
CHANGED=$?
53+
# Only test leafs to prevent testing twice
54+
PARENT=$(grep "<modules>" pom.xml -c)
5555
set -e
5656

5757
# Check for changes to the current folder
58-
if [ "$RTN" -eq 1 ]; then
59-
echo -e "\n Change detected. Running tests. \n "
58+
if [ "$CHANGED" -eq 1 ] && [ "$PARENT" -eq 0 ]; then
59+
echo "------------------------------------------------------------"
60+
echo "- testing $file"
61+
echo "------------------------------------------------------------"
62+
6063
mvn -q --batch-mode --fail-at-end clean verify \
6164
-Dfile.encoding="UTF-8" \
6265
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
6366
-Dmaven.test.redirectTestOutputToFile=true \
6467
-Dbigtable.projectID="${GOOGLE_CLOUD_PROJECT}" \
6568
-Dbigtable.instanceID=instance
66-
echo -e " Tests complete. \n"
67-
else
68-
echo -e "\n NO change found. \n"
69+
echo -e "\n Tests complete. \n"
6970
fi
7071

7172
popd > /dev/null

‎appengine-java8/analytics/pom.xml

+4-4
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.60</appengine.sdk.version>
36+
<appengine.sdk.version>1.9.62</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.60</version>
44+
<version>1.9.62</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.60</version>
77+
<version>1.9.62</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>2.13.0</version>
90+
<version>2.15.0</version>
9191
<scope>test</scope>
9292
</dependency>
9393
<dependency>

‎appengine-java8/appidentity/pom.xml

+4-4
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.60</version>
42+
<version>1.9.62</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.60</version>
69+
<version>1.9.62</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.60</version>
75+
<version>1.9.62</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.60</version>
94+
<version>1.9.62</version>
9595
<scope>test</scope>
9696
</dependency>
9797
<dependency>

‎appengine-java8/bigquery/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/bigquery/README.md">
22
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
33

4-
# Google Cloud API Showcase: Cloud BigQuery & StackDriver Monitoring in App Engine Standard Java 8 Environment
4+
# Google Cloud API Showcase: Cloud BigQuery & StackDriver Monitoring in App Engine Standard Environment for Java 8
55

6-
This API Showcase demonstrates how to run an AppEngine Standard application with dependencies on both
6+
This API Showcase demonstrates how to run an AppEngine standard environment application with dependencies on both
77
[Google BigQuery][bigquery] and [StackDriver Monitoring][stackdriver].
88

99
[bigquery]: https://cloud.google.com/bigquery/docs
@@ -16,7 +16,7 @@ The home page also provides a summary view of the metrics that have been logged
1616

1717
## Clone the sample app
1818

19-
Copy the sample apps to your local machine, and cd to the appengine-java8/bigquery directory:
19+
Copy the sample apps to your local machine, and cd to the `appengine-java8/bigquery` directory:
2020

2121
```
2222
git clone https://github.com/GoogleCloudPlatform/java-docs-samples
@@ -56,7 +56,7 @@ few moments and try again.
5656

5757
## Deploy
5858

59-
- Deploy to AppEngine Standard using the following Maven command.
59+
- Deploy to AppEngine standard environment using the following Maven command.
6060
```
6161
mvn appengine:deploy
6262
```

‎appengine-java8/bigquery/pom.xml

+5-5
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.60</version>
42+
<version>1.9.62</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
@@ -77,13 +77,13 @@
7777
<dependency>
7878
<groupId>com.google.appengine</groupId>
7979
<artifactId>appengine-api-stubs</artifactId>
80-
<version>1.9.60</version>
80+
<version>1.9.62</version>
8181
<scope>test</scope>
8282
</dependency>
8383
<dependency>
8484
<groupId>com.google.appengine</groupId>
8585
<artifactId>appengine-tools-sdk</artifactId>
86-
<version>1.9.60</version>
86+
<version>1.9.62</version>
8787
<scope>test</scope>
8888
</dependency>
8989

@@ -96,13 +96,13 @@
9696
<dependency>
9797
<groupId>org.mockito</groupId>
9898
<artifactId>mockito-core</artifactId>
99-
<version>2.13.0</version>
99+
<version>2.15.0</version>
100100
<scope>test</scope>
101101
</dependency>
102102
<dependency>
103103
<groupId>com.google.appengine</groupId>
104104
<artifactId>appengine-testing</artifactId>
105-
<version>1.9.60</version>
105+
<version>1.9.62</version>
106106
<scope>test</scope>
107107
</dependency>
108108
<dependency>

‎appengine-java8/bigtable/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ limitations under the License.
4646
<dependency>
4747
<groupId>com.google.cloud.bigtable</groupId>
4848
<artifactId>bigtable-hbase-1.x</artifactId>
49-
<version>1.1.0</version>
49+
<version>1.1.2</version>
5050
</dependency>
5151

5252
<!-- Compile/runtime dependencies -->

‎appengine-java8/cloudsql-postgres/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>com.google.appengine</groupId>
5353
<artifactId>appengine-api-1.0-sdk</artifactId>
54-
<version>1.9.60</version>
54+
<version>1.9.62</version>
5555
</dependency>
5656

5757
<dependency>

‎appengine-java8/cloudsql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>com.google.appengine</groupId>
5353
<artifactId>appengine-api-1.0-sdk</artifactId>
54-
<version>1.9.60</version>
54+
<version>1.9.62</version>
5555
</dependency>
5656

5757
<dependency>

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

+4-4
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.60</version>
42+
<version>1.9.62</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.60</version>
68+
<version>1.9.62</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.60</version>
74+
<version>1.9.62</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.60</version>
80+
<version>1.9.62</version>
8181
<scope>test</scope>
8282
</dependency>
8383
<dependency>

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

+4-4
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.60</version>
42+
<version>1.9.62</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.60</version>
68+
<version>1.9.62</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.60</version>
74+
<version>1.9.62</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.60</version>
80+
<version>1.9.62</version>
8181
<scope>test</scope>
8282
</dependency>
8383
<dependency>

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

+4-4
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.60</version>
42+
<version>1.9.62</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.60</version>
69+
<version>1.9.62</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.60</version>
75+
<version>1.9.62</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.60</version>
81+
<version>1.9.62</version>
8282
<scope>test</scope>
8383
</dependency>
8484
<dependency>

‎appengine-java8/datastore/pom.xml

+4-4
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.60</version>
42+
<version>1.9.62</version>
4343
</dependency>
4444

4545
<dependency>
@@ -92,19 +92,19 @@
9292
<dependency>
9393
<groupId>com.google.appengine</groupId>
9494
<artifactId>appengine-testing</artifactId>
95-
<version>1.9.60</version>
95+
<version>1.9.62</version>
9696
<scope>test</scope>
9797
</dependency>
9898
<dependency>
9999
<groupId>com.google.appengine</groupId>
100100
<artifactId>appengine-api-stubs</artifactId>
101-
<version>1.9.60</version>
101+
<version>1.9.62</version>
102102
<scope>test</scope>
103103
</dependency>
104104
<dependency>
105105
<groupId>com.google.appengine</groupId>
106106
<artifactId>appengine-tools-sdk</artifactId>
107-
<version>1.9.60</version>
107+
<version>1.9.62</version>
108108
<scope>test</scope>
109109
</dependency>
110110
<dependency>

‎appengine-java8/endpoints-v2-backend/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939

40-
<endpoints.framework.version>2.0.11</endpoints.framework.version>
40+
<endpoints.framework.version>2.0.12</endpoints.framework.version>
4141
<endpoints.management.version>1.0.4</endpoints.management.version>
4242

4343
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>com.google.appengine</groupId>
6060
<artifactId>appengine-api-1.0-sdk</artifactId>
61-
<version>1.9.60</version>
61+
<version>1.9.62</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>javax.servlet</groupId>

‎appengine-java8/endpoints-v2-guice/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<maven.compiler.source>1.8</maven.compiler.source>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838

39-
<endpoints.framework.version>2.0.11</endpoints.framework.version>
39+
<endpoints.framework.version>2.0.12</endpoints.framework.version>
4040
<endpoints.management.version>1.0.4</endpoints.management.version>
4141

4242
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.google.endpoints</groupId>
5555
<artifactId>endpoints-framework-guice</artifactId>
56-
<version>2.0.11</version>
56+
<version>2.0.12</version>
5757
</dependency>
5858
<!-- [END guice_dependency] -->
5959
<dependency>
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>com.google.appengine</groupId>
6666
<artifactId>appengine-api-1.0-sdk</artifactId>
67-
<version>1.9.60</version>
67+
<version>1.9.62</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>javax.servlet</groupId>

0 commit comments

Comments
 (0)