Skip to content

Commit 0d92b46

Browse files
chore: update common templates (googleapis#116)
* chore: release 0.126.0 (googleapis#106) googleapis@f76e503 commit f76e503 Author: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Date: Mon Apr 6 11:36:57 2020 -0400 chore: release 0.126.0 (googleapis#106) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated google-cloud-bigquerydatatransfer-bom/pom.xml [ci skip] * updated google-cloud-bigquerydatatransfer/pom.xml [ci skip] * updated grpc-google-cloud-bigquerydatatransfer-v1/pom.xml [ci skip] * updated proto-google-cloud-bigquerydatatransfer-v1/pom.xml [ci skip] * updated pom.xml [ci skip] * updated samples/install-without-bom/pom.xml [ci skip] * updated samples/pom.xml [ci skip] * updated samples/snapshot/pom.xml [ci skip] * updated samples/snippets/pom.xml [ci skip] Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(deps): update dependency com.google.cloud:libraries-bom to v4.4.1 (googleapis#109) googleapis@47e667a commit 47e667a Author: WhiteSource Renovate <[email protected]> Date: Mon Apr 6 20:02:18 2020 +0200 chore(deps): update dependency com.google.cloud:libraries-bom to v4.4.1 (googleapis#109) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | patch | `4.4.0` -> `4.4.1` | --- ### Renovate configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-bigquerydatatransfer). * chore: set Ruby namespace in proto options googleapis/googleapis@af7da29 commit af7da29c24814a1c873c22f477e9dd8dd5a17b0b Author: Google APIs <[email protected]> Date: Tue Apr 7 13:35:32 2020 -0700 chore: set Ruby namespace in proto options PiperOrigin-RevId: 305330079 * build(java): fix retry_with_backoff when -e option set (googleapis#475) googleapis/synthtool@bd69a2a commit bd69a2aa7b70875f3c988e269706b22fefbef40e Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:01:08 2020 -0700 build(java): fix retry_with_backoff when -e option set (googleapis#475) * build(java): fix nightly integration test config to run integrations (googleapis#465) googleapis/synthtool@c7e0e51 commit c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25 Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:06:04 2020 -0700 build(java): fix nightly integration test config to run integrations (googleapis#465) This was only running the units. * chore(java): release-please only updates non maven versions in README (googleapis#476) googleapis/synthtool@7f8e62a commit 7f8e62aa3edd225f76347a16f92e400661fdfb52 Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:14:25 2020 -0700 chore(java): release-please only updates non maven versions in README (googleapis#476) Prevent release-please and synthtool from fighting over the released library version. Synthtool updates the install snippets from the samples pom.xml files so the bots fight if they are temporarily out of sync after a release.
1 parent c8efc4d commit 0d92b46

File tree

8 files changed

+52
-15
lines changed

8 files changed

+52
-15
lines changed

.kokoro/common.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,28 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
# set -eo pipefail
17-
1816
function retry_with_backoff {
1917
attempts_left=$1
2018
sleep_seconds=$2
2119
shift 2
2220
command=$@
2321

22+
23+
# store current flag state
24+
flags=$-
25+
26+
# allow a failures to continue
27+
set +e
2428
echo "${command}"
2529
${command}
2630
exit_code=$?
2731

32+
# restore "e" flag
33+
if [[ ${flags} =~ e ]]
34+
then set -e
35+
else set +e
36+
fi
37+
2838
if [[ $exit_code == 0 ]]
2939
then
3040
return 0

.kokoro/nightly/integration.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,26 @@ env_vars: {
66
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
77
}
88

9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration"
12+
}
13+
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "gcloud-devel"
17+
}
18+
919
env_vars: {
1020
key: "ENABLE_BUILD_COP"
1121
value: "true"
1222
}
1323

24+
env_vars: {
25+
key: "GOOGLE_APPLICATION_CREDENTIALS"
26+
value: "keystore/73713_java_it_service_account"
27+
}
28+
1429
before_action {
1530
fetch_keystore {
1631
keystore_resource {

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>4.4.0</version>
23+
<version>4.4.1</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
@@ -35,19 +35,19 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
3535

3636
```
3737

38-
[//]: # ({x-version-update-start:google-cloud-bigquerydatatransfer:released})
39-
4038
If you are using Maven without BOM, add this to your dependencies:
4139

4240
```xml
4341
<dependency>
4442
<groupId>com.google.cloud</groupId>
4543
<artifactId>google-cloud-bigquerydatatransfer</artifactId>
46-
<version>0.126.0-beta</version>
44+
<version>0.125.2-beta</version>
4745
</dependency>
4846

4947
```
5048

49+
[//]: # ({x-version-update-start:google-cloud-bigquerydatatransfer:released})
50+
5151
If you are using Gradle, add this to your dependencies
5252
```Groovy
5353
compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.126.0-beta'

proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
374374
+ "{name=projects/*/dataSources/*}:checkVal"
375375
+ "idCreds:\001*\332A\004name\032W\312A#bigquerydatatransf"
376376
+ "er.googleapis.com\322A.https://www.googleap"
377-
+ "is.com/auth/cloud-platformB\343\001\n)com.googl"
377+
+ "is.com/auth/cloud-platformB\217\002\n)com.googl"
378378
+ "e.cloud.bigquery.datatransfer.v1B\021DataTr"
379379
+ "ansferProtoP\001ZQgoogle.golang.org/genprot"
380380
+ "o/googleapis/cloud/bigquery/datatransfer"
381381
+ "/v1;datatransfer\252\002%Google.Cloud.BigQuery"
382382
+ ".DataTransfer.V1\312\002%Google\\Cloud\\BigQuery"
383-
+ "\\DataTransfer\\V1b\006proto3"
383+
+ "\\DataTransfer\\V1\352\002)Google::Cloud::Bigque"
384+
+ "ry::DataTransfer::V1b\006proto3"
384385
};
385386
descriptor =
386387
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
122122
+ "STREAMING\020\002\032\002\030\001*s\n\rTransferState\022\036\n\032TRAN"
123123
+ "SFER_STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\002\022\013\n"
124124
+ "\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006FAILED\020\005\022\r\n"
125-
+ "\tCANCELLED\020\006B\347\001\n)com.google.cloud.bigque"
125+
+ "\tCANCELLED\020\006B\223\002\n)com.google.cloud.bigque"
126126
+ "ry.datatransfer.v1B\rTransferProtoP\001ZQgoo"
127127
+ "gle.golang.org/genproto/googleapis/cloud"
128128
+ "/bigquery/datatransfer/v1;datatransfer\242\002"
129129
+ "\005GCBDT\252\002%Google.Cloud.BigQuery.DataTrans"
130130
+ "fer.V1\312\002%Google\\Cloud\\BigQuery\\DataTrans"
131-
+ "fer\\V1b\006proto3"
131+
+ "fer\\V1\352\002)Google::Cloud::Bigquery::DataTr"
132+
+ "ansfer::V1b\006proto3"
132133
};
133134
descriptor =
134135
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

proto-google-cloud-bigquerydatatransfer-v1/src/main/proto/google/cloud/bigquery/datatransfer/v1/datatransfer.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ option java_multiple_files = true;
3333
option java_outer_classname = "DataTransferProto";
3434
option java_package = "com.google.cloud.bigquery.datatransfer.v1";
3535
option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
36+
option ruby_package = "Google::Cloud::Bigquery::DataTransfer::V1";
3637

3738
// The Google BigQuery Data Transfer Service API enables BigQuery users to
3839
// configure the transfer of their data from other Google Products into

proto-google-cloud-bigquerydatatransfer-v1/src/main/proto/google/cloud/bigquery/datatransfer/v1/transfer.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ option java_outer_classname = "TransferProto";
2929
option java_package = "com.google.cloud.bigquery.datatransfer.v1";
3030
option objc_class_prefix = "GCBDT";
3131
option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
32+
option ruby_package = "Google::Cloud::Bigquery::DataTransfer::V1";
3233

3334
// DEPRECATED. Represents data transfer type.
3435
enum TransferType {

synth.metadata

Lines changed: 13 additions & 5 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)