Upgrade to Karaf 4.4.8 (#6928)

Author: jrnorth

catalog/core/catalog-core-directorymonitor/pom.xml

@@ -342,6 +342,7 @@
         <dependency>
             <groupId>org.ops4j.pax.tinybundles</groupId>
             <artifactId>tinybundles</artifactId>
+            <version>${tinybundles.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

catalog/opensearch/catalog-opensearch-endpoint/pom.xml

@@ -24,8 +24,6 @@
     <packaging>bundle</packaging>
     <properties>
         <parboiled.version>1.4.1</parboiled.version>
-        <!-- Overriding the asm version for jdk21 compatibility -->
-        <opensearch.asm.version>9.5</opensearch.asm.version>
     </properties>
     <dependencies>
         <dependency>
@@ -61,17 +59,17 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>${opensearch.asm.version}</version>
+            <version>${asm.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <version>${opensearch.asm.version}</version>
+            <version>${asm.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-analysis</artifactId>
-            <version>${opensearch.asm.version}</version>
+            <version>${asm.version}</version>
         </dependency>
         <!--test dependencies-->
         <dependency>

catalog/plugin/catalog-plugin-metacardbackup-filestorage/pom.xml

@@ -119,7 +119,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>2.2_MB</maxArtifactSize>
+                                    <maxArtifactSize>2.3_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

catalog/plugin/catalog-plugin-metacardbackup-s3storage/pom.xml

@@ -153,7 +153,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>2.2_MB</maxArtifactSize>
+                                    <maxArtifactSize>2.3_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

distribution/ddf-common/src/main/resources-filtered/etc/custom.properties

@@ -198,179 +198,6 @@ org.osgi.framework.system.packages.extra = \
     com.sun.net.ssl.internal.ssl, \
     com.sun.security.auth.callback, \
     com.sun.security.auth.module, \
-    org.bouncycastle.mail.smime.examples;version=${bouncy.version}, \
-    org.bouncycastle.mail.smime.handlers;version=${bouncy.version}, \
-    org.bouncycastle.mail.smime.util;version=${bouncy.version}, \
-    org.bouncycastle.mail.smime.validator;version=${bouncy.version}, \
-    org.bouncycastle.mail.smime;version=${bouncy.version}, \
-    org.bouncycastle.cert.bc;version=${bouncy.version}, \
-    org.bouncycastle.cert.cmp;version=${bouncy.version}, \
-    org.bouncycastle.cert.crmf.bc;version=${bouncy.version}, \
-    org.bouncycastle.cert.crmf.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.cert.crmf;version=${bouncy.version}, \
-    org.bouncycastle.cert.dane.fetcher;version=${bouncy.version}, \
-    org.bouncycastle.cert.dane;version=${bouncy.version}, \
-    org.bouncycastle.cert.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.cert.ocsp.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.cert.ocsp;version=${bouncy.version}, \
-    org.bouncycastle.cert.path.validations;version=${bouncy.version}, \
-    org.bouncycastle.cert.path;version=${bouncy.version}, \
-    org.bouncycastle.cert.selector.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.cert.selector;version=${bouncy.version}, \
-    org.bouncycastle.cert;version=${bouncy.version}, \
-    org.bouncycastle.cms.bc;version=${bouncy.version}, \
-    org.bouncycastle.cms.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.cms;version=${bouncy.version}, \
-    org.bouncycastle.dvcs;version=${bouncy.version}, \
-    org.bouncycastle.eac.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.eac.operator.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.eac.operator;version=${bouncy.version}, \
-    org.bouncycastle.eac;version=${bouncy.version}, \
-    org.bouncycastle.mozilla.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.mozilla;version=${bouncy.version}, \
-    org.bouncycastle.openssl.bc;version=${bouncy.version}, \
-    org.bouncycastle.openssl.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.openssl;version=${bouncy.version}, \
-    org.bouncycastle.operator.bc;version=${bouncy.version}, \
-    org.bouncycastle.operator.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.operator;version=${bouncy.version}, \
-    org.bouncycastle.pkcs.bc;version=${bouncy.version}, \
-    org.bouncycastle.pkcs.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.pkcs;version=${bouncy.version}, \
-    org.bouncycastle.pkix.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.pkix;version=${bouncy.version}, \
-    org.bouncycastle.tsp.cms;version=${bouncy.version}, \
-    org.bouncycastle.tsp;version=${bouncy.version}, \
-    org.bouncycastle.voms;version=${bouncy.version}, \
-    org.bouncycastle.asn1.anssi;version=${bouncy.version}, \
-    org.bouncycastle.asn1.bc;version=${bouncy.version}, \
-    org.bouncycastle.asn1.bsi;version=${bouncy.version}, \
-    org.bouncycastle.asn1.cmp;version=${bouncy.version}, \
-    org.bouncycastle.asn1.cms.ecc;version=${bouncy.version}, \
-    org.bouncycastle.asn1.cms;version=${bouncy.version}, \
-    org.bouncycastle.asn1.crmf;version=${bouncy.version}, \
-    org.bouncycastle.asn1.cryptopro;version=${bouncy.version}, \
-    org.bouncycastle.asn1.dvcs;version=${bouncy.version}, \
-    org.bouncycastle.asn1.eac;version=${bouncy.version}, \
-    org.bouncycastle.asn1.esf;version=${bouncy.version}, \
-    org.bouncycastle.asn1.ess;version=${bouncy.version}, \
-    org.bouncycastle.asn1.gnu;version=${bouncy.version}, \
-    org.bouncycastle.asn1.iana;version=${bouncy.version}, \
-    org.bouncycastle.asn1.icao;version=${bouncy.version}, \
-    org.bouncycastle.asn1.isismtt.ocsp;version=${bouncy.version}, \
-    org.bouncycastle.asn1.isismtt.x509;version=${bouncy.version}, \
-    org.bouncycastle.asn1.isismtt;version=${bouncy.version}, \
-    org.bouncycastle.asn1.iso;version=${bouncy.version}, \
-    org.bouncycastle.asn1.kisa;version=${bouncy.version}, \
-    org.bouncycastle.asn1.microsoft;version=${bouncy.version}, \
-    org.bouncycastle.asn1.misc;version=${bouncy.version}, \
-    org.bouncycastle.asn1.mozilla;version=${bouncy.version}, \
-    org.bouncycastle.asn1.nist;version=${bouncy.version}, \
-    org.bouncycastle.asn1.ntt;version=${bouncy.version}, \
-    org.bouncycastle.asn1.ocsp;version=${bouncy.version}, \
-    org.bouncycastle.asn1.oiw;version=${bouncy.version}, \
-    org.bouncycastle.asn1.pkcs;version=${bouncy.version}, \
-    org.bouncycastle.asn1.sec;version=${bouncy.version}, \
-    org.bouncycastle.asn1.smime;version=${bouncy.version}, \
-    org.bouncycastle.asn1.teletrust;version=${bouncy.version}, \
-    org.bouncycastle.asn1.tsp;version=${bouncy.version}, \
-    org.bouncycastle.asn1.ua;version=${bouncy.version}, \
-    org.bouncycastle.asn1.util;version=${bouncy.version}, \
-    org.bouncycastle.asn1.x500.style;version=${bouncy.version}, \
-    org.bouncycastle.asn1.x500;version=${bouncy.version}, \
-    org.bouncycastle.asn1.x509.qualified;version=${bouncy.version}, \
-    org.bouncycastle.asn1.x509.sigi;version=${bouncy.version}, \
-    org.bouncycastle.asn1.x509;version=${bouncy.version}, \
-    org.bouncycastle.asn1.x9;version=${bouncy.version}, \
-    org.bouncycastle.asn1;version=${bouncy.version}, \
-    org.bouncycastle.crypto.agreement.jpake;version=${bouncy.version}, \
-    org.bouncycastle.crypto.agreement.kdf;version=${bouncy.version}, \
-    org.bouncycastle.crypto.agreement.srp;version=${bouncy.version}, \
-    org.bouncycastle.crypto.agreement;version=${bouncy.version}, \
-    org.bouncycastle.crypto.commitments;version=${bouncy.version}, \
-    org.bouncycastle.crypto.digests;version=${bouncy.version}, \
-    org.bouncycastle.crypto.ec;version=${bouncy.version}, \
-    org.bouncycastle.crypto.encodings;version=${bouncy.version}, \
-    org.bouncycastle.crypto.engines;version=${bouncy.version}, \
-    org.bouncycastle.crypto.examples;version=${bouncy.version}, \
-    org.bouncycastle.crypto.generators;version=${bouncy.version}, \
-    org.bouncycastle.crypto.io;version=${bouncy.version}, \
-    org.bouncycastle.crypto.kems;version=${bouncy.version}, \
-    org.bouncycastle.crypto.macs;version=${bouncy.version}, \
-    org.bouncycastle.crypto.modes.gcm;version=${bouncy.version}, \
-    org.bouncycastle.crypto.modes;version=${bouncy.version}, \
-    org.bouncycastle.crypto.paddings;version=${bouncy.version}, \
-    org.bouncycastle.crypto.params;version=${bouncy.version}, \
-    org.bouncycastle.crypto.parsers;version=${bouncy.version}, \
-    org.bouncycastle.crypto.prng.drbg;version=${bouncy.version}, \
-    org.bouncycastle.crypto.prng;version=${bouncy.version}, \
-    org.bouncycastle.crypto.signers;version=${bouncy.version}, \
-    org.bouncycastle.crypto.tls;version=${bouncy.version}, \
-    org.bouncycastle.crypto.util;version=${bouncy.version}, \
-    org.bouncycastle.crypto;version=${bouncy.version}, \
-    org.bouncycastle.i18n.filter;version=${bouncy.version}, \
-    org.bouncycastle.i18n;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.io;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.dh;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.dsa;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.dstu;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.ec;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.ecgost;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.elgamal;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.gost;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.ies;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.rsa;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.util;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric.x509;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.asymmetric;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.config;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.digest;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.keystore.bc;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.keystore.pkcs12;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.keystore;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.symmetric.util;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.symmetric;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.provider.util;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.spec;version=${bouncy.version}, \
-    org.bouncycastle.jcajce.util;version=${bouncy.version}, \
-    org.bouncycastle.jcajce;version=${bouncy.version}, \
-    org.bouncycastle.jce.exception;version=${bouncy.version}, \
-    org.bouncycastle.jce.interfaces;version=${bouncy.version}, \
-    org.bouncycastle.jce.netscape;version=${bouncy.version}, \
-    org.bouncycastle.jce.provider;version=${bouncy.version}, \
-    org.bouncycastle.jce.spec;version=${bouncy.version}, \
-    org.bouncycastle.jce;version=${bouncy.version}, \
-    org.bouncycastle.math.ec.custom.djb;version=${bouncy.version}, \
-    org.bouncycastle.math.ec.custom.sec;version=${bouncy.version}, \
-    org.bouncycastle.math.ec.endo;version=${bouncy.version}, \
-    org.bouncycastle.math.ec.tools;version=${bouncy.version}, \
-    org.bouncycastle.math.ec;version=${bouncy.version}, \
-    org.bouncycastle.math.field;version=${bouncy.version}, \
-    org.bouncycastle.math.raw;version=${bouncy.version}, \
-    org.bouncycastle.math;version=${bouncy.version}, \
-    org.bouncycastle.pqc.asn1;version=${bouncy.version}, \
-    org.bouncycastle.pqc.crypto.gmss.util;version=${bouncy.version}, \
-    org.bouncycastle.pqc.crypto.gmss;version=${bouncy.version}, \
-    org.bouncycastle.pqc.crypto.mceliece;version=${bouncy.version}, \
-    org.bouncycastle.pqc.crypto.rainbow.util;version=${bouncy.version}, \
-    org.bouncycastle.pqc.crypto.rainbow;version=${bouncy.version}, \
-    org.bouncycastle.pqc.crypto;version=${bouncy.version}, \
-    org.bouncycastle.pqc.jcajce.provider.gmss;version=${bouncy.version}, \
-    org.bouncycastle.pqc.jcajce.provider.mceliece;version=${bouncy.version}, \
-    org.bouncycastle.pqc.jcajce.provider.rainbow;version=${bouncy.version}, \
-    org.bouncycastle.pqc.jcajce.provider.util;version=${bouncy.version}, \
-    org.bouncycastle.pqc.jcajce.provider;version=${bouncy.version}, \
-    org.bouncycastle.pqc.jcajce.spec;version=${bouncy.version}, \
-    org.bouncycastle.pqc.math.linearalgebra;version=${bouncy.version}, \
-    org.bouncycastle.util.encoders;version=${bouncy.version}, \
-    org.bouncycastle.util.io.pem;version=${bouncy.version}, \
-    org.bouncycastle.util.io;version=${bouncy.version}, \
-    org.bouncycastle.util.test;version=${bouncy.version}, \
-    org.bouncycastle.util;version=${bouncy.version}, \
-    org.bouncycastle.x509.extension;version=${bouncy.version}, \
-    org.bouncycastle.x509.util;version=${bouncy.version}, \
-    org.bouncycastle.x509;version=${bouncy.version}, \
-    org.bouncycastle;version=${bouncy.version}, \
     com.google.crypto.tink;version=${tink.version}, \
     com.google.crypto.tink.aead;version=${tink.version}, \
     com.google.crypto.tink.streamingaead;version=${tink.version}, \
@@ -434,7 +261,6 @@ org.osgi.framework.bootdelegation = \
     org.apache.xml.serialize, \
     org.apache.karaf.jaas.boot.principal, \
     org.apache.karaf.jaas.boot, \
-    org.bouncycastle.*, \
     com.google.crypto.tink, \
     com.google.crypto.tink.*, \
     com.google.protobuf, \

distribution/ddf-common/src/main/resources-filtered/etc/startup.properties

@@ -18,7 +18,7 @@ mvn\:ddf.platform.osgi/platform-osgi-internal-api/${project.version}=9
 mvn\:ddf.platform.osgi/platform-osgi-configadmin/${project.version}=10
 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.felix/org.apache.felix.cm.json/1.0.8 = 11
 mvn\:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}=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

distribution/test/itests/test-itests-common/pom.xml

@@ -159,12 +159,12 @@
             <dependency>
                 <groupId>org.ops4j.base</groupId>
                 <artifactId>ops4j-base-util-property</artifactId>
-                <version>1.5.0</version>
+                <version>${org.ops4j.base.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.base</groupId>
                 <artifactId>ops4j-base-net</artifactId>
-                <version>1.5.0</version>
+                <version>${org.ops4j.base.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

distribution/test/itests/test-itests-common/src/main/java/org/codice/ddf/itests/common/AbstractIntegrationTest.java

@@ -18,10 +18,10 @@
 import static org.awaitility.Awaitility.with;
 import static org.codice.ddf.itests.common.AbstractIntegrationTest.DynamicUrl.SECURE_ROOT;
 import static org.codice.ddf.itests.common.csw.CswQueryBuilder.PROPERTY_IS_LIKE;
+import static org.codice.ddf.test.common.configurators.KarafOptions.overridePaxExamJUnitHamcrest;
 import static org.hamcrest.Matchers.hasXPath;
 import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
 import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -715,15 +715,13 @@ protected Option[] configureVmOptions() {
   protected Option[] configureStartScript() {
     // add test dependencies to the test-dependencies-app instead of here
     return options(
-        mavenBundle(
-            "org.apache.servicemix.bundles", "org.apache.servicemix.bundles.hamcrest", "1.3_1"),
         // The version of the xalan bundle is an old version. This is the only way we could get
         // some itests to work. It seems to be a classloader problem that only occurs in a
         // pax-exam setup.
         mavenBundle(
             "org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xalan", "2.7.2_1"),
         mavenBundle("commons-lang", "commons-lang", "2.6"),
-        junitBundles(),
+        overridePaxExamJUnitHamcrest(),
         features(
             maven()
                 .groupId(DDF_ITESTS_GROUP_ID)

distribution/test/itests/test-itests-ddf/pom.xml

@@ -41,6 +41,7 @@
         <dependency>
             <groupId>org.ops4j.pax.tinybundles</groupId>
             <artifactId>tinybundles</artifactId>
+            <version>${tinybundles.version}</version>
         </dependency>
 
         <!-- In-container depedencies -->