Skip to content

Conversation

@SbloodyS
Copy link
Member

Purpose of the pull request

Try to fix jar conficts

@SbloodyS SbloodyS self-assigned this Jun 26, 2023
@SbloodyS SbloodyS added bug Something isn't working backend CI&CD labels Jun 26, 2023
@SbloodyS SbloodyS added this to the 3.1.8 milestone Jun 26, 2023
@SbloodyS SbloodyS added the 3.1.x for 3.1.x version label Jun 26, 2023
zhongjiajie
zhongjiajie previously approved these changes Jun 26, 2023
@SbloodyS SbloodyS closed this Jun 26, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jun 26, 2023

Codecov Report

Merging #14407 (af51487) into dev (9c92b4b) will decrease coverage by 0.03%.
The diff coverage is n/a.

❗ Current head af51487 differs from pull request most recent head 7ae91e6. Consider uploading reports for the commit 7ae91e6 to get more accurate results

@@             Coverage Diff              @@
##                dev   #14407      +/-   ##
============================================
- Coverage     38.49%   38.47%   -0.03%     
+ Complexity     4561     4556       -5     
============================================
  Files          1237     1237              
  Lines         43537    43537              
  Branches       4815     4813       -2     
============================================
- Hits          16758    16749       -9     
- Misses        24927    24935       +8     
- Partials       1852     1853       +1     

see 3 files with indirect coverage changes

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

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@SbloodyS SbloodyS marked this pull request as ready for review June 26, 2023 14:31
@SbloodyS SbloodyS requested a review from kezhenxu94 as a code owner June 26, 2023 14:31
nimbus-jose-jwt-9.8.1.jar
nimbus-jose-jwt-9.10.jar
okhttp-2.7.5.jar
okhttp-3.14.9.jar
Copy link
Member

Choose a reason for hiding this comment

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

I wonder, why we have two versions of okhttp here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wonder, why we have two versions of okhttp here?

Yes. The 2.7.5 comes from hadoop-hdfs.

@SbloodyS SbloodyS added the CI&CD label Jun 26, 2023
@zhongjiajie zhongjiajie mentioned this pull request Jun 26, 2023
@SbloodyS SbloodyS merged commit 091d869 into apache:dev Jun 26, 2023
@SbloodyS SbloodyS deleted the fix_jar_confict branch June 26, 2023 14:51
zhuangchong pushed a commit that referenced this pull request Jul 6, 2023
IT-Kwj pushed a commit to IT-Kwj/dolphinscheduler that referenced this pull request Jul 14, 2023
zhongjiajie pushed a commit that referenced this pull request Jul 20, 2023
* try to fix jar conficts

(cherry picked from commit 091d869)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.1.x for 3.1.x version bug Something isn't working CI&CD

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants