Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge java-core, java-shared-dependencies, and java-iam into google-cloud-java #9051

Merged
merged 3,295 commits into from
Feb 1, 2023

Conversation

suztomo
Copy link
Member

@suztomo suztomo commented Jan 31, 2023

Message to me: Use MERGE commit so that the commit history is preserved.

How I created this pull request

sh generation/merge_repository.sh
cd generation/monorepo/google-cloud-java-merged
git checkout -b merge_repos
git rm -r java-core/.OwlBot.yaml {java-core,java-iam,java-shared-dependencies}/{.github,.kokoro,CODE_OF_CONDUCT.md,CONTRIBUTING.md,LICENSE,SECURITY.md,codecov.yaml,java.header,renovate.json,versions.txt,.gitignore}
 # Remove repo-metadata in java-shared-dependencies so that the generation script does
 # not recognize this module as a client library
 git rm java-shared-dependencies/.repo-metadata.json

Manually modify parent poms:

  • java-core: google-cloud-jar-parent
  • java-shared-dependencies: google-cloud-pom-parent
  • java-iam: google-cloud-jar-parent

Manually modify java-core so that it inherits google-cloud-jar-parent and no need to set versions listed in the shared dependencies BOM.

Manually modify check_non_release_please_versions.sh to adjust java-shared-dependencies are ok to declare versions.

Manually modify google-cloud-jar-parent/pom.xml so that it uses the shared dependencies BOM within this repository.

Ran bash generation/consolidate_config.sh to remove unnecessary XML elements.

Manually remove "distributionManagement" section in the newly added modules.

Manually removed .OwlBot.yaml from java-core and java-shared-dependencies because they are not generated libraries. Applied generation/set_owlbot_config.sh to update java-iam/.OwlBot.yaml.

Ran:

git rm java-iam/license-checks.xml java-core/license-checks.xml java-shared-dependencies/license-checks.xml
git rm java-shared-dependencies/owlbot.py java-core/owlbot.py

Ran generation/update_owlbot_postprocessor_config.sh to update java-iam/owlbot.py.

Manually modified generation/set_parent_pom.sh to exclude java-shared-dependencies; otherwise java-shared-dependencies would set parent as google-cloud-jar-parent, which depends on java-shared-dependencies (circular dependency and build failure).

release-please bot and others added 30 commits November 7, 2022 01:02
🤖 I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
…essor job (#1691) (#1007)

* chore: install dependencies through requirements file
Source-Link: https://togithub.com/googleapis/synthtool/commit/35f4cbaf1295a726cb43fd4471129ec74b48e04e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:821ab7aba89af2c7907e29297bba024d4cd5366d0684e5eb463391cdf4edc9ee
🤖 I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.api:gax-grpc](https://togithub.com/googleapis/gax-java) | `2.19.4` -> `2.19.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.19.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.19.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.19.5/compatibility-slim/2.19.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.19.5/confidence-slim/2.19.4)](https://docs.renovatebot.com/merge-confidence/) |
| [com.google.api:gax-bom](https://togithub.com/googleapis/gax-java) | `2.19.4` -> `2.19.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.19.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.19.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.19.5/compatibility-slim/2.19.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.19.5/confidence-slim/2.19.4)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>googleapis/gax-java</summary>

### [`v2.19.5`](https://togithub.com/googleapis/gax-java/blob/HEAD/CHANGELOG.md#&#8203;2195-httpsgithubcomgoogleapisgax-javacomparev2194v2195-2022-11-07)

[Compare Source](https://togithub.com/googleapis/gax-java/compare/v2.19.4...v2.19.5)

##### Bug Fixes

-   **deps:** Update dependency com.google.cloud:google-cloud-shared-config to v1.5.4 ([#&#8203;1840](https://togithub.com/googleapis/gax-java/issues/1840)) ([8f7a38c](https://togithub.com/googleapis/gax-java/commit/8f7a38ca0a9d187af49649adf7d96ef97c9e9915))
-   **deps:** Update dependency com.google.code.gson:gson to v2.10 ([#&#8203;1845](https://togithub.com/googleapis/gax-java/issues/1845)) ([816e666](https://togithub.com/googleapis/gax-java/commit/816e6665e06bc65cbaf2703617342c8db9780115))
-   **deps:** Update dependency com.google.protobuf:protobuf-bom to v3.21.9 ([#&#8203;1850](https://togithub.com/googleapis/gax-java/issues/1850)) ([f270ac4](https://togithub.com/googleapis/gax-java/commit/f270ac45b6a21d531eb8bd75157f2784fcad90fc))
-   **deps:** Update dependency io.grpc:grpc-bom to v1.50.2 ([#&#8203;1842](https://togithub.com/googleapis/gax-java/issues/1842)) ([11c4a7c](https://togithub.com/googleapis/gax-java/commit/11c4a7caf31de256f29678de829f11f9558adcfd))
-   **deps:** Update dependency org.mockito:mockito-core to v4.8.1 ([#&#8203;1843](https://togithub.com/googleapis/gax-java/issues/1843)) ([bf67fc2](https://togithub.com/googleapis/gax-java/commit/bf67fc26236286d72b9ddcb2e66113fdac74b51a))
-   **deps:** Update dependency org.threeten:threetenbp to v1.6.4 ([#&#8203;1857](https://togithub.com/googleapis/gax-java/issues/1857)) ([a9e2374](https://togithub.com/googleapis/gax-java/commit/a9e23744a40f6e5484f1834824515f8ae952873c))

##### Dependencies

-   update dependency com.google.api:api-common to 2.2.2 ([ad7ad1c](https://togithub.com/googleapis/gax-java/commit/ad7ad1c5b450cd0569ff34d3b553dd1493fa462c))
-   update dependency com.google.api.grpc:grpc-google-common-protos to 2.10.0 ([ad7ad1c](https://togithub.com/googleapis/gax-java/commit/ad7ad1c5b450cd0569ff34d3b553dd1493fa462c))
-   Update dependency com.google.api.grpc:proto-google-common-protos to 2.10.0 ([ad7ad1c](https://togithub.com/googleapis/gax-java/commit/ad7ad1c5b450cd0569ff34d3b553dd1493fa462c))
-   update dependency com.google.auth:google-auth-library-credentials to 1.12.1 ([ad7ad1c](https://togithub.com/googleapis/gax-java/commit/ad7ad1c5b450cd0569ff34d3b553dd1493fa462c))
-   update dependency com.google.auth:google-auth-library-oauth2-http to 1.12.1 ([ad7ad1c](https://togithub.com/googleapis/gax-java/commit/ad7ad1c5b450cd0569ff34d3b553dd1493fa462c))
-   update dependency com.google.http-client:google-http-client to 1.42.3 ([ad7ad1c](https://togithub.com/googleapis/gax-java/commit/ad7ad1c5b450cd0569ff34d3b553dd1493fa462c))
-   update dependency com.google.http-client:google-http-client-gson to 1.42.3 ([ad7ad1c](https://togithub.com/googleapis/gax-java/commit/ad7ad1c5b450cd0569ff34d3b553dd1493fa462c))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xOS4wIiwidXBkYXRlZEluVmVyIjoiMzQuMTkuMCJ9-->
🤖 I have created a release *beep* *boop*
---


## [3.0.6](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.5...v3.0.6) (2022-11-07)


### Dependencies

* Update dependency com.fasterxml.jackson:jackson-bom to v2.14.0 ([#901](https://togithub.com/googleapis/java-shared-dependencies/issues/901)) ([4e3d116](https://togithub.com/googleapis/java-shared-dependencies/commit/4e3d1162403a236443c8dbb00cbe23bd6c6c225a))
* Update dependency com.google.api-client:google-api-client-bom to v2.0.1 ([#899](https://togithub.com/googleapis/java-shared-dependencies/issues/899)) ([d2baed5](https://togithub.com/googleapis/java-shared-dependencies/commit/d2baed57f798b7c153678ce87bd486f9808dbc46))
* Update dependency com.google.api:api-common to v2.2.2 ([#892](https://togithub.com/googleapis/java-shared-dependencies/issues/892)) ([292cd39](https://togithub.com/googleapis/java-shared-dependencies/commit/292cd39d3b5fca9be15621b5e483e3b6386ec2ef))
* Update dependency com.google.cloud:grpc-gcp to v1.3.1 ([#884](https://togithub.com/googleapis/java-shared-dependencies/issues/884)) ([f22fce6](https://togithub.com/googleapis/java-shared-dependencies/commit/f22fce69481f0ecec1c5438b9f1a938db074cf4c))
* Update dependency com.google.code.gson:gson to v2.10 ([#887](https://togithub.com/googleapis/java-shared-dependencies/issues/887)) ([cbe8973](https://togithub.com/googleapis/java-shared-dependencies/commit/cbe8973436da3c34be00d0742b3db11af106f585))
* Update dependency com.google.http-client:google-http-client-bom to v1.42.3 ([#893](https://togithub.com/googleapis/java-shared-dependencies/issues/893)) ([21e7515](https://togithub.com/googleapis/java-shared-dependencies/commit/21e7515d351cf8a53cb7590267231930bedfaf88))
* Update dependency com.google.protobuf:protobuf-bom to v3.21.9 ([#889](https://togithub.com/googleapis/java-shared-dependencies/issues/889)) ([30effe6](https://togithub.com/googleapis/java-shared-dependencies/commit/30effe65dc103a694fab5bf9537e96a0def0d4d9))
* Update dependency io.grpc:grpc-bom to v1.50.2 ([#878](https://togithub.com/googleapis/java-shared-dependencies/issues/878)) ([0e155c4](https://togithub.com/googleapis/java-shared-dependencies/commit/0e155c476ee8280921d234286eed8732997dd2a6))
* Update dependency org.checkerframework:checker-qual to v3.27.0 ([#896](https://togithub.com/googleapis/java-shared-dependencies/issues/896)) ([f6c1155](https://togithub.com/googleapis/java-shared-dependencies/commit/f6c1155bbd0a01b6a25948f7c6117a50fd85e9de))
* Update dependency org.threeten:threetenbp to v1.6.4 ([#894](https://togithub.com/googleapis/java-shared-dependencies/issues/894)) ([478ae53](https://togithub.com/googleapis/java-shared-dependencies/commit/478ae530c8140d92f4e083c5e06ecd6f4f228f05))
* Update gax.version to v2.19.5 ([#903](https://togithub.com/googleapis/java-shared-dependencies/issues/903)) ([ba1ae38](https://togithub.com/googleapis/java-shared-dependencies/commit/ba1ae389185f2fffaec10cf69ad6644389af9571))
* Update google.common-protos.version to v2.10.0 ([#900](https://togithub.com/googleapis/java-shared-dependencies/issues/900)) ([46aeddf](https://togithub.com/googleapis/java-shared-dependencies/commit/46aeddfe2ce2325ab8ae9a6654c500f847855acb))
* Update google.core.version to v2.8.23 ([#885](https://togithub.com/googleapis/java-shared-dependencies/issues/885)) ([1092bbe](https://togithub.com/googleapis/java-shared-dependencies/commit/1092bbe5f7a9d84dc1013f8a3c8e62e5c26ab2ab))
* Update google.core.version to v2.8.24 ([#890](https://togithub.com/googleapis/java-shared-dependencies/issues/890)) ([70791a5](https://togithub.com/googleapis/java-shared-dependencies/commit/70791a5ce678c5c7ebbb70e1527cab69587307ec))
* Update google.core.version to v2.8.27 ([#902](https://togithub.com/googleapis/java-shared-dependencies/issues/902)) ([a53f404](https://togithub.com/googleapis/java-shared-dependencies/commit/a53f404799ac6fd4e3005ea781f74a245fd7b7c7))
* Update iam.version to v1.6.6 ([#886](https://togithub.com/googleapis/java-shared-dependencies/issues/886)) ([122cf9d](https://togithub.com/googleapis/java-shared-dependencies/commit/122cf9d01a73d78768544b0638efc8cca995fd87))
* Update iam.version to v1.6.7 ([#895](https://togithub.com/googleapis/java-shared-dependencies/issues/895)) ([feda2e7](https://togithub.com/googleapis/java-shared-dependencies/commit/feda2e7d2d9026dffcdfe71f443199505e5bb215))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
…cies to v3.0.6 (#506)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.5` -> `3.0.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/compatibility-slim/3.0.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/confidence-slim/3.0.5)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>googleapis/java-shared-dependencies</summary>

### [`v3.0.6`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#&#8203;306-httpsgithubcomgoogleapisjava-shared-dependenciescomparev305v306-2022-11-07)

[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.5...v3.0.6)

##### Dependencies

-   Update dependency com.fasterxml.jackson:jackson-bom to v2.14.0 ([#&#8203;901](https://togithub.com/googleapis/java-shared-dependencies/issues/901)) ([33c5511](https://togithub.com/googleapis/java-shared-dependencies/commit/33c55112ff485da1d7a0a32d8b6dade33aa04ff8))
-   Update dependency com.google.api-client:google-api-client-bom to v2.0.1 ([#&#8203;899](https://togithub.com/googleapis/java-shared-dependencies/issues/899)) ([4029e89](https://togithub.com/googleapis/java-shared-dependencies/commit/4029e89be507ddfa030515565fdb6fbf8997324e))
-   Update dependency com.google.api:api-common to v2.2.2 ([#&#8203;892](https://togithub.com/googleapis/java-shared-dependencies/issues/892)) ([5c59fbd](https://togithub.com/googleapis/java-shared-dependencies/commit/5c59fbd3c3cf3efbfda50420c8048e3ff257084c))
-   Update dependency com.google.cloud:grpc-gcp to v1.3.1 ([#&#8203;884](https://togithub.com/googleapis/java-shared-dependencies/issues/884)) ([9fffe24](https://togithub.com/googleapis/java-shared-dependencies/commit/9fffe243b631565a00b0a848a6c73163b1dd33a4))
-   Update dependency com.google.code.gson:gson to v2.10 ([#&#8203;887](https://togithub.com/googleapis/java-shared-dependencies/issues/887)) ([15017de](https://togithub.com/googleapis/java-shared-dependencies/commit/15017de39a35f90bc1b38b828edc23fdce524a07))
-   Update dependency com.google.http-client:google-http-client-bom to v1.42.3 ([#&#8203;893](https://togithub.com/googleapis/java-shared-dependencies/issues/893)) ([4c0de9b](https://togithub.com/googleapis/java-shared-dependencies/commit/4c0de9bd188bfab5fe126c8b01b4d7168f8a5079))
-   Update dependency com.google.protobuf:protobuf-bom to v3.21.9 ([#&#8203;889](https://togithub.com/googleapis/java-shared-dependencies/issues/889)) ([8576271](https://togithub.com/googleapis/java-shared-dependencies/commit/85762716d1bbb97c447f86451094fb8af2528470))
-   Update dependency io.grpc:grpc-bom to v1.50.2 ([#&#8203;878](https://togithub.com/googleapis/java-shared-dependencies/issues/878)) ([fd569af](https://togithub.com/googleapis/java-shared-dependencies/commit/fd569af1e5f1b195e2421fc9e02d8b67afe1c638))
-   Update dependency org.checkerframework:checker-qual to v3.27.0 ([#&#8203;896](https://togithub.com/googleapis/java-shared-dependencies/issues/896)) ([f0f7931](https://togithub.com/googleapis/java-shared-dependencies/commit/f0f7931937a0ed9a32fd87cd58c82b787d368242))
-   Update dependency org.threeten:threetenbp to v1.6.4 ([#&#8203;894](https://togithub.com/googleapis/java-shared-dependencies/issues/894)) ([899682d](https://togithub.com/googleapis/java-shared-dependencies/commit/899682d0405645d9d5288b298af2fda228414669))
-   Update gax.version to v2.19.5 ([#&#8203;903](https://togithub.com/googleapis/java-shared-dependencies/issues/903)) ([3e4d8b3](https://togithub.com/googleapis/java-shared-dependencies/commit/3e4d8b35d3f682b07326ffa0a3e552d097f25a65))
-   Update google.common-protos.version to v2.10.0 ([#&#8203;900](https://togithub.com/googleapis/java-shared-dependencies/issues/900)) ([53b54c3](https://togithub.com/googleapis/java-shared-dependencies/commit/53b54c35f3a7c19df488921a6077e7a9bfb0b103))
-   Update google.core.version to v2.8.23 ([#&#8203;885](https://togithub.com/googleapis/java-shared-dependencies/issues/885)) ([686dd7c](https://togithub.com/googleapis/java-shared-dependencies/commit/686dd7c8f541189302e8cac4ae72ed7d967b5b3f))
-   Update google.core.version to v2.8.24 ([#&#8203;890](https://togithub.com/googleapis/java-shared-dependencies/issues/890)) ([1effda3](https://togithub.com/googleapis/java-shared-dependencies/commit/1effda381c7b886f5ae4d2dac9473da821e655fe))
-   Update google.core.version to v2.8.27 ([#&#8203;902](https://togithub.com/googleapis/java-shared-dependencies/issues/902)) ([3bcb804](https://togithub.com/googleapis/java-shared-dependencies/commit/3bcb804dec4358ed0a9c6c35cf4c35f817821e9a))
-   Update iam.version to v1.6.6 ([#&#8203;886](https://togithub.com/googleapis/java-shared-dependencies/issues/886)) ([03d0690](https://togithub.com/googleapis/java-shared-dependencies/commit/03d0690f01f9217e31dd65d55c28a47f2f2deb22))
-   Update iam.version to v1.6.7 ([#&#8203;895](https://togithub.com/googleapis/java-shared-dependencies/issues/895)) ([6cebc20](https://togithub.com/googleapis/java-shared-dependencies/commit/6cebc205daa98b96a8b27b3fc3cd222319b27e59))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-iam).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xOS4wIiwidXBkYXRlZEluVmVyIjoiMzQuMTkuMCJ9-->
)

* chore(java): update gcp-releasetool and cryptography in java requirements file
Source-Link: https://togithub.com/googleapis/synthtool/commit/74d0956884c1bb9dc901b52de35ca2bca025a74e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0
#504)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 485623855

Source-Link: https://togithub.com/googleapis/googleapis/commit/807125e7953e32535710924fe4bf0362ac93754d

Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/c4ddd6d651da69658a4762c5eafff5cd8f0e25c5
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzRkZGQ2ZDY1MWRhNjk2NThhNDc2MmM1ZWFmZmY1Y2Q4ZjBlMjVjNSJ9
…1.4 (#503)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.1.3` -> `26.1.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/compatibility-slim/26.1.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/confidence-slim/26.1.3)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-iam).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC45LjIiLCJ1cGRhdGVkSW5WZXIiOiIzNC45LjIifQ==-->
…502)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-iam-policy](https://togithub.com/googleapis/java-eventarc) ([source](https://togithub.com/googleapis/java-iam)) | `1.6.6` -> `1.6.7` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.7/compatibility-slim/1.6.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.7/confidence-slim/1.6.6)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>googleapis/java-iam</summary>

### [`v1.6.7`](https://togithub.com/googleapis/java-iam/blob/HEAD/CHANGELOG.md#&#8203;167-httpsgithubcomgoogleapisjava-iamcomparev166v167-2022-10-31)

[Compare Source](https://togithub.com/googleapis/java-iam/compare/v1.6.6...v1.6.7)

##### Dependencies

-   Update dependency com.google.api:api-common to v2.2.2 ([#&#8203;497](https://togithub.com/googleapis/java-iam/issues/497)) ([0cb8ba7](https://togithub.com/googleapis/java-iam/commit/0cb8ba78d5c07b64570c65ce14d61db5f08150a8))
-   Update dependency com.google.cloud:google-iam-policy to v1.6.6 ([#&#8203;492](https://togithub.com/googleapis/java-iam/issues/492)) ([bad1c9b](https://togithub.com/googleapis/java-iam/commit/bad1c9b58c4a76017d3665a3ef0887c3481b35e8))
-   Update dependency com.google.http-client:google-http-client-jackson2 to v1.42.3 ([#&#8203;498](https://togithub.com/googleapis/java-iam/issues/498)) ([b68ed60](https://togithub.com/googleapis/java-iam/commit/b68ed601d723dd235dc21e28b22035860a04e6e0))
-   Update dependency com.google.protobuf:protobuf-bom to v3.21.9 ([#&#8203;495](https://togithub.com/googleapis/java-iam/issues/495)) ([2462317](https://togithub.com/googleapis/java-iam/commit/2462317d386a59d07a85c8a752371a09635aa86f))
-   Update dependency com.google.protobuf:protobuf-java to v3.21.9 ([#&#8203;493](https://togithub.com/googleapis/java-iam/issues/493)) ([160b427](https://togithub.com/googleapis/java-iam/commit/160b427f55f8f8ee4d27ba2c5d2d00664d088ff9))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-iam).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC45LjIiLCJ1cGRhdGVkSW5WZXIiOiIzNC45LjIifQ==-->
)

* chore(java): update gcp-releasetool and cryptography in java requirements file
Source-Link: https://togithub.com/googleapis/synthtool/commit/74d0956884c1bb9dc901b52de35ca2bca025a74e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0
…1017)

* chore(java): update gcp-releasetool and cryptography in java requirements file
Source-Link: https://togithub.com/googleapis/synthtool/commit/74d0956884c1bb9dc901b52de35ca2bca025a74e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0
🤖 I have created a release *beep* *boop*
---


## [1.6.8](https://togithub.com/googleapis/java-iam/compare/v1.6.7...v1.6.8) (2022-11-08)


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.6 ([#506](https://togithub.com/googleapis/java-iam/issues/506)) ([23e1a8d](https://togithub.com/googleapis/java-iam/commit/23e1a8d609cc8c6a0dc22d7bc3086a4587d2faa5))
* Update dependency com.google.cloud:google-iam-policy to v1.6.7 ([#502](https://togithub.com/googleapis/java-iam/issues/502)) ([b877e43](https://togithub.com/googleapis/java-iam/commit/b877e43c6908af2c6c7d28fdbc154a403dc64fd0))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
🤖 I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
…509)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-iam-policy](https://togithub.com/googleapis/java-eventarc) ([source](https://togithub.com/googleapis/java-iam)) | `1.6.7` -> `1.6.8` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.8/compatibility-slim/1.6.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-iam-policy/1.6.8/confidence-slim/1.6.7)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>googleapis/java-iam</summary>

### [`v1.6.8`](https://togithub.com/googleapis/java-iam/blob/HEAD/CHANGELOG.md#&#8203;168-httpsgithubcomgoogleapisjava-iamcomparev167v168-2022-11-08)

[Compare Source](https://togithub.com/googleapis/java-iam/compare/v1.6.7...v1.6.8)

##### Dependencies

-   Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.6 ([#&#8203;506](https://togithub.com/googleapis/java-iam/issues/506)) ([23e1a8d](https://togithub.com/googleapis/java-iam/commit/23e1a8d609cc8c6a0dc22d7bc3086a4587d2faa5))
-   Update dependency com.google.cloud:google-iam-policy to v1.6.7 ([#&#8203;502](https://togithub.com/googleapis/java-iam/issues/502)) ([b877e43](https://togithub.com/googleapis/java-iam/commit/b877e43c6908af2c6c7d28fdbc154a403dc64fd0))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-iam).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xOS4wIiwidXBkYXRlZEluVmVyIjoiMzQuMTkuMCJ9-->
🤖 I have created a release *beep* *boop*
---


## [2.8.28](https://togithub.com/googleapis/java-core/compare/v2.8.27...v2.8.28) (2022-11-09)


### Dependencies

* Update dependency com.google.api.grpc:proto-google-iam-v1 to v1.6.8 ([#1020](https://togithub.com/googleapis/java-core/issues/1020)) ([7f74b2d](https://togithub.com/googleapis/java-core/commit/7f74b2d0a38ea87491b6cac13a9ce2f7b390f75a))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
🤖 I have created a release *beep* *boop*
---


## [1.6.9](https://togithub.com/googleapis/java-iam/compare/v1.6.8...v1.6.9) (2022-11-09)


### Dependencies

* Update dependency com.google.cloud:google-iam-policy to v1.6.8 ([#509](https://togithub.com/googleapis/java-iam/issues/509)) ([552c588](https://togithub.com/googleapis/java-iam/commit/552c5881555fcd48f4bc52c310d5fcbc1b6753e0))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
🤖 I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
Source-Link: googleapis/synthtool@9457e69
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
Source-Link: googleapis/synthtool@9457e69
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
🤖 I have created a release *beep* *boop*
---


### Updating meta-information for bleeding-edge SNAPSHOT release.

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
@suztomo suztomo changed the title chore: merge new repository into google-cloud-java chore: merge java-core, java-shared-dependencies, and java-iam into google-cloud-java Jan 31, 2023
Copy link
Member

@meltsufin meltsufin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please provide the commands used to create this branch?

@suztomo
Copy link
Member Author

suztomo commented Jan 31, 2023

@meltsufin I started adding the changes I need there in pull request description.

@suztomo
Copy link
Member Author

suztomo commented Feb 1, 2023

Todo: the new client generation fails. Luckily it creates a branch newclient_output_pull_request for troubleshooting:

suztomo@suztomo:~/google-cloud-java$ git checkout -b newclient_output_pull_request_investigation origin/newclient_output_pull_request
suztomo@suztomo:~/google-cloud-java$ mvn validate
[INFO] Scanning for projects...
[ERROR] [ERROR] Some problems were encountered while processing the POMs:
[ERROR] The dependencies of type=pom and with scope=import form a cycle: com.google.cloud:google-cloud-shared-dependencies:3.1.3-SNAPSHOT -> com.google.cloud:google-cloud-shared-dependencies:3.1.3-SNAPSHOT @ com.google.cloud:google-cloud-shared-dependencies:3.1.3-SNAPSHOT
...

[ERROR] The dependencies of type=pom and with scope=import form a cycle: com.google.cloud:google-cloud-shared-dependencies:3.1.3-SNAPSHOT -> com.google.cloud:google-cloud-shared-dependencies:3.1.3-SNAPSHOT @ com.google.cloud:google-cloud-shared-dependencies:3.1.3-SNAPSHOT.

The java-shared-dependencies should not depend on google-cloud-jar
parent because it imports java-shared-dependencies.
Copy link
Member

@meltsufin meltsufin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all the work on this! LGTM!

@suztomo
Copy link
Member Author

suztomo commented Feb 1, 2023

Now checks are green. (CLA bot doesn't work with that number of commits. But we know these commits come from repositories that had CLA bot.)

Memo to myself: Do not squash. Merge.

@suztomo suztomo merged commit 1750ab3 into main Feb 1, 2023
@suztomo suztomo deleted the merge_repos branch February 1, 2023 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants