Skip to content

Commit e2441cf

Browse files
author
Simon Zeltser
committed
Merge remote-tracking branch 'origin/master' into introduce_managedrollout
2 parents 3ea510e + 6fc6f51 commit e2441cf

File tree

120 files changed

+6552
-1250
lines changed

Some content is hidden

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

120 files changed

+6552
-1250
lines changed

‎.kokoro/presubmit.cfg‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
2020
value: "github/java-docs-samples/.kokoro/tests/diff_tests.sh"
2121
}
22-

‎.kokoro/tests/diff_tests.sh‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,37 +38,47 @@ gcloud auth activate-service-account\
3838
--project=$GOOGLE_CLOUD_PROJECT
3939

4040
echo -e "\n******************** TESTING AFFECTED PROJECTS ********************"
41+
set +e
4142
# Diff to find out what has changed from master
43+
RESULT=0
4244
cd github/java-docs-samples
43-
find * -name pom.xml -print0 | sort -z | while read -d $'\0' file
44-
do
45+
# For every pom.xml (may break on whitespace)
46+
for file in **/pom.xml; do
4547
# Navigate to project
4648
file=$(dirname "$file")
4749
pushd "$file" > /dev/null
4850

49-
set +e
5051
# Only tests changed projects
5152
git diff --quiet master.. .
5253
CHANGED=$?
5354
# Only test leafs to prevent testing twice
5455
PARENT=$(grep "<modules>" pom.xml -c)
55-
set -e
5656

5757
# Check for changes to the current folder
5858
if [ "$CHANGED" -eq 1 ] && [ "$PARENT" -eq 0 ]; then
5959
echo "------------------------------------------------------------"
6060
echo "- testing $file"
6161
echo "------------------------------------------------------------"
6262

63+
# Run tests and update RESULT if failed
6364
mvn -q --batch-mode --fail-at-end clean verify \
6465
-Dfile.encoding="UTF-8" \
6566
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
6667
-Dmaven.test.redirectTestOutputToFile=true \
6768
-Dbigtable.projectID="${GOOGLE_CLOUD_PROJECT}" \
6869
-Dbigtable.instanceID=instance
69-
echo -e "\n Tests complete. \n"
70+
EXIT=$?
71+
72+
if [ $EXIT -ne 0 ]; then
73+
echo -e "\n Tests failed. \n"
74+
RESULT=1
75+
else
76+
echo -e "\n Tests complete. \n"
77+
fi
7078
fi
7179

7280
popd > /dev/null
7381

7482
done
83+
84+
exit $RESULT

‎appengine-java8/analytics/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>org.mockito</groupId>
8989
<artifactId>mockito-core</artifactId>
90-
<version>2.15.0</version>
90+
<version>2.16.0</version>
9191
<scope>test</scope>
9292
</dependency>
9393
<dependency>

‎appengine-java8/bigquery/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-bigquery</artifactId>
56-
<version>0.37.0-beta</version>
56+
<version>1.22.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-monitoring</artifactId>
61-
<version>0.37.0-beta</version>
61+
<version>0.40.0-beta</version>
6262
</dependency>
6363
<!-- [END dependencies ] -->
6464

@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>org.mockito</groupId>
9898
<artifactId>mockito-core</artifactId>
99-
<version>2.15.0</version>
99+
<version>2.16.0</version>
100100
<scope>test</scope>
101101
</dependency>
102102
<dependency>

‎appengine-java8/bigtable/pom.xml‎

Lines changed: 1 addition & 1 deletion
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.2</version>
49+
<version>1.2.0</version>
5050
</dependency>
5151

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>org.postgresql</groupId>
7474
<artifactId>postgresql</artifactId>
75-
<version>42.2.1</version>
75+
<version>42.2.2</version>
7676
</dependency>
7777

7878
<dependency>

‎appengine-java8/datastore/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.google.auto.value</groupId>
5555
<artifactId>auto-value</artifactId>
56-
<version>1.5.3</version>
56+
<version>1.5.4</version>
5757
<scope>provided</scope>
5858
</dependency>
5959

‎appengine-java8/guestbook-cloud-datastore/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>com.google.cloud</groupId>
6767
<artifactId>google-cloud</artifactId>
68-
<version>0.37.0-alpha</version>
68+
<version>0.40.0-alpha</version>
6969
</dependency>
7070

7171
<dependency>

‎appengine-java8/pubsub/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-pubsub</artifactId>
55-
<version>0.37.0-beta</version>
55+
<version>0.40.0-beta</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.cloud</groupId>
5959
<artifactId>google-cloud-datastore</artifactId>
60-
<version>1.19.0</version>
60+
<version>1.22.0</version>
6161
</dependency>
6262
<!-- [END dependencies] -->
6363
</dependencies>

‎appengine-java8/spanner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-spanner</artifactId>
47-
<version>0.37.0-beta</version>
47+
<version>0.40.0-beta</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.servlet</groupId>

0 commit comments

Comments
 (0)