Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit 7ac6a63

Browse files
yoshi-automationyoshi-automation
authored
chore: re-generated to pick up changes from synthtool (#372)
* changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * Add cloud-RAD for Java Co-authored-by: Jeff Ching <chingor@google.com> Source-Author: Les Vogel <lesv@users.noreply.github.com> Source-Date: Thu Jul 30 13:09:50 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: dd230c816f88d0141fcd0be83498986287220d1b Source-Link: googleapis/synthtool@dd230c8 * cleanup: removes unused kokoro config files * cleanup: removes unused kokoro config files Removes unused kokoro files from the java library template. We have stopped running some of these due to Github quota issues. * fix:reverts back samples.cfg files The files presubmit/samples.cfg and nightly/samples.cfg should remain in the java template repository. Co-authored-by: Jeffrey Rennie <rennie@google.com> Source-Author: Thiago Nunes <thiagotnunes@gmail.com> Source-Date: Thu Aug 6 09:48:58 2020 +1000 Source-Repo: googleapis/synthtool Source-Sha: 4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4 Source-Link: googleapis/synthtool@4530cc6 * build: update dependencies check to only check for runtime and compile scopes * change:Updated dependencies check to only use runtime & compile scope * Update dependencies.sh * feat: update dependencies check to only check for runtime and compile scopes Co-authored-by: Saleh Mostafa <salehmostafa@google.com> Co-authored-by: Jeffrey Rennie <rennie@google.com> Source-Author: salehsquared <salehmostafamain@gmail.com> Source-Date: Thu Aug 6 13:01:02 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: f8823dec98277a9516f2fb6fae9f58b3a59a23e1 Source-Link: googleapis/synthtool@f8823de
1 parent 94f568c commit 7ac6a63

7 files changed

Lines changed: 396 additions & 15 deletions

File tree

‎.kokoro/dependencies.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ function completenessCheck() {
4343
# Output dep list with compile scope generated using the original pom
4444
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
4545
# This is stripped from the output as it is not present in the flattened pom.
46+
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
4647
msg "Generating dependency list using original pom..."
47-
mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
48+
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
4849

49-
# Output dep list generated using the flattened pom (test scope deps are ommitted)
50+
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
5051
msg "Generating dependency list using flattened pom..."
51-
mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
52+
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
5253

5354
# Compare two dependency lists
5455
msg "Comparing dependency lists..."
@@ -85,4 +86,4 @@ then
8586
else
8687
msg "Errors found. See log statements above."
8788
exit 1
88-
fi
89+
fi

‎.kokoro/nightly/samples.cfg‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "java-docs-samples-testing"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "java-docs-samples-testing"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-docs-samples-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-docs-samples-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "ENABLE_BUILD_COP"
37+
value: "true"
38+
}

‎.kokoro/presubmit/samples.cfg‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "java-docs-samples-testing"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "java-docs-samples-testing"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-docs-samples-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-docs-samples-service-account"
33+
}

‎.kokoro/release/publish_javadoc.cfg‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/"
4+
25
env_vars: {
36
key: "STAGING_BUCKET"
47
value: "docs-staging"
58
}
69

10+
env_vars: {
11+
key: "STAGING_BUCKET_V2"
12+
value: "docs-staging-v2-staging"
13+
# Production will be at: docs-staging-v2
14+
}
15+
716
env_vars: {
817
key: "TRAMPOLINE_BUILD_FILE"
918
value: "github/java-spanner/.kokoro/release/publish_javadoc.sh"
1019
}
1120

21+
1222
before_action {
1323
fetch_keystore {
1424
keystore_resource {

‎.kokoro/release/publish_javadoc.sh‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,25 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
2424
exit 1
2525
fi
2626

27+
if [[ -z "${STAGING_BUCKET_V2}" ]]; then
28+
echo "Need to set STAGING_BUCKET_V2 environment variable"
29+
exit 1
30+
fi
31+
2732
# work from the git root directory
2833
pushd $(dirname "$0")/../../
2934

3035
# install docuploader package
3136
python3 -m pip install gcp-docuploader
3237

3338
# compile all packages
34-
mvn clean install -B -DskipTests=true
39+
mvn clean install -B -q -DskipTests=true
3540

3641
NAME=google-cloud-spanner
3742
VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
3843

3944
# build the docs
40-
mvn site -B
45+
mvn site -B -q
4146

4247
pushd target/site/apidocs
4348

@@ -53,3 +58,19 @@ python3 -m docuploader upload . \
5358
--staging-bucket ${STAGING_BUCKET}
5459

5560
popd
61+
62+
# V2
63+
mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"
64+
65+
pushd target/devsite
66+
67+
# create metadata
68+
python3 -m docuploader create-metadata \
69+
--name ${NAME} \
70+
--version ${VERSION} \
71+
--language java
72+
73+
# upload docs
74+
python3 -m docuploader upload . \
75+
--credentials ${CREDENTIALS} \
76+
--staging-bucket ${STAGING_BUCKET_V2}

‎renovate.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,8 @@
7474
"^com.fasterxml.jackson.core"
7575
],
7676
"groupName": "jackson dependencies"
77-
},
78-
{
79-
"packageNames": [
80-
"org.apache.commons:commons-lang3"
81-
],
82-
"enabled": false
8377
}
8478
],
8579
"semanticCommits": true,
8680
"masterIssue": true
87-
}
81+
}

0 commit comments

Comments
 (0)