Skip to content

resolving dependency conflict for org.apache.httpcomponents:httpclient#2951

Closed
parasjain1 wants to merge 1 commit intoopensearch-project:mainfrom
parasjain1:apache-dependency-fix
Closed

resolving dependency conflict for org.apache.httpcomponents:httpclient#2951
parasjain1 wants to merge 1 commit intoopensearch-project:mainfrom
parasjain1:apache-dependency-fix

Conversation

@parasjain1
Copy link
Copy Markdown
Contributor

Description

Resolving dependency conflict for org.apache.httpcomponents:httpclient

Issues Resolved

#2950

Is this a backport? If so, please add backport PR # and/or commits #
N/A

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

  • New functionality includes testing
  • New functionality has been documented
  • [ x ] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Paras Jain <parasjaz@amazon.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 7, 2023

Codecov Report

Merging #2951 (9816f7d) into main (8ab7cb4) will decrease coverage by 0.14%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #2951      +/-   ##
============================================
- Coverage     62.30%   62.16%   -0.14%     
+ Complexity     3337     3328       -9     
============================================
  Files           266      266              
  Lines         19650    19650              
  Branches       3329     3329              
============================================
- Hits          12242    12215      -27     
- Misses         5782     5799      +17     
- Partials       1626     1636      +10     

see 8 files with indirect coverage changes

@cwperks
Copy link
Copy Markdown
Member

cwperks commented Jul 7, 2023

@parasjain1 I just opened a separate PR against the 2.x branch. I think the issue is that 2.x is explicitly referring to 4.5.13 and should instead take the version of httpclient from core's buildSrc/version.properties

@reta
Copy link
Copy Markdown
Collaborator

reta commented Jul 7, 2023

@parasjain1 I just opened a separate PR against the 2.x branch. I think the issue is that 2.x is explicitly referring to 4.5.13 and should instead take the version of httpclient from core's buildSrc/version.properties

Thanks @cwperks , that would be the right fix

@cwperks
Copy link
Copy Markdown
Member

cwperks commented Jul 7, 2023

@parasjain1 I am closing this PR. There was a PR against the 2.x branch that was merged to fix the bwc test issue: #2953

@cwperks cwperks closed this Jul 7, 2023
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.

3 participants