Merge branch 'master' into autosynth-googleapis

Author: dinagraves

.github/workflows/auto-release.yaml

@@ -4,7 +4,7 @@ name: auto-release
 jobs:
  approve:
  runs-on: ubuntu-latest
- if: contains(github.head_ref, 'release-v')
+ if: contains(github.head_ref, 'release-please')
  steps:
  - uses: actions/github-script@v3
  with:
@@ -16,7 +16,7 @@ jobs:
  return;
  }
 
- // only approve PRs like "chore: release <release version>"
+ // only approve PRs like "chore(master): release <release version>"
  if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
  return;
  }

.github/workflows/ci.yaml

@@ -55,17 +55,10 @@ jobs:
  java-version: 8
  - run: java -version
  - name: Install artifacts to local Maven repository
- run: |
- source .kokoro/common.sh
- retry_with_backoff 3 10 \
- mvn install -B -V \
- -Dmaven.test.skip -DskipTests=true \
- -Dclirr.skip=true \
- -Denforcer.skip=true \
- -Dmaven.javadoc.skip=true \
- -Dgcloud.download.skip=true
+ run: .kokoro/build.sh
  shell: bash
- - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
+ - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
+ uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
  lint:
  runs-on: ubuntu-latest
  steps:

.kokoro/build.sh

@@ -29,7 +29,7 @@ echo ${JOB_TYPE}
 
 # attempt to install 3 times with exponential backoff (starting with 10 seconds)
 retry_with_backoff 3 10 \
- mvn install -B -V \
+ mvn install -B -V -ntp \
  -DskipTests=true \
  -Dclirr.skip=true \
  -Denforcer.skip=true \
@@ -60,6 +60,7 @@ javadoc)
  ;;
 integration)
  mvn -B ${INTEGRATION_TEST_ARGS} \
+ -ntp \
  -Penable-integration-tests \
  -DtrimStackTrace=false \
  -Dclirr.skip=true \
@@ -81,6 +82,7 @@ samples)
  pushd ${SAMPLES_DIR}
  mvn -B \
  -Penable-samples \
+ -ntp \
  -DtrimStackTrace=false \
  -Dclirr.skip=true \
  -Denforcer.skip=true \

.kokoro/dependencies.sh

@@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
 retry_with_backoff 3 10 \
- mvn install -B -V \
+ mvn install -B -V -ntp \
  -DskipTests=true \
  -Dclirr.skip=true
 
@@ -86,4 +86,4 @@ then
 else
  msg "Errors found. See log statements above."
  exit 1
-fi
+fi

.kokoro/release/publish_javadoc.cfg

@@ -7,10 +7,10 @@ env_vars: {
  value: "docs-staging"
 }
 
+# cloud-rad staging
 env_vars: {
  key: "STAGING_BUCKET_V2"
- value: "docs-staging-v2"
- # Production will be at: docs-staging-v2
+ value: "docs-staging-v2-staging"
 }
 
 env_vars: {

.kokoro/release/publish_javadoc.sh

@@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \
  --version ${VERSION} \
  --language java
 
-# upload docs
+# upload docs to staging bucket
 python3 -m docuploader upload . \
  --credentials ${CREDENTIALS} \
  --staging-bucket ${STAGING_BUCKET_V2}

.kokoro/release/publish_javadoc11.cfg

@@ -1,9 +1,9 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
+# cloud-rad production
 env_vars: {
  key: "STAGING_BUCKET_V2"
  value: "docs-staging-v2"
- # Production will be at: docs-staging-v2
 }
 
 # Configure the docker image for kokoro-trampoline

.kokoro/release/publish_javadoc11.sh

@@ -48,7 +48,7 @@ python3 -m docuploader create-metadata \
  --version ${VERSION} \
  --language java
 
-# upload yml
+# upload yml to production bucket
 python3 -m docuploader upload . \
  --credentials ${CREDENTIALS} \
  --staging-bucket ${STAGING_BUCKET_V2} \

pom.xml

@@ -90,7 +90,7 @@
  <dependency>
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
  <scope>test</scope>
  </dependency>
  </dependencies>

samples/install-without-bom/pom.xml

@@ -36,7 +36,7 @@
  <dependency>
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
  <scope>test</scope>
  </dependency>
  <dependency>