Skip to content

Commit 91f007b

Browse files
author
Mairbek Khadikov
committed
Merge branch 'sample' of github.com:mairbek/java-docs-samples into sample
2 parents d89c0fb + bca157e commit 91f007b

File tree

72 files changed

+3084
-994
lines changed

Some content is hidden

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

72 files changed

+3084
-994
lines changed

‎.kokoro/tests/diff_tests.sh

+15-5
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

+1-1
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

+3-3
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

+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.2</version>
49+
<version>1.2.0</version>
5050
</dependency>
5151

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

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

+1-1
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

+1-1
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

+1-1
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

+2-2
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

+1-1
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>

‎appengine-java8/taskqueues-deferred/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.mockito</groupId>
6868
<artifactId>mockito-core</artifactId>
69-
<version>2.15.0</version>
69+
<version>2.16.0</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>com.google.appengine</groupId>

‎appengine-java8/translate-pubsub/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@
4949
<dependency>
5050
<groupId>com.google.cloud</groupId>
5151
<artifactId>google-cloud-pubsub</artifactId>
52-
<version>0.37.0-beta</version>
52+
<version>0.40.0-beta</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>com.google.cloud</groupId>
5656
<artifactId>google-cloud-datastore</artifactId>
57-
<version>1.19.0</version>
57+
<version>1.22.0</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>com.google.cloud</groupId>
6161
<artifactId>google-cloud-translate</artifactId>
62-
<version>1.19.0</version>
62+
<version>1.22.0</version>
6363
</dependency>
6464
<!-- [END dependencies] -->
6565
</dependencies>

‎appengine/firebase-tictactoe/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>org.mockito</groupId>
6767
<artifactId>mockito-core</artifactId>
68-
<version>2.15.0</version>
68+
<version>2.16.0</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>com.google.appengine</groupId>

‎appengine/taskqueue/defer-samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.mockito</groupId>
6565
<artifactId>mockito-core</artifactId>
66-
<version>2.15.0</version>
66+
<version>2.16.0</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>com.google.appengine</groupId>

‎bigquery/cloud-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.cloud</groupId>
4242
<artifactId>google-cloud-bigquery</artifactId>
43-
<version>0.37.0-beta</version>
43+
<version>1.22.0</version>
4444
</dependency>
4545
<!-- [END dependencies] -->
4646
<dependency>

‎bigquery/datatransfer/cloud-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.cloud</groupId>
4242
<artifactId>google-cloud-bigquerydatatransfer</artifactId>
43-
<version>0.37.0-beta</version>
43+
<version>0.40.0-beta</version>
4444
</dependency>
4545
<!-- [END dependencies] -->
4646

‎cloud-tasks/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.apis</groupId>
4141
<artifactId>google-api-services-cloudtasks</artifactId>
42-
<version>v2beta2-rev37-1.23.0</version>
42+
<version>v2beta2-rev39-1.23.0</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.google.api-client</groupId>

‎compute/cmdline/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ limitations under the License.
3232
<properties>
3333
<maven.compiler.target>1.8</maven.compiler.target>
3434
<maven.compiler.source>1.8</maven.compiler.source>
35-
<project.compute.version>v1-rev169-1.23.0</project.compute.version>
35+
<project.compute.version>v1-rev171-1.23.0</project.compute.version>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
</properties>
3838

‎datastore/cloud-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.cloud</groupId>
4141
<artifactId>google-cloud-datastore</artifactId>
42-
<version>1.19.0</version>
42+
<version>1.22.0</version>
4343
</dependency>
4444

4545
<!-- Test dependencies -->

‎datastore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-datastore</artifactId>
47-
<version>1.19.0</version>
47+
<version>1.22.0</version>
4848
</dependency>
4949

5050
<!-- Test dependencies -->

‎dlp/pom.xml

+29-25
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<groupId>com.google.cloud.samples</groupId>
3131
<artifactId>shared-configuration</artifactId>
3232
<version>1.0.8</version>
33+
<relativePath></relativePath>
3334
</parent>
3435

3536
<properties>
@@ -40,13 +41,16 @@
4041
</properties>
4142

4243
<dependencies>
43-
<!-- [START dlp_maven] -->
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-dlp</artifactId>
47-
<version>0.37.0-beta</version>
47+
<version>0.40.0-beta</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.cloud</groupId>
51+
<artifactId>google-cloud-pubsub</artifactId>
52+
<version>0.40.0-beta</version>
4853
</dependency>
49-
<!-- [END dlp_maven] -->
5054
<dependency>
5155
<groupId>commons-cli</groupId>
5256
<artifactId>commons-cli</artifactId>
@@ -60,27 +64,27 @@
6064
</dependency>
6165
</dependencies>
6266
<!-- Build jar with dependencies for testing -->
63-
<build>
64-
<plugins>
65-
<plugin>
66-
<artifactId>maven-assembly-plugin</artifactId>
67-
<version>3.0.0</version>
68-
<configuration>
69-
<descriptorRefs>
70-
<descriptorRef>jar-with-dependencies</descriptorRef>
71-
</descriptorRefs>
72-
</configuration>
73-
<executions>
74-
<execution>
75-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
76-
<phase>package</phase> <!-- bind to the packaging phase -->
77-
<goals>
78-
<goal>single</goal>
79-
</goals>
80-
</execution>
81-
</executions>
82-
</plugin>
83-
</plugins>
84-
</build>
67+
<build>
68+
<plugins>
69+
<plugin>
70+
<artifactId>maven-assembly-plugin</artifactId>
71+
<version>3.0.0</version>
72+
<configuration>
73+
<descriptorRefs>
74+
<descriptorRef>jar-with-dependencies</descriptorRef>
75+
</descriptorRefs>
76+
</configuration>
77+
<executions>
78+
<execution>
79+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
80+
<phase>package</phase> <!-- bind to the packaging phase -->
81+
<goals>
82+
<goal>single</goal>
83+
</goals>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
</plugins>
88+
</build>
8589
</project>
8690
<!-- [END dlp_pom] -->

0 commit comments

Comments
 (0)