Merge branch 'main' into updateOwlBotYamls

.github/release-please.yml

@@ -2,3 +2,8 @@ primaryBranch: main
 releaseType: java-yoshi
 manifest: true
 handleGHRelease: true
+branches:
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 1.0.x

.github/requirements.txt

@@ -4,9 +4,9 @@
 #
 #    pip-compile --generate-hashes requirements.in
 #
-certifi==2022.9.24 \
-    --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
-    --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
+certifi==2022.12.7 \
+    --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
+    --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
     # via requests
 charset-normalizer==2.1.1 \
     --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \

.github/snippet-bot.yml

@@ -0,0 +1,4 @@
+ignoreFiles:
+- owl-bot-postprocessor/synthtool/gcp/snippets.py
+- owl-bot-postprocessor/synthtool/gcp/templates/java_library/samples/install-without-bom/pom.xml
+

.github/sync-repo-settings.yaml

@@ -39,6 +39,27 @@ branchProtectionRules:
       - 'Kokoro - Test: Java 17 GraalVM Native Image - Compute'
       - 'Kokoro - Test: Java GraalVM Native Image - AI Platform'
       - 'Kokoro - Test: Java GraalVM Native Image - Compute'
+  - pattern: 1.0.x
+      # Can admins overwrite branch protection.
+      # Defaults to `true`
+    isAdminEnforced: true
+      # Number of approving reviews required to update matching branches.
+      # Defaults to `1`
+    requiredApprovingReviewCount: 1
+      # Are reviews from code owners required to update matching branches.
+      # Defaults to `false`
+    requiresCodeOwnerReviews: true
+      # Require up to date branches
+    requiresStrictStatusChecks: false
+      # List of required status check contexts that must pass for commits to be accepted to matching branches.
+    requiredStatusCheckContexts:
+    - units (8)
+    - units (11)
+    - units (17)
+    - cla/google
+    - enforcer
+    - OwlBot Post Processor
+    - 'Kokoro - Test: Integration'
 # List of explicit permissions to add (additive only)
 permissionRules:
   - team: yoshi-admins

.github/workflows/ci.yaml

@@ -100,6 +100,13 @@ jobs:
         key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
     - run: java -version
     - run: mvn -B -ntp enforcer:enforce@enforce -T 1C
+  requirements-kokoro:
+    runs-on: ubuntu-latest
+    container: gcr.io/cloud-devrel-public-resources/java8
+    steps:
+    - uses: actions/checkout@v3
+    - run: python3 --version
+    - run: python3 -m pip install --require-hashes -r .kokoro/requirements.txt
 
 # TODO: Uncomment the needed Github Actions
 #  dependencies:

.github/workflows/bootstrap.yaml → .github/workflows/merge_repository.yaml

@@ -1,4 +1,4 @@
-name: Bootstrap
+name: Merge Repository
 on:
   schedule:
     - cron: '0 1 * * *' # nightly at 1 am UTC
@@ -19,19 +19,19 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Generate
-        run: ./generation/bootstrap.sh
+        run: ./generation/merge_repository.sh
         env:
           USERNAME: ${{ github.actor }}
       - name: Compile
-        working-directory: generation/monorepo/google-cloud-java
+        working-directory: generation/monorepo/google-cloud-java-merged
         run: mvn compile -T C1 -B
       - name: Unit Tests
-        working-directory: generation/monorepo/google-cloud-java
+        working-directory: generation/monorepo/google-cloud-java-merged
         run: mvn test -T C1 -B
       - name: Push monorepo to branch
         if: ${{ github.event_name != 'pull_request' }}
         run: |
-          cd generation/monorepo/google-cloud-java
+          cd generation/monorepo/google-cloud-java-merged
           git remote add monorepo https://${{ github.actor }}:${{ github.token }}@github.com/${{ github.repository }}.git
           git push -f monorepo main:bootstrap_output
       - name: Push diff to branch

.kokoro/nightly/graalvm-native-17.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
 }
 
 env_vars: {

.kokoro/nightly/graalvm-native.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
 }
 
 env_vars: {

.kokoro/nightly/graalvm-sub-jobs/native-17/common.cfg

@@ -24,7 +24,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
 }
 
 env_vars: {

.kokoro/nightly/graalvm-sub-jobs/native/common.cfg

@@ -29,7 +29,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

.kokoro/presubmit/graalvm-native-17-aiplatform.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-17-compute.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-aiplatform.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-compute.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
 }
 
 env_vars: {

.kokoro/release/publish_javadoc11.sh

@@ -57,7 +57,8 @@ if [[ -z "${MODULE_LIST}" ]]; then
 else
   modules=($(echo "${MODULE_LIST}" | tr ',' ' '))
 fi
-excluded_modules=('gapic-libraries-bom' 'google-cloud-jar-parent' 'google-cloud-pom-parent')
+# TODO: Maps docs exclusion logic to be removed once we move to correct location on devsite. See b/262712184 and b/262600829
+excluded_modules=('gapic-libraries-bom' 'google-cloud-jar-parent' 'google-cloud-pom-parent' 'java-maps-addressvalidation' 'java-maps-routing')
 failed_modules=()
 
 for module in "${modules[@]}"; do

.kokoro/release/stage.sh

@@ -27,19 +27,27 @@ pushd $(dirname "$0")/../../
 setup_environment_secrets
 create_settings_xml_file "settings.xml"
 
+echo "Deploying artifacts to staging repositories"
+
+excludedMapsModule=$(find java-maps-* -name 'pom.xml'  \
+    |sed -e 's/^/!/' -e 's|/pom.xml$||' |xargs  |sed -e 's/ /,/g')
+echo "Excluded modules: ${excludedMapsModule}"
+
 mvn clean deploy -B \
   -DskipTests=true \
   -Dclirr.skip=true \
   --settings ${MAVEN_SETTINGS_FILE} \
   -Dgpg.executable=gpg \
   -Dgpg.passphrase=${GPG_PASSPHRASE} \
   -Dgpg.homedir=${GPG_HOMEDIR} \
+  --projects "${excludedMapsModule}" \
   -P release
 
 # The job triggered by Release Please (release-trigger) has this AUTORELEASE_PR
 # environment variable. Fusion also lets us to specify this variable.
 if [[ -n "${AUTORELEASE_PR}" ]]
 then
+  echo "Releasing the staging repositories"
   mvn nexus-staging:release -B \
     -DperformRelease=true \
     --settings=${MAVEN_SETTINGS_FILE}

.kokoro/requirements.txt

@@ -16,9 +16,9 @@ cachetools==4.2.4 \
     # via
     #   -r requirements.in
     #   google-auth
-certifi==2022.9.14 \
-    --hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \
-    --hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516
+certifi==2022.12.7 \
+    --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
+    --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
     # via requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.0.0"
+  ".": "1.1.0"
 }