Skip to content

Commit c3a7ffa

Browse files
authored
Merge branch 'main' into add-cumulative-hasher
2 parents 733a55d + 051aea7 commit c3a7ffa

1,996 files changed

Lines changed: 7783 additions & 7252 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/librarian_generation_check.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ jobs:
7373
run: |
7474
if [ -n "$(git status --porcelain)" ]; then
7575
git status
76+
echo "==================== GIT DIFF ===================="
77+
git diff
78+
echo "=================================================="
7679
echo "Regeneration produced code changes! Please run 'librarian generate --all' to update the generated files."
7780
exit 1
7881
fi

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
6767
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
6868
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6969

70-
_gapic_generator_java_version = "2.73.0" # {x-version-update:gapic-generator-java:current}
70+
_gapic_generator_java_version = "2.74.0-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
7171

7272
maven_install(
7373
artifacts = [

gapic-libraries-bom/pom.xml

Lines changed: 220 additions & 220 deletions
Large diffs are not rendered by default.

google-auth-library-java/appengine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.google.auth</groupId>
77
<artifactId>google-auth-library-parent</artifactId>
8-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
8+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

google-auth-library-java/bom/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.auth</groupId>
55
<artifactId>google-auth-library-bom</artifactId>
6-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-bom:current} -->
6+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
77
<packaging>pom</packaging>
88

99
<parent>
@@ -23,22 +23,22 @@
2323
<dependency>
2424
<groupId>com.google.auth</groupId>
2525
<artifactId>google-auth-library-credentials</artifactId>
26-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
26+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
2727
</dependency>
2828
<dependency>
2929
<groupId>com.google.auth</groupId>
3030
<artifactId>google-auth-library-oauth2-http</artifactId>
31-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
31+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
3232
</dependency>
3333
<dependency>
3434
<groupId>com.google.auth</groupId>
3535
<artifactId>google-auth-library-appengine</artifactId>
36-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
36+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
3737
</dependency>
3838
<dependency>
3939
<groupId>com.google.auth</groupId>
4040
<artifactId>google-auth-library-cab-token-generator</artifactId>
41-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
41+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
4242
</dependency>
4343
</dependencies>
4444
</dependencyManagement>

google-auth-library-java/cab-token-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.google.auth</groupId>
88
<artifactId>google-auth-library-parent</artifactId>
9-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
9+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
1010
</parent>
1111

1212
<artifactId>google-auth-library-cab-token-generator</artifactId>

google-auth-library-java/credentials/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.auth</groupId>
66
<artifactId>google-auth-library-parent</artifactId>
7-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
7+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

google-auth-library-java/oauth2_http/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.google.auth</groupId>
99
<artifactId>google-auth-library-parent</artifactId>
10-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
10+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

google-auth-library-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.auth</groupId>
77
<artifactId>google-auth-library-parent</artifactId>
8-
<version>1.48.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
8+
<version>1.49.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
99
<packaging>pom</packaging>
1010
<name>Google Auth Library for Java</name>
1111
<description>Client libraries providing authentication and
@@ -86,7 +86,7 @@
8686
<project.tink.version>1.15.0</project.tink.version>
8787
<project.slf4j.version>2.0.17</project.slf4j.version>
8888
<project.gson.version>2.13.2</project.gson.version>
89-
<project.api-common.version>2.64.0</project.api-common.version><!-- {x-version-update:api-common:current} -->
89+
<project.api-common.version>2.65.0-SNAPSHOT</project.api-common.version><!-- {x-version-update:api-common:current} -->
9090
<surefire.version>3.5.2</surefire.version>
9191
<clirr.skip>true</clirr.skip>
9292
</properties>

google-cloud-jar-parent/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>google-cloud-jar-parent</artifactId>
77
<groupId>com.google.cloud</groupId>
8-
<version>1.87.0</version><!-- {x-version-update:google-cloud-java:current} -->
8+
<version>1.88.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
99
<packaging>pom</packaging>
1010
<name>Google Cloud JAR Parent</name>
1111
<description>
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
1717
<artifactId>google-cloud-pom-parent</artifactId>
18-
<version>1.87.0</version><!-- {x-version-update:google-cloud-java:current} -->
18+
<version>1.88.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
1919
<relativePath>../google-cloud-pom-parent/pom.xml</relativePath>
2020
</parent>
2121
<properties>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.google.cloud</groupId>
3030
<artifactId>google-cloud-shared-dependencies</artifactId>
31-
<version>3.63.0</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
31+
<version>3.64.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
3232
<type>pom</type>
3333
<scope>import</scope>
3434
</dependency>
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>com.google.cloud</groupId>
4949
<artifactId>google-cloud-storage</artifactId>
50-
<version>2.69.0</version><!-- {x-version-update:google-cloud-storage:current} -->
50+
<version>2.70.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
5151
</dependency>
5252
<dependency>
5353
<groupId>com.google.apis</groupId>

0 commit comments

Comments
 (0)