Skip to content

Commit 564b674

Browse files
authored
Upgrade JAXB 2.3.3 -> 4.0.5 (#272)
1 parent c89720b commit 564b674

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

SequenceAnalysis/build.gradle

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ repositories {
2121

2222
configurations.all {
2323
resolutionStrategy {
24-
force "jakarta.activation:jakarta.activation-api:${activationVersion}"
25-
// NOTE: this should be kept in sync with mcc module:
26-
force "jakarta.xml.bind:jakarta.xml.bind-api:${jaxbVersion}"
24+
force "org.glassfish.jaxb:jaxb-runtime:${jaxbVersion}"
2725
}
2826
}
2927

@@ -49,7 +47,7 @@ dependencies {
4947
BuildUtils.addExternalDependency(
5048
project,
5149
new ExternalDependency(
52-
'org.biojava:biojava-core:7.0.2',
50+
'org.biojava:biojava-core:7.1.1',
5351
'biojava-core',
5452
'biojava',
5553
'http://biojava.org/wiki/Main_Page',
@@ -58,16 +56,16 @@ dependencies {
5856
'Java framework for processing biological data'
5957
),
6058
{
61-
// Exclude activation jars from webapp to avoid classloader conflicts with <tomcat>/lib/javax.activation.jar
62-
exclude group: 'com.sun.activation', module: 'jakarta.activation'
63-
exclude group: 'javax.activation', module: 'javax.activation-api'
59+
// Exclude in favor of angus activation from API
60+
exclude group: 'org.eclipse.angus', module: 'angus-activation'
61+
exclude group: "jakarta.activation", module: "jakarta.activation-api"
6462
}
6563
)
6664

6765
BuildUtils.addExternalDependency(
6866
project,
6967
new ExternalDependency(
70-
'org.biojava:biojava-genome:7.0.2',
68+
'org.biojava:biojava-genome:7.1.1',
7169
'biojava-genome',
7270
'biojava',
7371
'http://biojava.org/wiki/Main_Page',
@@ -76,9 +74,9 @@ dependencies {
7674
'Java framework for processing biological data'
7775
),
7876
{
79-
// Exclude activation jars from webapp to avoid classloader conflicts with <tomcat>/lib/javax.activation.jar
80-
exclude group: 'com.sun.activation', module: 'jakarta.activation'
81-
exclude group: 'javax.activation', module: 'javax.activation-api'
77+
// Exclude in favor of angus activation from API
78+
exclude group: 'org.eclipse.angus', module: 'angus-activation'
79+
exclude group: "jakarta.activation", module: "jakarta.activation-api"
8280
}
8381
)
8482

0 commit comments

Comments
 (0)