Skip to content

Commit

Permalink
Upgrade JAXB 2.3.3 -> 4.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-adam committed Apr 12, 2024
1 parent 4f84190 commit f5683ae
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ allprojects {
driver
utilities
}
// exclude log4j, which may come in transitively, from all configurations to avoid its potential vulnerabilities
configurations.configureEach {
// exclude log4j, which may come in transitively, from all configurations to avoid its potential vulnerabilities
exclude group: "log4j", module:"log4j"
}
configurations.driver.setDescription("Dependencies used for SqlUtils")
Expand Down Expand Up @@ -320,9 +320,11 @@ allprojects {
// Force consistency for dependencies from pipeline and query
force "org.dom4j:dom4j:${dom4jVersion}"
// Force consistency across pipeline, SequenceAnalysis, and query
force "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
force "javax.xml.bind:jaxb-api:2.3.1"
force "jakarta.xml.bind:jakarta.xml.bind-api:${jaxbApiVersion}"
force "org.glassfish.jaxb:jaxb-runtime:${jaxbVersion}"

// Force consistency between pipeline's ActiveMQ and cloud's jClouds dependencies
// Force consistency between pipeline's ActiveMQ and cloud's jClouds dependencies
force "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"

// Force snappy-java version for CVE-2023-43642. Remove once HTSJDK bumps its preferred version.
Expand Down
8 changes: 5 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ gsonVersion=2.8.9
grpcVersion=1.62.2

guavaVersion=33.1.0-jre

# Note: You won't find usages in the product sources; this property is used by the gradle plugin.
gwtVersion=2.11.0
gwtServletJakartaVersion=2.11.0
# For dev builds, the targeted, single permutation browser. Can be either gwt-user-firefox, gwt-user-chrome, or gwt-user-ie
Expand Down Expand Up @@ -202,9 +204,9 @@ javassistVersion=3.20.0-GA
javaMailVersion=2.0.1
javaxAnnotationVersion=1.3.2

# No longer part of Java 10. Dependency for many modules.
jaxbApiVersion=2.3.1
jaxbVersion=2.3.3
# Dependency for many modules.
jaxbApiVersion=4.0.2
jaxbVersion=4.0.4

jaxrpcVersion=1.1

Expand Down

0 comments on commit f5683ae

Please sign in to comment.