Skip to content

Upgrade Karaf to 4.4.10 and remove Jetty bundle replacements #6976

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

Open
zkirksey wants to merge 9 commits into
base: 2.29.x
Choose a base branch
from
+17 −93
Open

Upgrade Karaf to 4.4.10 and remove Jetty bundle replacements #6976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
78c5c32
Upgrade Karaf to 4.4.10 and remove Jetty bundle replacements
zkirksey Feb 25, 2026
f87c5dd
Update maxsize for ddf catalog zip
zkirksey Feb 25, 2026
f7d7d72
Upgrade pax versions to satisfy new karaf version
zkirksey Feb 25, 2026
bd72bce
Upgrading more libraries to satisfy karaf upgrade
zkirksey Feb 25, 2026
bb8049f
Revert jackson version to latest supported by maven2
zkirksey Feb 25, 2026
4058edc
Fixing jackson version
zkirksey Feb 25, 2026
44e7edf
Should finally fix jackson versions
zkirksey Feb 25, 2026
24a8b11
Upgrade c3p0 to address CVE-2026-27727
zkirksey Feb 26, 2026
f004f6d
Attempt to fix itest
zkirksey Feb 26, 2026
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: 1 addition & 1 deletion distribution/ddf-catalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
<configuration>
<rules>
<requireFilesSize>
<maxsize>384000000</maxsize>
<maxsize>416000000</maxsize>
<minsize>240000000</minsize>
<files>
<file>${project.build.directory}/${distribution.file.name}.zip</file>
Expand Down
3 changes: 0 additions & 3 deletions distribution/ddf-catalog/src/main/filtered-resources/component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
<outputDirectory>./</outputDirectory>
<excludes>
<exclude>etc/org.apache.karaf.features.cfg</exclude>
<!-- need to upgrade jetty for CVE-2025-5115 -->
<exclude>**/jetty/**/${karaf.jetty.version}/*</exclude>
<exclude>**/jetty/**/${karaf.jetty.version}</exclude>
</excludes>
</fileSet>
<fileSet>
Expand Down
72 changes: 1 addition & 71 deletions distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,77 +39,7 @@
<overrideBundleDependency/>

<!-- A list of bundle URI replacements that allows changing external feature definitions -->
<bundleReplacements>
<!-- need to upgrade jetty for CVE-2025-5115 -->
<bundle originalUri="mvn:org.eclipse.jetty.http2/http2-client/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.http2/http2-client/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.http2/http2-common/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.http2/http2-common/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.http2/http2-hpack/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.http2/http2-hpack/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.http2/http2-http-client-transport/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.http2/http2-http-client-transport/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.http2/http2-server/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.http2/http2-server/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-alpn-client/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-alpn-client/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-alpn-java-client/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-alpn-java-client/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-alpn-java-server/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-alpn-java-server/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-alpn-openjdk8-client/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-alpn-openjdk8-client/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-alpn-opendjk8-server/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-alpn-openjdk8-server/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-alpn-server/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-alpn-server/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-client/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-client/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-continuation/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-http/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-http/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-io/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-io/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-jaas/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-jaas/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-jmx/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-openid/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-openid/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-proxy/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-proxy/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-rewrite/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-rewrite/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-security/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-security/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-server/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-server/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-servlet/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-servlets/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-util/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-util/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-util-ajax/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-util-ajax/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty/jetty-xml/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty/jetty-xml/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.websocket/websocket-api/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.websocket/websocket-client/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.websocket/websocket-common/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.websocket/websocket-server/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version}" />
<bundle originalUri="mvn:org.eclipse.jetty.websocket/websocket-servlet/${karaf.jetty.version}"
replacement="mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty.version}" />
</bundleReplacements>
<bundleReplacements/>

<!-- A list of feature replacements that allows changing external feature definitions -->
<featureReplacements/>
Expand Down
3 changes: 0 additions & 3 deletions distribution/ddf-common/src/main/resources/common-bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
<exclude>system/**/*kibana*</exclude>
<exclude>**/jetty/**/9.4.6.v20170531/*</exclude>
<exclude>**/jetty/**/8.1.14.v20131031/*</exclude>
<!-- need to upgrade jetty for CVE-2025-5115 -->
<exclude>**/jetty/**/${karaf.jetty.version}/*</exclude>
<exclude>**/jetty/**/${karaf.jetty.version}</exclude>
<exclude>**/pax/web/**/7.0.0/*</exclude>
<!--
Since Karaf v2.2.9, Karaf includes a default user "karaf" with its own authentication key in it, thus
Expand Down
2 changes: 1 addition & 1 deletion features/utilities/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@

<feature name="jackson" version="${project.version}">
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson.version}</bundle>
</feature>
Expand Down
3 changes: 2 additions & 1 deletion libs/test-common/src/main/java/org/codice/ddf/test/common/configurators/KarafOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ private Option getMavenRepositoryOptions() {
+ "http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix,"
+ "http://repository.springsource.com/maven/bundles/release@id=springsource,"
+ "http://repository.springsource.com/maven/bundles/external@id=springsourceext,"
+ "http://oss.sonatype.org/content/repositories/releases/@id=sonatype"),
+ "http://oss.sonatype.org/content/repositories/releases/@id=sonatype,"
+ "https://repo.osgeo.org/repository/release/@id=osgeo"),
when(System.getProperty("maven.repo.local") != null)
.useOptions(
editConfigurationFilePut(
Expand Down
25 changes: 12 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@
<spock.version>2.3-groovy-4.0</spock.version>
<mockito.version>3.6.28</mockito.version>
<pax.exam.version>4.14.0</pax.exam.version>
<pax.logging.version>2.3.0</pax.logging.version>
<pax.url.version>2.6.17</pax.url.version>
<pax.web.version>8.0.33</pax.web.version>
<pax.logging.version>2.3.2</pax.logging.version>
<pax.url.version>2.7.0</pax.url.version>
<pax.web.version>8.0.34</pax.web.version>
<restito.version>1.1.2</restito.version>
<restassured.version>5.5.0</restassured.version>
<groovy.version>4.0.23</groovy.version>
Expand All @@ -151,10 +151,10 @@
<abdera.version>1.1.3</abdera.version>
<antlr.version>4.3</antlr.version>
<apache.shiro.version>1.13.0</apache.shiro.version>
<asm.version>9.8</asm.version>
<asm.version>9.9</asm.version>
<awaitility.version>3.1.6</awaitility.version>
<bouncy.version>1.81</bouncy.version>
<c3p0.version>0.9.5.5</c3p0.version>
<bouncy.version>1.83</bouncy.version>
<c3p0.version>0.12.0</c3p0.version>
<cal10n.version>0.8.1</cal10n.version>
<cal10n.thirdparty.bundle.version>${cal10n.version}_1</cal10n.thirdparty.bundle.version>
<camel.version>3.22.4</camel.version>
Expand All @@ -170,9 +170,9 @@
<commons-csv.version>1.4</commons-csv.version>
<commons-digester.version>1.8.1</commons-digester.version>
<commons-exec.version>1.3</commons-exec.version>
<commons-io.version>2.20.0</commons-io.version>
<commons-io.version>2.21.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<commons-logging.version>1.3.5</commons-logging.version>
<commons-math3.version>3.6.1</commons-math3.version>
<commons-net.version>3.5</commons-net.version>
Expand Down Expand Up @@ -203,7 +203,8 @@
<httpmime.version>${httpclient.version}</httpmime.version>
<jai-imageio-core.version>1.4.0</jai-imageio-core.version>
<JavaAPIforKml.version>2.2.1_CODICE_1</JavaAPIforKml.version>
<jackson.version>2.18.4</jackson.version>
<jackson.annotations.version>2.21</jackson.annotations.version>
<jackson.version>2.21.0</jackson.version>
<jakarta.xml.bind.version>2.3.2</jakarta.xml.bind.version>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
<jakarta.mail.version>1.6.7</jakarta.mail.version>
Expand All @@ -224,8 +225,6 @@
<jdom.bundle.version>1.1_4</jdom.bundle.version>
<jdom2.bundle.version>2.0.6.1_1</jdom2.bundle.version>
<jetty.version>9.4.58.v20250814</jetty.version>
<!-- need to upgrade jetty for CVE-2025-5115 -->
<karaf.jetty.version>9.4.57.v20241219</karaf.jetty.version>
<jgroups.version>3.6.13.Final</jgroups.version>
<joda-convert.version>1.7</joda-convert.version>
<dev.failsafe.version>3.2.4</dev.failsafe.version>
Expand All @@ -241,7 +240,7 @@
<jts.spatial4j.version>1.17.1</jts.spatial4j.version>
<jvnet-ogc.version>2.6.1</jvnet-ogc.version>
<jwnl.version>1.3.3</jwnl.version>
<karaf.version>4.4.8</karaf.version>
<karaf.version>4.4.10</karaf.version>
<jansi.version>2.4.2</jansi.version>
<org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
<org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
Expand Down Expand Up @@ -942,7 +941,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
Loading