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

Keep META-INF folder at top of published mockito-core jar #2109

Merged
merged 1 commit into from Nov 24, 2020
Merged

Keep META-INF folder at top of published mockito-core jar #2109

merged 1 commit into from Nov 24, 2020

Conversation

hdecarne
Copy link
Contributor

This solves issue #2108 by adapting the Jar entries sorting order in the OSGI plugin workaround. As a result META-INF folder is kept at the top of the Jar as expected by JarInputStream:

Archive:  build/libs/mockito-core-3.6.24.jar
  Length      Date    Time    Name
---------  ---------- -----   ----
        0  02-01-1980 00:00   META-INF/
     4619  02-01-1980 00:00   META-INF/MANIFEST.MF
     1080  02-01-1980 00:00   LICENSE
        0  02-01-1980 00:00   org/

instead of:

Archive:  ~/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.6.0/48657987075fea2e2176634ae35aaa5e93c929ef/mockito-core-3.6.0.jar
  Length      Date    Time    Name
---------  ---------- -----   ----
     1080  02-01-1980 01:00   LICENSE
        0  02-01-1980 01:00   META-INF/
     4606  02-01-1980 01:00   META-INF/MANIFEST.MF
        0  02-01-1980 01:00   org/

@codecov-io
Copy link

codecov-io commented Nov 23, 2020

Codecov Report

Merging #2109 (100760f) into release/3.x (78b22fc) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             release/3.x    #2109   +/-   ##
==============================================
  Coverage          84.89%   84.89%           
  Complexity          2720     2720           
==============================================
  Files                325      325           
  Lines               8277     8277           
  Branches             989      989           
==============================================
  Hits                7027     7027           
  Misses               981      981           
  Partials             269      269           

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 78b22fc...100760f. Read the comment docs.

Copy link
Contributor

@TimvdLippe TimvdLippe left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

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.

None yet

3 participants