diff --git a/catalog/core/catalog-core-standardframework/pom.xml b/catalog/core/catalog-core-standardframework/pom.xml
index 4ac11a8078f0..367585a8868f 100644
--- a/catalog/core/catalog-core-standardframework/pom.xml
+++ b/catalog/core/catalog-core-standardframework/pom.xml
@@ -182,9 +182,10 @@
test
- log4j
- log4j
+ org.apache.logging.log4j
+ log4j-core
test
+ ${apache-log4j.version}
ddf.mime.core
diff --git a/catalog/solr/catalog-solr-commands/pom.xml b/catalog/solr/catalog-solr-commands/pom.xml
index 90a264c50e1a..e9667b6f9247 100644
--- a/catalog/solr/catalog-solr-commands/pom.xml
+++ b/catalog/solr/catalog-solr-commands/pom.xml
@@ -85,6 +85,12 @@
${solr.jetty.version}
test
+
+ org.ops4j.pax.logging
+ pax-logging-api
+ ${pax.logging.version}
+ test
+
org.apache.solr
solr-test-framework
diff --git a/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java b/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
index d70dda4342f0..3cc68dca11f7 100644
--- a/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
+++ b/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
@@ -164,7 +164,7 @@ protected static void createMiniSolrCloudCluster() throws Exception {
.addConfig(
DEFAULT_CONFIGSET,
Paths.get(
- BackupCommandTest.class.getClassLoader().getResource("configset").getPath()))
+ BackupCommandTest.class.getClassLoader().getResource("configset").toURI()))
.build();
miniSolrCloud.getSolrClient().connect();
System.setProperty("solr.cloud.shardCount", "1");
diff --git a/catalog/spatial/csw/spatial-csw-source-common/pom.xml b/catalog/spatial/csw/spatial-csw-source-common/pom.xml
index 6b44a49a4246..94b5255b4ad8 100644
--- a/catalog/spatial/csw/spatial-csw-source-common/pom.xml
+++ b/catalog/spatial/csw/spatial-csw-source-common/pom.xml
@@ -166,7 +166,7 @@
org.bouncycastle
- bcprov-jdk15on
+ bcprov-jdk18on
${bouncy.version}
diff --git a/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java b/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java
index dfa396c3da6f..8e589ba1e5da 100644
--- a/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java
+++ b/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java
@@ -137,7 +137,9 @@ public static void setUpBeforeClass() throws Exception {
converter = new CswRecordConverter(getCswMetacardType());
cswRecordXml =
- IOUtils.toString(CswRecordConverterTest.class.getResourceAsStream("/Csw_Record_Text.xml"));
+ IOUtils.toString(
+ CswRecordConverterTest.class.getResourceAsStream("/Csw_Record_Text.xml"),
+ StandardCharsets.UTF_8);
}
@Test
@@ -489,7 +491,7 @@ public void testMetacardTransformWithCswRecordMetadata()
BinaryContent content = converter.transform(metacard, args);
- String xml = IOUtils.toString(content.getInputStream());
+ String xml = IOUtils.toString(content.getInputStream(), StandardCharsets.UTF_8);
assertThat(xml, containsString(""));
XMLUnit.setIgnoreWhitespace(true);
assertXMLEqual(cswRecordXml, xml);
diff --git a/catalog/transformer/catalog-transformer-pdf/pom.xml b/catalog/transformer/catalog-transformer-pdf/pom.xml
index d3962f6cc566..13ce2aa45798 100644
--- a/catalog/transformer/catalog-transformer-pdf/pom.xml
+++ b/catalog/transformer/catalog-transformer-pdf/pom.xml
@@ -67,17 +67,17 @@
org.bouncycastle
- bcprov-jdk15on
+ bcprov-jdk18on
${bouncy.version}
org.bouncycastle
- bcmail-jdk15on
+ bcmail-jdk18on
${bouncy.version}
org.bouncycastle
- bcpkix-jdk15on
+ bcpkix-jdk18on
${bouncy.version}
diff --git a/catalog/transformer/catalog-transformer-pptx/pom.xml b/catalog/transformer/catalog-transformer-pptx/pom.xml
index fcef408f3fc9..8e34846f47a9 100644
--- a/catalog/transformer/catalog-transformer-pptx/pom.xml
+++ b/catalog/transformer/catalog-transformer-pptx/pom.xml
@@ -69,12 +69,12 @@
org.bouncycastle
- bcprov-jdk15on
+ bcprov-jdk18on
${bouncy.version}
org.bouncycastle
- bcpkix-jdk15on
+ bcpkix-jdk18on
${bouncy.version}
diff --git a/distribution/ddf-catalog/pom.xml b/distribution/ddf-catalog/pom.xml
index 2ae9c8cf0dbf..67f0593645f5 100644
--- a/distribution/ddf-catalog/pom.xml
+++ b/distribution/ddf-catalog/pom.xml
@@ -182,7 +182,7 @@
- 160000000
+ 260000000
120000000
${project.build.directory}/${distribution.file.name}.zip
diff --git a/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties b/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
index 41abb939ec3d..a908867156d6 100644
--- a/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
+++ b/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
@@ -11,10 +11,10 @@ mvn\:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} = 9
mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9
mvn\:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} = 9
mvn\:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}=10
-mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.6 = 11
+mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.8 = 11
mvn\:org.apache.felix/org.apache.felix.configurator/1.0.16 = 11
mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11
-mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.14 = 11
+mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.16 = 11
mvn\:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}=12
mvn\:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${servicemix.specs.jaxb.version}=13
mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${servicemix.bundles.jaxb.version}=14
diff --git a/distribution/kernel/pom.xml b/distribution/kernel/pom.xml
index 832a585d230d..00ea2a281a28 100644
--- a/distribution/kernel/pom.xml
+++ b/distribution/kernel/pom.xml
@@ -114,21 +114,21 @@
org.bouncycastle
- bcprov-jdk15on
+ bcprov-jdk18on
${bouncy.version}
${setup.folder}/jdk9plus
bcprov-${bouncy.version}.jar
org.bouncycastle
- bcmail-jdk15on
+ bcmail-jdk18on
${bouncy.version}
${setup.folder}/jdk9plus
bcmail-${bouncy.version}.jar
org.bouncycastle
- bcpkix-jdk15on
+ bcpkix-jdk18on
${bouncy.version}
${setup.folder}/jdk9plus
bcpkix-${bouncy.version}.jar
@@ -339,5 +339,10 @@
org.apache.servicemix.bundles.jaxb-runtime
${servicemix.bundles.jaxb.version}
+
+ org.apache.aries.spifly
+ org.apache.aries.spifly.dynamic.bundle
+ ${spifly.version}
+
diff --git a/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java b/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
index 61a145656ef5..ea7cf33df8f3 100644
--- a/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
+++ b/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
@@ -63,6 +63,7 @@
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -109,6 +110,7 @@ public static Option[] examConfiguration() {
public void beforeExam() throws Exception {
startExampleBundle();
featuresService.installFeature(EXAMPLE_FEATURE);
+ resetBundleContext();
syncInstaller.waitForBundles();
}
@@ -325,6 +327,12 @@ private void resetExampleMSProps() throws IOException {
.equals(ExampleService.DEFAULT_EXAMPLE_PROP_VALUE));
}
+ private void resetBundleContext() {
+ Bundle bundle = FrameworkUtil.getBundle(this.getClass());
+ bundleContext = bundle.getBundleContext();
+ configAdmin = getService(ConfigurationAdmin.class);
+ }
+
private Stream configurations(String filter)
throws IOException, InvalidSyntaxException {
org.osgi.service.cm.Configuration[] configs = configAdmin.listConfigurations(filter);
diff --git a/features/branding/src/main/feature/feature.xml b/features/branding/src/main/feature/feature.xml
index 2188a9aa8f7e..d113a8c09fef 100644
--- a/features/branding/src/main/feature/feature.xml
+++ b/features/branding/src/main/feature/feature.xml
@@ -24,6 +24,7 @@
branding-api
+ mvn:commons-lang/commons-lang/${commons-lang.version}
mvn:commons-io/commons-io/${commons-io.version}
mvn:commons-configuration/commons-configuration/${commons-configuration.version}
mvn:ddf.distribution/ddf-branding-plugin/${project.version}
diff --git a/features/kernel/src/main/feature/feature.xml b/features/kernel/src/main/feature/feature.xml
index 7ff57c1d6d60..d28436c0a2c9 100644
--- a/features/kernel/src/main/feature/feature.xml
+++ b/features/kernel/src/main/feature/feature.xml
@@ -17,6 +17,7 @@
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features
+ mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features
mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features
guava
+ mvn:commons-lang/commons-lang/${commons-lang.version}
mvn:ddf.platform/platform-parser-api/${project.version}
mvn:ddf.platform/platform-parser-xml/${project.version}
@@ -97,6 +98,7 @@
description="Tika MIME Resolver">
mime-core-api
slf4j
+ mvn:commons-lang/commons-lang/${commons-lang.version}
mvn:ddf.mime.tika/mime-tika-resolver/${project.version}
@@ -163,6 +165,7 @@
wrap
spifly
jackson
+ mvn:commons-lang/commons-lang/${commons-lang.version}
mvn:org.slf4j/slf4j-api/${tika.slf4j.version}
mvn:org.slf4j/slf4j-nop/${tika.slf4j.version}
mvn:commons-io/commons-io/${commons-io.version}
@@ -173,6 +176,7 @@
+ mvn:commons-lang/commons-lang/${commons-lang.version}
mvn:ddf.platform.io/platform-io-internal-api/${project.version}
mvn:ddf.platform.io/platform-io-impl/${project.version}
diff --git a/pom.xml b/pom.xml
index 374aa7f4d75e..7dcc555e5fa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,9 +119,9 @@
2.3-groovy-3.0
4.9.0
4.13.5
- 2.2.0
- 2.6.12
- 8.0.15
+ 2.2.7
+ 2.6.14
+ 8.0.27
1.1.0
3.3.0
3.0.12
@@ -133,7 +133,7 @@
project-info
- 2.2.2
+ 2.2.5
2.2.3
2.5.7
9.2.20.1
@@ -141,12 +141,12 @@
1.1.3_2
1.1.3
4.3
- 9.5
+ 9.6
3.1.6
- 1.70
+ 1.80
0.8.1
${cal10n.version}_1
- 1.23.0
+ 1.26.1
1.5
1.15
3.2.2
@@ -155,10 +155,10 @@
1.4
1.8.1
1.3
- 2.13.0
+ 2.15.1
2.6
- 3.12.0
- 1.2
+ 3.14.0
+ 1.3.1
3.6.1
3.5
0.1.8
@@ -203,11 +203,11 @@
1.19.0
1.17.0
1.3.3
- 4.4.3
- 2.4.0
- 1.2.0
+ 4.4.6
+ 2.4.1
+ 1.3.0
1.2.0
- 2.17.0
+ 2.24.1
1.2.3
1.2.3
2.4.1
@@ -244,9 +244,10 @@
4.4.16
4.5.14
10.0.12
- 3.8.1
+ 3.8.3
0.8
0.8
+ 1.3.7
2.8.0
2.0.7
0.4
@@ -705,7 +706,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.10.1
+ 3.11.0
${maven.compiler.source}
${maven.compiler.target}
@@ -778,7 +779,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ 3.4.0
maven-javadoc-plugin
@@ -806,7 +807,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.1.0
+ 3.4.1
ddf.support