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

Resolve dependency conflict in pinot-protobuf module #11867

Merged
merged 1 commit into from Oct 25, 2023

Conversation

jackjlli
Copy link
Contributor

In LinkedIn, a lower version of protobuf is needed. While there is more than 1 version of that got pulled:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.4.1:enforce (default-cli) on project pinot-protobuf: 
[ERROR] Rule 0: org.apache.maven.enforcer.rules.dependency.DependencyConvergence failed with message:
[ERROR] Failed while enforcing releasability.
[ERROR] 
[ERROR] Dependency convergence error for com.google.j2objc:j2objc-annotations:jar:2.8 paths to dependency are:
[ERROR] +-org.apache.pinot:pinot-protobuf:jar:1.1.0-SNAPSHOT
[ERROR]   +-io.confluent:kafka-schema-registry-client:jar:7.2.6:compile
[ERROR]     +-com.google.guava:guava:jar:32.0.1-jre:compile
[ERROR]       +-com.google.j2objc:j2objc-annotations:jar:2.8:compile
[ERROR] and
[ERROR] +-org.apache.pinot:pinot-protobuf:jar:1.1.0-SNAPSHOT
[ERROR]   +-io.confluent:kafka-protobuf-serializer:jar:7.2.6:compile
[ERROR]     +-com.google.protobuf:protobuf-java-util:jar:3.22.0:compile
[ERROR]       +-com.google.j2objc:j2objc-annotations:jar:1.3:compile

This PR tries to resolve the dependency conflict in pinot-protobuf module. Plus, there is no harm to exclude the dependency which is declared in multiple places.

Tested by running mvn clean install -DskipTests -Pbin-dist -Pbuild-shaded-jar -Ppresto-driver --no-transfer-progress -Djdk.version=11

@codecov-commenter
Copy link

codecov-commenter commented Oct 24, 2023

Codecov Report

Merging #11867 (6e7fcce) into master (f1c36f1) will increase coverage by 0.00%.
Report is 1 commits behind head on master.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             master   #11867    +/-   ##
==========================================
  Coverage     61.40%   61.41%            
- Complexity      207     1146   +939     
==========================================
  Files          2373     2373            
  Lines        128264   128264            
  Branches      19799    19799            
==========================================
+ Hits          78765    78772     +7     
- Misses        43813    43816     +3     
+ Partials       5686     5676    -10     
Flag Coverage Δ
custom-integration1 <0.01% <ø> (ø)
integration <0.01% <ø> (ø)
integration1 <0.01% <ø> (ø)
integration2 0.00% <ø> (ø)
java-11 61.35% <ø> (+26.54%) ⬆️
java-21 61.29% <ø> (ø)
skip-bytebuffers-false 61.38% <ø> (+0.03%) ⬆️
skip-bytebuffers-true 61.25% <ø> (-0.02%) ⬇️
temurin 61.41% <ø> (+<0.01%) ⬆️
unittests 61.40% <ø> (+<0.01%) ⬆️
unittests1 46.67% <ø> (+0.03%) ⬆️
unittests2 27.57% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 17 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@jackjlli jackjlli merged commit be74dc1 into master Oct 25, 2023
21 checks passed
@jackjlli jackjlli deleted the fix-protobuf-conflict branch October 25, 2023 00:35
@Jackie-Jiang Jackie-Jiang added the dependencies Pull requests that update a dependency file label Oct 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants