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

fix: remove duplicate classes provided by proto-google-common-protos #177

Merged
merged 1 commit into from Jun 10, 2020

Conversation

chingor13
Copy link
Collaborator

Fixes #148

Locally, clirr considers this a breaking change, but these classes are provided by the google-common-protos artifact which is a dependency of this artifact.

@chingor13 chingor13 requested a review from a team June 10, 2020 17:46
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Jun 10, 2020
@chingor13
Copy link
Collaborator Author

Lint is broken and until we can update shared-config, which is blocked by this duplicate class error.

@codecov
Copy link

codecov bot commented Jun 10, 2020

Codecov Report

Merging #177 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #177   +/-   ##
=========================================
  Coverage     76.73%   76.73%           
  Complexity      579      579           
=========================================
  Files            42       42           
  Lines          3426     3426           
  Branches        237      237           
=========================================
  Hits           2629     2629           
  Misses          651      651           
  Partials        146      146           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5624afc...0b7869a. Read the comment docs.

@chingor13 chingor13 merged commit 08d8639 into master Jun 10, 2020
@chingor13 chingor13 deleted the remove-duplicate-classes branch June 10, 2020 17:57
gcf-merge-on-green bot pushed a commit that referenced this pull request Jun 10, 2020
🤖 I have created a release \*beep\* \*boop\* 
---
### [1.101.2](https://www.github.com/googleapis/java-logging/compare/v1.101.1...v1.101.2) (2020-06-10)


### Bug Fixes

* remove duplicate classes provided by proto-google-common-protos ([#177](https://www.github.com/googleapis/java-logging/issues/177)) ([08d8639](https://www.github.com/googleapis/java-logging/commit/08d86391250642cbe4bac27b3853fe7f40458cdc))


### Dependencies

* update dependency com.google.api.grpc:proto-google-common-protos to v1.18.0 ([#156](https://www.github.com/googleapis/java-logging/issues/156)) ([84a6ccd](https://www.github.com/googleapis/java-logging/commit/84a6ccde0cf01fc0d7c331300abadfcf4e004b7a))
* update dependency com.google.guava:guava-bom to v29 ([#136](https://www.github.com/googleapis/java-logging/issues/136)) ([8c261a0](https://www.github.com/googleapis/java-logging/commit/8c261a0d3386bf3867fda7cc0eac2e6821639359))
* update dependency com.google.http-client:google-http-client-bom to v1.35.0 ([#153](https://www.github.com/googleapis/java-logging/issues/153)) ([181447a](https://www.github.com/googleapis/java-logging/commit/181447a6b33ed34de16926da008e789ac5570043))
* update dependency com.google.protobuf:protobuf-bom to v3.12.0 ([#165](https://www.github.com/googleapis/java-logging/issues/165)) ([62ec11d](https://www.github.com/googleapis/java-logging/commit/62ec11d0f4be627a291567d356b0912d35b00f99))
* update dependency io.grpc:grpc-bom to v1.29.0 ([#149](https://www.github.com/googleapis/java-logging/issues/149)) ([5841918](https://www.github.com/googleapis/java-logging/commit/5841918619873f500efe000d60bd8d3c5f5ab0d8))
* update dependency org.threeten:threetenbp to v1.4.4 ([#151](https://www.github.com/googleapis/java-logging/issues/151)) ([abeac81](https://www.github.com/googleapis/java-logging/commit/abeac81a3117eb42ec3bfa9bfa1b934a303bc90e))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

com.google.logging.type.HttpRequest is in 2 Google Proto Jars, causing conflicts
3 participants