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

Make the shadowJar multi-release. #1749

Merged
merged 1 commit into from Nov 18, 2021
Merged

Conversation

gbggrant
Copy link
Contributor

Description

This PR changes the jar packaging to be multi-release. This addresses the issues surfaced with the upgrade to gkl 0.8.8


Checklist (never delete this)

Never delete this, it is our record that procedure was followed. If you find that for whatever reason one of the checklist points doesn't apply to your PR, you can leave it unchecked but please add an explanation below.

Content

  • Added or modified tests to cover changes and any new functionality
  • Edited the README / documentation (if applicable)
  • All tests passing on Travis

Review

  • Final thumbs-up from reviewer
  • Rebase, squash and reword as applicable

For more detailed guidelines, see https://github.com/broadinstitute/picard/wiki/Guidelines-for-pull-requests

@@ -141,7 +141,9 @@ tasks.withType(Jar){
attributes 'Main-Class': 'picard.cmdline.PicardCommandLine',
'Implementation-Title': 'Picard',
'Implementation-Vendor': 'Broad Institute',
'Implementation-Version': version
'htsjdk-Version': htsjdkVersion,
Copy link
Member

Choose a reason for hiding this comment

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

This is unnecessary for the fix but seems like a fine addition...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. I was inspired by your example.

Copy link
Member

@lbergelson lbergelson left a comment

Choose a reason for hiding this comment

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

Looks good

@lbergelson
Copy link
Member

We could add the following test to the script section of build.gradle. It doesn't add very much time to the build.

 # build the docs and shadowJars
 - ./gradlew
 # run a non-trivial tool to be sure it doesn't explode
 - java -jar build/libs/picard.jar MarkDuplicates -I testdata/picard/sam/aligned_queryname_sorted.bam -O out.bam --METRICS_FILE out.metrics

@lbergelson
Copy link
Member

@gbggrant I think we have to merge my other pr that fixes that doc problem on java 11 before running the complete ./gradle build is going to pass.

@lbergelson
Copy link
Member

Sorry, try replacing ./gradlew with ./gradlew currentJar

Added a test to handle the version 11 incompatibility we encountered
@gbggrant gbggrant merged commit dba1587 into master Nov 18, 2021
@gbggrant gbggrant deleted the gg_MakePicardJarMultiRelease branch November 18, 2021 01:44
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

2 participants