Skip to content

Commit 0738a5a

Browse files
lqiu96lqiu96
committed
chore: Resolve merge conflicts
2 parents b07788b + 4a427ea commit 0738a5a

File tree

1,927 files changed

+6767
-6756
lines changed

Some content is hidden

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

1,927 files changed

+6767
-6756
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,39 +122,50 @@ jobs:
122122
- 'google-auth-library-java/**/*.java'
123123
- 'sdk-platform-java/gax-java/**/*.java'
124124
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
125+
- 'sdk-platform-java/java-core/**/*.java'
126+
- 'sdk-platform-java/api-common-java/**/*java'
125127
java-bigquerystorage:
126128
- 'java-bigquerystorage/**'
127129
- 'google-auth-library-java/**/*.java'
128130
- 'sdk-platform-java/gax-java/**/*.java'
129131
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
132+
- 'sdk-platform-java/java-core/**/*.java'
133+
- 'sdk-platform-java/api-common-java/**/*java'
130134
java-datastore:
131135
- 'java-datastore/**'
132136
- 'google-auth-library-java/**/*.java'
133137
- 'sdk-platform-java/gax-java/**/*.java'
134138
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
139+
- 'sdk-platform-java/java-core/**/*.java'
140+
- 'sdk-platform-java/api-common-java/**/*java'
135141
java-logging-logback:
136142
- 'java-logging-logback/**'
137143
- 'google-auth-library-java/**/*.java'
138144
- 'sdk-platform-java/gax-java/**/*.java'
139145
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
146+
- 'sdk-platform-java/java-core/**/*.java'
147+
- 'sdk-platform-java/api-common-java/**/*java'
140148
java-logging:
141149
- 'java-logging/**'
142150
- 'google-auth-library-java/**/*.java'
143151
- 'sdk-platform-java/gax-java/**/*.java'
144152
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
153+
- 'sdk-platform-java/java-core/**/*.java'
154+
- 'sdk-platform-java/api-common-java/**/*java'
145155
java-spanner:
146156
- 'java-spanner/**'
147157
- 'google-auth-library-java/**/*.java'
148158
- 'sdk-platform-java/gax-java/**/*.java'
149159
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
160+
- 'sdk-platform-java/java-core/**/*.java'
161+
- 'sdk-platform-java/api-common-java/**/*java'
150162
java-storage:
151163
- 'java-storage/**'
152164
- 'google-auth-library-java/**/*.java'
153165
- 'sdk-platform-java/gax-java/**/*.java'
154166
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
155-
sdk-platform-java:
156-
- 'sdk-platform-java/**'
157-
- 'google-auth-library-java/**/*.java'
167+
- 'sdk-platform-java/java-core/**/*.java'
168+
- 'sdk-platform-java/api-common-java/**/*java'
158169
split-units:
159170
runs-on: ubuntu-latest
160171
needs: changes

‎.github/workflows/generated_files_sync.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
pull_request:
1818
name: generation diff
1919
env:
20-
library_generation_image_tag: 2.70.0 # {x-version-update:gapic-generator-java:current}
20+
library_generation_image_tag: 2.71.0-SNAPSHOT # {x-version-update:gapic-generator-java:current}
2121
jobs:
2222
root-pom:
2323
# root pom.xml does not have diff from generated one

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
head_ref: ${{ github.head_ref }}
4545
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
4646
force_regenerate_all: ${{ github.event.pull_request.head.ref == 'generate-libraries-main' }}
47-
image_tag: 2.70.0 # {x-version-update:gapic-generator-java:current}
47+
image_tag: 2.71.0-SNAPSHOT # {x-version-update:gapic-generator-java:current}

‎.github/workflows/sdk-platform-java-downstream_unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
repo:
3434
- java-bigtable
3535
- java-firestore
36-
- java-logging
36+
- java-pubsub
3737
steps:
3838
- name: Checkout sdk-platform-java
3939
uses: actions/checkout@v3

‎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.70.0" # {x-version-update:gapic-generator-java:current}
70+
_gapic_generator_java_version = "2.71.0-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
7171

7272
maven_install(
7373
artifacts = [

‎gapic-libraries-bom/pom.xml‎

Lines changed: 214 additions & 214 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.45.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
8+
<version>1.46.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.45.0</version><!-- {x-version-update:google-auth-library-bom:current} -->
6+
<version>1.46.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.45.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
26+
<version>1.46.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.45.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
31+
<version>1.46.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.45.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
36+
<version>1.46.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.45.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
41+
<version>1.46.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.45.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
9+
<version>1.46.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.45.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
7+
<version>1.46.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

0 commit comments

Comments
 (0)