-
Notifications
You must be signed in to change notification settings - Fork 27
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
Upgrade to java 21 #272
Upgrade to java 21 #272
Conversation
007d213
to
38d1109
Compare
.circleci/config.yml
Outdated
@@ -32,7 +32,7 @@ jobs: | |||
|
|||
- run: | |||
name: "compile" | |||
command: "mvn clean install" | |||
command: "mvn clean install -Dnet.bytebuddy.experimental=true" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what is the experimental thing for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One of the dependencies (bytebuddy from Mockito) won't work with Java 21 without it. But let me try to update Mockito and see if that fixes it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Phew! 😅 It wasn't easy but I finally got the right set of dependencies so we don't need that flag. I think the "-Dnet.bytebuddy.experimental=true" was temporarily needed for Java 21 until recently.
a430dc8
to
efd80bb
Compare
c33927c
to
079c4c2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the updates! Do we need to update Java version in docker as well?
<dependency> | ||
<groupId>com.github.cbioportal.cbioportal</groupId> | ||
<artifactId>maf</artifactId> | ||
<version>ee5802d836c05ed846d7d1ea3f584febdc07ffa8</version> | ||
<exclusions> | ||
<exclusion> | ||
<groupId>ch.qos.logback</groupId> | ||
<artifactId>logback-core</artifactId> | ||
</exclusion> | ||
<exclusion> | ||
<groupId>ch.qos.logback</groupId> | ||
<artifactId>logback-classic</artifactId> | ||
</exclusion> | ||
</exclusions> | ||
</dependency> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sheridancbio do we still want to keep this? I forgot the final verdict on this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, for now I think we should keep this dependency. @haynescd pointed out that maf is a dependency in cbioportal-core, and since the maf code is used in both this repository and in that one we can keep it in a separate repository I think.
Hopefully we can develop a unified community-wide tool for study import which includes the ability to annotate variants (via genome nexus). That would essentially replace cbioportal-core. At that time we could decide whether the ability to parse and represent variants from a mutation file should be its own module or become embedded in one of these two repositories (most likely this one).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that we still do have the dependency .. it is simply moved to the annotator module (it is only needed there)
091d758
to
d217c2d
Compare
@mandawilson @sheridancbio i noticed there's an error in the build here - are you still looking at this one? Thanks! |
Yes .. we are trying to resolve conflicts with the pipelines codebase (which also packages in cbioportal-core repository). There are spring version differences between these two codebases so we may need to make the spring version of this codebase match the spring version (and boot version) in use in cbioportal-core in order for the importer to function correctly. So consider this PR to be in flux for now. |
948fff0
to
3169800
Compare
7fa49b2
to
5b0af01
Compare
bc22ddf
to
7ce03f6
Compare
469c0fe
to
37c6448
Compare
This PR seems complete now. Docker functionality has been tested. Note: the "merge" sub command mode (seen through docker build and run) is not running either in this PR or in the master branch. A new issue to repair (or delete) the merge code logic should be created (if not extant). Studies have been annotated during import in the msk importer (which uses the annotator module as a component). changes sets were squashed into a single changeset. |
- switch to new cbioportal maf repo - update docker to openjdk-21 - rather than upgrading databaseAnnotator, delete it due to: - infrequent use - testing challenges - difficult maintenance - if databaseModule is desired by any users, an updated and tested version of the module can be re-introduced by a new PR. - prevent JobParameters from containing null values (not allowed in spring batch 5) Co-authored-by: Manda Wilson <[email protected]> Co-authored-by: Robert Sheridan <[email protected]>
37c6448
to
6a2c6c6
Compare
Note: the merge subcommand functionality actually did succeed when executed with the proper arguments ... basically those were: java -jar {jar_filename} merge --input-mafs-list='fileA,fileB,fileC,...' --output-maf='outfilename.txt' I am proceeding with this merge now. A description of the potential ramifications was presented to the development team in the |
Changes needed for running under java21 and for packaging this depenency into the pipelines codebase for cbioportal study import into msk databases.