Skip to content

Commit

Permalink
Merge branch 'main' into renovate/errorprone.version
Browse files Browse the repository at this point in the history
  • Loading branch information
diegomarquezp authored May 31, 2024
2 parents f305785 + 03b3eb4 commit c9cfc94
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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@db4265ffa7e23c64ae37d9804394569e4577b3e2
uses: googleapis/java-cloud-bom/tests/validate-bom@59c776be18728bcdc53f868c497baf1f5039abb6
with:
bom-path: gapic-generator-java-bom/pom.xml

Expand Down
2 changes: 1 addition & 1 deletion gapic-generator-java-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<grpc.version>1.62.2</grpc.version>
<google.auth.version>1.23.0</google.auth.version>
<google.http-client.version>1.44.1</google.http-client.version>
<google.http-client.version>1.44.2</google.http-client.version>
<gson.version>2.11.0</gson.version>
<guava.version>33.1.0-jre</guava.version>
<protobuf.version>3.25.3</protobuf.version>
Expand Down
6 changes: 3 additions & 3 deletions gax-java/dependencies.properties
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ maven.com_google_api_api_common=com.google.api:api-common:2.31.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.34.1
maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.34.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.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.44.2
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.44.2
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.5
Expand All @@ -84,7 +84,7 @@ maven.org_mockito_mockito_junit_jupiter=org.mockito:mockito-junit-jupiter:4.11.0
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.16
maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.17
maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6
maven.org_junit_jupiter_junit_jupiter_api=org.junit.jupiter:junit-jupiter-api:5.10.2
maven.org_junit_jupiter_junit_jupiter_params=org.junit.jupiter:junit-jupiter-params:5.10.2
2 changes: 1 addition & 1 deletion java-shared-dependencies/dependency-analyzer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion java-shared-dependencies/first-party-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<site.installationModule>${project.artifactId}</site.installationModule>
<grpc-gcp.version>1.6.0</grpc-gcp.version>
<google.oauth-client.version>1.36.0</google.oauth-client.version>
<google.api-client.version>2.4.0</google.api-client.version>
<google.api-client.version>2.6.0</google.api-client.version>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions java-shared-dependencies/third-party-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>
<httpcomponents.httpclient.version>4.5.14</httpcomponents.httpclient.version>
<!-- ensure checker-qual version matches what Guava uses -->
<checker-qual.version>3.42.0</checker-qual.version>
<checker-qual.version>3.43.0</checker-qual.version>
<perfmark-api.version>0.27.0</perfmark-api.version>
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
<google.cloud.opentelemetry.version>0.28.0</google.cloud.opentelemetry.version>
<google.cloud.opentelemetry.version>0.29.0</google.cloud.opentelemetry.version>
<opentelemetry-grpc-instrumentation.version>2.1.0-alpha</opentelemetry-grpc-instrumentation.version>
<flogger.version>0.8</flogger.version>
<arrow.version>15.0.2</arrow.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions showcase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down Expand Up @@ -169,7 +169,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down

0 comments on commit c9cfc94

Please sign in to comment.