Skip to content

Commit

Permalink
Merge branch 'main' into chore/add-generation-config
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeWang1127 committed May 14, 2024
2 parents c18090f + a472620 commit b46723d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 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@f3c611a09b556e81029d5588afe22ca6a15b0cef
uses: googleapis/java-cloud-bom/tests/validate-bom@db4265ffa7e23c64ae37d9804394569e4577b3e2
with:
bom-path: gapic-generator-java-bom/pom.xml

Expand Down
2 changes: 1 addition & 1 deletion gax-java/dependencies.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.14
maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.15
maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6
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 @@ -56,7 +56,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.11.0</version>
<version>5.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion java-shared-dependencies/third-party-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<findbugs.version>3.0.2</findbugs.version>
<jackson.version>2.17.1</jackson.version>
<errorprone.version>2.27.1</errorprone.version>
<codec.version>1.16.1</codec.version>
<codec.version>1.17.0</codec.version>
<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 -->
Expand Down

0 comments on commit b46723d

Please sign in to comment.