Merge branch 'main' into renovate/arrow.version

googleapis · Apr 17, 2024 · 777a931 · 777a931
2 parents 0bc3828 + 76a7b38
commit 777a931
Show file tree

Hide file tree

Showing 165 changed files with 4,558 additions and 1,469 deletions.
diff --git a/.cloudbuild/graalvm/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.28.1' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.28.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.7.6'
 
 steps:

diff --git a/.cloudbuild/graalvm/cloudbuild-test-b.yaml b/.cloudbuild/graalvm/cloudbuild-test-b.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.28.1' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.28.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.7.6'
 
 steps:

diff --git a/.cloudbuild/graalvm/cloudbuild.yaml b/.cloudbuild/graalvm/cloudbuild.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.28.1' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.28.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.7.6'
 steps:
   # GraalVM A build

diff --git a/.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _GAPIC_GENERATOR_JAVA_VERSION: '2.38.1' # {x-version-update:gapic-generator-java:current}
+  _GAPIC_GENERATOR_JAVA_VERSION: '2.38.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
   _IMAGE_ID: "gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}"
 steps:
   # Library generation build

diff --git a/.cloudbuild/library_generation/cloudbuild-test-library-generation.yaml b/.cloudbuild/library_generation/cloudbuild-test-library-generation.yaml
diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -26,7 +26,7 @@ RUN rm $(which python3)
 RUN ln -s $(which python3.11) /usr/local/bin/python
 RUN ln -s $(which python3.11) /usr/local/bin/python3
 RUN python -m pip install --upgrade pip
-RUN cd /src && python -m pip install -r requirements.in
+RUN cd /src && python -m pip install -r requirements.txt
 RUN cd /src && python -m pip install .
 
 # set dummy git credentials for empty commit used in postprocessing

diff --git a/.github/workflows/anaylze_dependency.yaml b/.github/workflows/anaylze_dependency.yaml
@@ -0,0 +1,43 @@
+name: Run dependency analyzer
+on:
+  workflow_dispatch:
+    inputs:
+      system:
+        description: the package management system
+        required: true
+        type: choice
+        default: maven
+        options:
+        - maven
+      name:
+        description: the name of the dependency
+        required: true
+        type: string
+      version:
+        description: the version of the dependency
+        required: true
+        type: string
+jobs:
+  Run-dependency-analyzer:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 11
+        cache: maven
+    - name: Set up Maven
+      uses: stCarolas/[email protected]
+      with:
+        maven-version: 3.8.2
+    - name: Install dependency analyzer
+      shell: bash
+      run: |
+        mvn clean install -V --batch-mode --no-transfer-progress -DskipTests
+      working-directory: java-shared-dependencies/dependency-analyzer
+    - name: Check dependency information
+      shell: bash
+      run: |
+        mvn exec:java -Ddep.system=${{ github.event.inputs.system }} -Ddep.name=${{ github.event.inputs.name }} -Ddep.version=${{ github.event.inputs.version }}
+      working-directory: java-shared-dependencies/dependency-analyzer
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,8 +11,8 @@ jobs:
       matrix:
         java: [ 11, 17]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
@@ -61,8 +61,8 @@ jobs:
     # Support for Java 21 is available for all use cases except self-service clients.
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -91,9 +91,9 @@ jobs:
     name: "build(8) except for gapic-generator-java"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Java 8 tests uses JDK 17 to compile and JDK 8 to run tests.
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: temurin
@@ -135,8 +135,8 @@ jobs:
     name: "build(8) for gapic-generator-java"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: temurin
@@ -181,8 +181,8 @@ jobs:
   lint:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: temurin
@@ -195,8 +195,8 @@ jobs:
   compatibility:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: temurin
@@ -213,8 +213,8 @@ jobs:
       matrix:
         java: [ 11, 17 ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
@@ -256,7 +256,7 @@ jobs:
   showcase-native:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
           version: '22.3.2'
@@ -288,10 +288,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout @ target branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.base_ref }}
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -317,8 +317,8 @@ jobs:
   gapic-generator-java-bom:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: temurin
@@ -337,7 +337,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: temurin
@@ -353,3 +353,19 @@ jobs:
       uses: ./java-shared-dependencies/unmanaged-dependency-check
       with:
         bom-path: gapic-generator-java-bom/pom.xml
+
+  dependency_analyzer_unit_test:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 11
+        distribution: temurin
+    - run: mvn -version
+    - name: Unit Tests
+      run: |
+        mvn test --batch-mode --no-transfer-progress
+      working-directory: java-shared-dependencies/dependency-analyzer
diff --git a/.github/workflows/create_additional_release_tag.yaml b/.github/workflows/create_additional_release_tag.yaml
@@ -11,7 +11,7 @@ jobs:
     permissions: write-all
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
     - name: Set up Git
@@ -34,14 +34,3 @@ jobs:
           git tag $TAG_NAME
           git push origin $TAG_NAME
         done
-        # Generate a tag for unmanaged dependencies check.
-        # Use fixed tag so that checks in handwritten libraries do not need to
-        # update the version.
-        CHECK_LATEST_TAG="unmanaged-dependencies-check-latest"
-        # delete and create the tag locally.
-        git tag --delete ${CHECK_LATEST_TAG}
-        git tag ${CHECK_LATEST_TAG}
-        # delete the tag in remote repo and push again.
-        git push --delete origin ${CHECK_LATEST_TAG}
-        git push origin ${CHECK_LATEST_TAG}
-
diff --git a/.github/workflows/verify_library_generation.yaml b/.github/workflows/verify_library_generation.yaml
@@ -10,17 +10,9 @@ on:
 name: verify_library_generation
 jobs:
   integration_tests:
-    strategy:
-      matrix:
-        java: [ 11 ]
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: temurin
-        cache: maven
     - uses: actions/setup-python@v5
       with:
         python-version: 3.11
@@ -41,15 +33,13 @@ jobs:
       run: |
         set -ex
         pushd library_generation
-        pip install -r requirements.in
+        pip install -r requirements.txt
         pip install .
         popd
     - name: Run integration tests
       shell: bash
       run: |
         set -x
-        git config --global user.email "[email protected]"
-        git config --global user.name "Github Workflow"
         python -m unittest library_generation/test/integration_tests.py
   unit_tests:
     strategy:
@@ -73,7 +63,7 @@ jobs:
       run: |
         set -ex
         pushd library_generation
-        pip install -r requirements.in
+        pip install -r requirements.txt
         popd
     - name: install synthtool
       shell: bash
@@ -117,7 +107,7 @@ jobs:
       run: |
         set -ex
         pushd library_generation
-        pip install -r requirements.in
+        pip install -r requirements.txt
         popd
     - name: Lint
       shell: bash

diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,6 @@ target/
 # library generation
 **/output/
 **/googleapis
-library_generation/test/**/golden*/
 library_generation/test/resources/test_monorepo_postprocessing/
 **/*egg-info/
 **/build/

diff --git a/WORKSPACE b/WORKSPACE
@@ -60,7 +60,7 @@ maven_install(
     repositories = ["https://repo.maven.apache.org/maven2/"],
 )
 
-_gapic_generator_java_version = "2.38.1"  # {x-version-update:gapic-generator-java:current}
+_gapic_generator_java_version = "2.38.2-SNAPSHOT"  # {x-version-update:gapic-generator-java:current}
 
 maven_install(
     artifacts = [

diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
@@ -5,14 +5,14 @@
     <groupId>com.google.api</groupId>
     <artifactId>api-common</artifactId>
     <packaging>jar</packaging>
-    <version>2.29.1</version><!-- {x-version-update:api-common:current} -->
+    <version>2.29.2-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
     <name>API Common</name>
     <description>Common utilities for Google APIs in Java</description>
 
     <parent>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java-pom-parent</artifactId>
-        <version>2.38.1</version><!-- {x-version-update:gapic-generator-java:current} -->
+        <version>2.38.2-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
         <relativePath>../gapic-generator-java-pom-parent</relativePath>
     </parent>
 

diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -31,22 +31,22 @@
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax</artifactId>
-                <version>2.46.1</version> <!-- {x-version-update:gax:current} -->
+                <version>2.46.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-grpc</artifactId>
-                <version>2.46.1</version> <!-- {x-version-update:gax-grpc:current} -->
+                <version>2.46.2-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-httpjson</artifactId>
-                <version>2.46.1</version> <!-- {x-version-update:gax:current} -->
+                <version>2.46.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>api-common</artifactId>
-                <version>2.29.1</version> <!-- {x-version-update:api-common:current} -->
+                <version>2.29.2-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
             </dependency>
         </dependencies>