Skip to content

Commit 456914c

Browse files
feat: add v1 to shopping-merchant subapis (#11716)
Grouping some shopping-merchant subapis library generation for new v1 variant together. Grouping to avoid manual merging conflicts. BEGIN_COMMIT_OVERRIDE BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-lfp Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 790778653 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-order-tracking Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 791137429 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-accounts Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 791185257 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-promotions Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 791137587 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-quota Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 790778741 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-reports Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 791184292 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-products Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 791134255 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: add v1 to shopping-merchant-issue-resolution Add proto path for v1 and let automation generate the library. PiperOrigin-RevId: 790874101 END_NESTED_COMMIT END_COMMIT_OVERRIDE --------- Co-authored-by: cloud-java-bot <[email protected]>
1 parent 0524ca8 commit 456914c

File tree

1,657 files changed

+686942
-0
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,657 files changed

+686942
-0
lines changed

generation_config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,7 @@ libraries:
12421242
group_id: com.google.shopping
12431243
cloud_api: false
12441244
GAPICs:
1245+
- proto_path: google/shopping/merchant/issueresolution/v1
12451246
- proto_path: google/shopping/merchant/issueresolution/v1beta
12461247
library_name: java-shopping-merchant-issue-resolution
12471248
requires_billing: true
@@ -1259,6 +1260,7 @@ libraries:
12591260
group_id: com.google.shopping
12601261
cloud_api: false
12611262
GAPICs:
1263+
- proto_path: google/shopping/merchant/ordertracking/v1
12621264
- proto_path: google/shopping/merchant/ordertracking/v1beta
12631265
library_name: java-shopping-merchant-order-tracking
12641266
requires_billing: true
@@ -2232,6 +2234,7 @@ libraries:
22322234
group_id: com.google.shopping
22332235
cloud_api: false
22342236
GAPICs:
2237+
- proto_path: google/shopping/merchant/accounts/v1
22352238
- proto_path: google/shopping/merchant/accounts/v1beta
22362239
library_name: shopping-merchant-accounts
22372240
requires_billing: true
@@ -2293,6 +2296,7 @@ libraries:
22932296
group_id: com.google.shopping
22942297
cloud_api: false
22952298
GAPICs:
2299+
- proto_path: google/shopping/merchant/lfp/v1
22962300
- proto_path: google/shopping/merchant/lfp/v1beta
22972301
requires_billing: true
22982302

@@ -2325,6 +2329,7 @@ libraries:
23252329
group_id: com.google.shopping
23262330
cloud_api: false
23272331
GAPICs:
2332+
- proto_path: google/shopping/merchant/products/v1
23282333
- proto_path: google/shopping/merchant/products/v1beta
23292334
library_name: shopping-merchant-products
23302335
- api_shortname: merchantapi
@@ -2340,6 +2345,7 @@ libraries:
23402345
group_id: com.google.shopping
23412346
cloud_api: false
23422347
GAPICs:
2348+
- proto_path: google/shopping/merchant/promotions/v1
23432349
- proto_path: google/shopping/merchant/promotions/v1beta
23442350
library_name: shopping-merchant-promotions
23452351
requires_billing: true
@@ -2356,6 +2362,7 @@ libraries:
23562362
group_id: com.google.shopping
23572363
cloud_api: false
23582364
GAPICs:
2365+
- proto_path: google/shopping/merchant/quota/v1
23592366
- proto_path: google/shopping/merchant/quota/v1beta
23602367
requires_billing: true
23612368

@@ -2367,6 +2374,7 @@ libraries:
23672374
cloud_api: false
23682375
distribution_name: com.google.shopping:google-shopping-merchant-reports
23692376
GAPICs:
2377+
- proto_path: google/shopping/merchant/reports/v1
23702378
- proto_path: google/shopping/merchant/reports/v1beta
23712379
- proto_path: google/shopping/merchant/reports/v1alpha
23722380

java-java-shopping-merchant-issue-resolution/google-shopping-merchant-issue-resolution-bom/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,21 @@
3333
<artifactId>grpc-google-shopping-merchant-issue-resolution-v1beta</artifactId>
3434
<version>0.11.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-shopping-merchant-issue-resolution-v1beta:current} -->
3535
</dependency>
36+
<dependency>
37+
<groupId>com.google.shopping.api.grpc</groupId>
38+
<artifactId>grpc-google-shopping-merchant-issue-resolution-v1</artifactId>
39+
<version>0.11.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-shopping-merchant-issue-resolution-v1:current} -->
40+
</dependency>
3641
<dependency>
3742
<groupId>com.google.shopping.api.grpc</groupId>
3843
<artifactId>proto-google-shopping-merchant-issue-resolution-v1beta</artifactId>
3944
<version>0.11.0-SNAPSHOT</version><!-- {x-version-update:proto-google-shopping-merchant-issue-resolution-v1beta:current} -->
4045
</dependency>
46+
<dependency>
47+
<groupId>com.google.shopping.api.grpc</groupId>
48+
<artifactId>proto-google-shopping-merchant-issue-resolution-v1</artifactId>
49+
<version>0.11.0-SNAPSHOT</version><!-- {x-version-update:proto-google-shopping-merchant-issue-resolution-v1:current} -->
50+
</dependency>
4151
</dependencies>
4252
</dependencyManagement>
4353
</project>

java-java-shopping-merchant-issue-resolution/google-shopping-merchant-issue-resolution/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<artifactId>proto-google-common-protos</artifactId>
4242
</dependency>
4343

44+
<dependency>
45+
<groupId>com.google.shopping.api.grpc</groupId>
46+
<artifactId>proto-google-shopping-merchant-issue-resolution-v1</artifactId>
47+
</dependency>
4448
<dependency>
4549
<groupId>com.google.shopping.api.grpc</groupId>
4650
<artifactId>proto-google-shopping-merchant-issue-resolution-v1beta</artifactId>
@@ -76,6 +80,11 @@
7680
<artifactId>grpc-google-common-protos</artifactId>
7781
<scope>test</scope>
7882
</dependency>
83+
<dependency>
84+
<groupId>com.google.shopping.api.grpc</groupId>
85+
<artifactId>grpc-google-shopping-merchant-issue-resolution-v1</artifactId>
86+
<scope>test</scope>
87+
</dependency>
7988
<dependency>
8089
<groupId>com.google.api.grpc</groupId>
8190
<artifactId>grpc-google-iam-v1</artifactId>

0 commit comments

Comments
 (0)