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

[bot] Merge 23.10 to develop (Conflicts) #585

Merged
merged 3 commits into from
Oct 11, 2023
Merged

[bot] Merge 23.10 to develop (Conflicts) #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3de6e24
force snappy-java version for CVE-2023-43642 (#581)
labkey-willm Oct 4, 2023
c13ad93
Merge 23.7 to 23.10
labkey-tchad Oct 10, 2023
54442cd
Merge 23.10 to develop
cnathe Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ allprojects {
force "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
// The version of picard we depend on brings in an older version of htsjdk, but SequenceAnalysis depends on a later version
force "com.github.samtools:htsjdk:${htsjdkVersion}"
// This is a dependency for HTSJDK. Force version for CVE-2023-43642
force "org.xerial.snappy:snappy-java:${snappyJavaVersion}"
// Cloud module brings in earlier versions of this library, so we force the later one
force "org.apache.tika:tika-core:${tikaVersion}"
// OpenLDAPSync and premium have transitive dependency on a broken version of MINA
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ slf4jLog4j12Version=2.0.7
# this version is forced for compatibility with api, LDK, and workflow
slf4jLog4jApiVersion=2.0.7

# Force snappy-java version for CVE-2023-43642
# This is a dependency for HTSJDK. Force version for CVE-2023-43642
snappyJavaVersion=1.1.10.4

springBootVersion=2.7.16
Expand Down