-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Update protobuf, OSM parser and Google cloud tools #6342
Update protobuf, OSM parser and Google cloud tools #6342
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #6342 +/- ##
==========================================
Coverage 69.80% 69.80%
- Complexity 17941 17942 +1
==========================================
Files 2046 2046
Lines 76672 76671 -1
Branches 7830 7830
==========================================
+ Hits 53518 53521 +3
+ Misses 20412 20408 -4
Partials 2742 2742 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can resolve the conflicts and merge without me re-approve.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as with @t2gran
2bf1fde
Summary
It turned out that we never actually set the version of the protbuf java library and compiler and relied on it being set by the OSM and Google Cloud libraries.
Starting with version 26.51.0 of Google Cloud it introduced a new version of protobuf that was incompatible with the one used by the OSM library and the tests started failing.
For this reason I updated the OSM library and used the newest version of protobuf. This means that we can now also update Google Cloud.
Since the new protbuf Java runtime has change a bit, some protobuf-related classes had to be adjusted.
Unit tests
The unit tests that parse real OSM files prevented something bad from happening.
Bumping the serialization version id
I don't think it's required since protbuf is only used for imports, but I can set the tag if requested.