Merge branch 'main' into directpath-compatible-getter

googleapis · Apr 18, 2024 · b1be846 · b1be846
2 parents a1703eb + 371753e
commit b1be846
Show file tree

Hide file tree

Showing 691 changed files with 5,557 additions and 2,248 deletions.
diff --git a/.cloudbuild/graalvm/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.28.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.7.6'
+  _JAVA_SHARED_CONFIG_VERSION: '1.7.7'
 
 steps:
   # GraalVM A build

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

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

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
@@ -327,7 +327,7 @@ jobs:
       run: |
         mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
     - name: Validate gapic-generator-java-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@659764fa38f3c80b36319e9692d5a46b23f599eb
+      uses: googleapis/java-cloud-bom/tests/validate-bom@7071341075a2aea70d84ac92c90411988a690560
       with:
         bom-path: gapic-generator-java-bom/pom.xml
 
@@ -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/.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/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg
@@ -30,12 +30,4 @@ env_vars: {
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account"
-}
-
-# Defines the google-cloud-java modules to be tested downstream tested with GraalVM native image
-# builds.
-env_vars: {
-  key: "MODULES_UNDER_TEST"
-  value: "java-kms,java-os-login" # KMS's ITKmsTest exercises gax-java's native image
-  # reflect-config.json. OS Login has a similar issue.
-}
+}
diff --git a/.kokoro/presubmit/graalvm-native-17-downstream.cfg b/.kokoro/presubmit/graalvm-native-17-downstream.cfg
diff --git a/.kokoro/presubmit/graalvm-native-downstream.cfg b/.kokoro/presubmit/graalvm-native-downstream.cfg
diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -55,7 +55,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <id>unit-tests-report-aggregate</id>

diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.7.6</version>
+    <version>1.7.7</version>
     <relativePath/>
   </parent>
 
@@ -31,11 +31,12 @@
     <google.http-client.version>1.44.1</google.http-client.version>
     <gson.version>2.10.1</gson.version>
     <guava.version>33.1.0-jre</guava.version>
-    <protobuf.version>3.25.2</protobuf.version>
-    <opentelemetry.version>1.36.0</opentelemetry.version>
+    <protobuf.version>3.25.3</protobuf.version>
+    <opentelemetry.version>1.37.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
     <errorprone.version>2.26.1</errorprone.version>
     <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
+    <threetenbp.version>1.6.8</threetenbp.version>
   </properties>
 
   <developers>
@@ -154,7 +155,7 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.11</version>
+            <version>0.8.12</version>
             <executions>
               <execution>
                 <id>unit-test-execution</id>

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
@@ -106,7 +106,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.13.0</version>
         <configuration>
           <source>8</source>
           <target>8</target>
@@ -331,7 +331,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.11</version>
+        <version>0.8.12</version>
         <executions>
           <execution>
             <goals>

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -26,7 +26,7 @@ version.gax_httpjson=2.46.2-SNAPSHOT
 # The protobuf version is only used for generating gradle files for showcase module,
 # not for self-service clients (from googleapis project).
 
-version.com_google_protobuf=3.25.2
+version.com_google_protobuf=3.25.3
 version.google_java_format=1.15.0
 version.io_grpc=1.62.2
 
@@ -35,26 +35,26 @@ version.io_grpc=1.62.2
 # It should be constructed the following way:
 #   1) Take full artifact id (including the group and classifier (if any) portions) and remove version portion.
 #   2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
-maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.37.0
-maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.37.0
+maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.37.1
+maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.37.1
 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.23.0
 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.23.0
-maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.36.0
+maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.37.0
 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1
 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1
 maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.65.Final
-maven.io_netty_netty_handler=io.netty:netty-handler:4.1.107.Final
-maven.io_netty_netty_common=io.netty:netty-common:4.1.107.Final
-maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.107.Final
-maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.107.Final
-maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.107.Final
-maven.io_netty_netty_codec=io.netty:netty-codec:4.1.107.Final
-maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.107.Final
-maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.107.Final
-maven.io_netty_netty_transport=io.netty:netty-transport:4.1.107.Final
-maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.107.Final
-maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.107.Final
+maven.io_netty_netty_handler=io.netty:netty-handler:4.1.109.Final
+maven.io_netty_netty_common=io.netty:netty-common:4.1.109.Final
+maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.109.Final
+maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.109.Final
+maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.109.Final
+maven.io_netty_netty_codec=io.netty:netty-codec:4.1.109.Final
+maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.109.Final
+maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.109.Final
+maven.io_netty_netty_transport=io.netty:netty-transport:4.1.109.Final
+maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.109.Final
+maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.109.Final
 maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.27.0
 maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1
@@ -67,10 +67,10 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_
 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.4
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.4
-maven.com_google_api_api_common=com.google.api:api-common:2.28.0
-maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8
-maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.32.0
-maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.32.0
+maven.com_google_api_api_common=com.google.api:api-common:2.29.1
+maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.9
+maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.32.1
+maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.32.1
 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.44.1
 maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.44.1
 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23
@@ -83,5 +83,5 @@ maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2
 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3
 maven.com_google_truth_truth=com.google.truth:truth:1.4.2
 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0
-maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.12
+maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.13
 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6