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.

Sign up for GitHub

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

Jump to bottom

More merging #655

Merged
merged 2 commits into from
Jan 17, 2022
Merged

More merging #655

merged 2 commits into from
Jan 17, 2022

Conversation

shs96c
Copy link
Collaborator

@shs96c shs96c commented Jan 14, 2022

With tests to verify the behaviour! This PR does two things:

  1. Makes sure that we don't try and add META-INF/services/ more than once.
  2. Ensures that a merged jar has the manifest as one of the first two entries.

@shs96c
Add test to verify that the manifest is at the start of the merged jar
0cfdee5 
The `JarInputStream.getManifest()` will only work if the manifest is one
of the first two entries in the jar. When merging jars, we should ensure
that this is the case.
@shs96c shs96c merged commit 2941799 into bazelbuild:master Jan 17, 2022
@shs96c shs96c deleted the more-merging branch January 17, 2022 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jin jin jin approved these changes

@c-parsons c-parsons Awaiting requested review from c-parsons

@cheister cheister Awaiting requested review from cheister cheister is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@shs96c @jin