Skip to content

Commit c60564c

Browse files
jrnorthJason Smith
authored and
Jason Smith
committed
Fix video and klv bundle package imports
DDF's upgrade of Tika to 1.24.1 introduced an updated transitive dependency: com.sun.activation:jakarta.activation:jar:1.2.1. This caused the javax.activation package import of the video and klv bundles to require a minimum version of 1.2 even though the version installed in DDF is 1.1. The bundles do not actually require version 1.2 themselves so the version is now forced to 1.1.
1 parent 7cda474 commit c60564c

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

catalog/video/video-mpegts-stream/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@
206206
!sun.security.x509.*,
207207
!org.codice.transformer.video.*,
208208
!org.apache.commons.collections4.*,
209-
!javax.activation,
210209
sun.net.dns;resolution:=optional,
210+
javax.activation;version="${javax.activation.version}",
211211
*
212212
</Import-Package>
213213
<Embed-Dependency>

catalog/video/video-mpegts-transformer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
168168
<Import-Package>
169169
!org.bouncycastle.crypto.*,
170-
! javax.activation.*,
170+
javax.activation;version="${javax.activation.version}",
171171
ddf.catalog.transform.*,
172172
*
173173
</Import-Package>

libs/klv/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<Export-Package>org.codice.alliance.libs.klv</Export-Package>
148148
<Import-Package>
149149
!org.bouncycastle.crypto.*,
150-
!javax.activation,
150+
javax.activation;version="${javax.activation.version}",
151151
ddf.catalog.transform.*,
152152
*
153153
</Import-Package>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<guava.platform>jre</guava.platform>
159159
<guava.version>${guava.version-number}-${guava.platform}</guava.version>
160160
<jai-imageio-core.version>1.3.1</jai-imageio-core.version>
161+
<javax.activation.version>1.1</javax.activation.version>
161162
<javax.inject.version>1</javax.inject.version>
162163
<javax.ws.rs.version>2.1</javax.ws.rs.version>
163164
<javax-mail.version>1.5.6</javax-mail.version>

0 commit comments

Comments
 (0)