upgrade various artifacts

codice · Dec 9, 2024 · 441f4be · 441f4be
1 parent 94444cb
commit 441f4be
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 31 deletions.
diff --git a/catalog/core/catalog-core-camelcomponent/pom.xml b/catalog/core/catalog-core-camelcomponent/pom.xml
@@ -179,7 +179,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>12_MB</maxArtifactSize>
+                                    <maxArtifactSize>14.8_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/...nent/src/main/java/ddf/camel/component/catalog/content/FileSystemPersistenceProvider.java b/...nent/src/main/java/ddf/camel/component/catalog/content/FileSystemPersistenceProvider.java
@@ -13,8 +13,8 @@
  */
 package ddf.camel.component.catalog.content;
 
-import com.hazelcast.core.MapLoader;
-import com.hazelcast.core.MapStore;
+import com.hazelcast.map.MapLoader;
+import com.hazelcast.map.MapStore;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.file.Paths;

diff --git a/...r/src/main/java/org/codice/ddf/catalog/content/monitor/FileSystemPersistenceProvider.java b/...r/src/main/java/org/codice/ddf/catalog/content/monitor/FileSystemPersistenceProvider.java
@@ -15,8 +15,8 @@
 
 import static ddf.catalog.Constants.CDM_LOGGER_NAME;
 
-import com.hazelcast.core.MapLoader;
-import com.hazelcast.core.MapStore;
+import com.hazelcast.map.MapLoader;
+import com.hazelcast.map.MapStore;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;

diff --git a/catalog/core/catalog-core-resourcesizeplugin/pom.xml b/catalog/core/catalog-core-resourcesizeplugin/pom.xml
@@ -103,7 +103,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>10.5_MB</maxArtifactSize>
+                                    <maxArtifactSize>13.5_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/catalog/core/catalog-core-resourcestatusplugin/pom.xml b/catalog/core/catalog-core-resourcestatusplugin/pom.xml
@@ -100,7 +100,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>10.5_MB</maxArtifactSize>
+                                    <maxArtifactSize>13.5_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/distribution/test/itests/test-itests-common/pom.xml b/distribution/test/itests/test-itests-common/pom.xml
@@ -241,7 +241,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>6_MB</maxArtifactSize>
+                                    <maxArtifactSize>6.2_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/features/solr/pom.xml b/features/solr/pom.xml
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.26.0</version>
+            <version>1.37.0</version>
         </dependency>
 
         <!--feature dependencies-->

diff --git a/features/utilities/pom.xml b/features/utilities/pom.xml
@@ -151,7 +151,7 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-all</artifactId>
-            <version>1.14</version>
+            <version>1.17</version>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>

diff --git a/features/utilities/src/main/feature/feature.xml b/features/utilities/src/main/feature/feature.xml
@@ -43,6 +43,7 @@
     <feature name="parser-xml" version="${project.version}"
              description="Platform JAXB support.">
         <feature>guava</feature>
+        <bundle>mvn:org.apache.commons/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:ddf.platform/platform-parser-api/${project.version}</bundle>
         <bundle>mvn:ddf.platform/platform-parser-xml/${project.version}</bundle>
     </feature>
@@ -212,7 +213,7 @@
         <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-math3/${commons-math3.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-compress/${commons-compress.version}</bundle>
-        <bundle>wrap:mvn:org.apache.xmlgraphics/batik-all/1.14</bundle>
+        <bundle>wrap:mvn:org.apache.xmlgraphics/batik-all/1.17</bundle>
         <bundle>wrap:mvn:xml-apis/xml-apis-ext/1.3.04</bundle>
         <bundle>mvn:org.apache.santuario/xmlsec/${xmlsec.version}</bundle>
         <bundle>wrap:mvn:org.apache.xmlgraphics/xmlgraphics-commons/2.7</bundle>

diff --git a/...jettyconfig/src/test/java/org/codice/ddf/security/session/JettySessionManagementTest.java b/...jettyconfig/src/test/java/org/codice/ddf/security/session/JettySessionManagementTest.java
@@ -24,6 +24,7 @@
 import io.restassured.RestAssured;
 import io.restassured.filter.session.SessionFilter;
 import java.io.IOException;
+import java.net.URL;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -34,6 +35,7 @@
 import org.eclipse.jetty.server.session.HouseKeeper;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.resource.PathResource;
 import org.eclipse.jetty.xml.XmlConfiguration;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -57,9 +59,11 @@ public static void setupClass() throws Exception {
     HandlerList handlers = new HandlerList();
     server.setHandler(handlers);
     // Configure server according to the jetty.xml file
-    XmlConfiguration configuration =
-        new XmlConfiguration(
-            JettySessionManagementTest.class.getResourceAsStream("/jetty-session.xml"));
+    URL resourceURL = JettySessionManagementTest.class.getResource("/jetty-session.xml");
+    if (resourceURL == null) {
+      throw new RuntimeException("Unable to open resource jetty-session.xml");
+    }
+    XmlConfiguration configuration = new XmlConfiguration(new PathResource(resourceURL));
     configuration.configure(server);
     // Have server bind to first available port
     ServerConnector connector = new ServerConnector(server);

diff --git a/platform/platform-paxweb-jettyconfig/src/test/resources/jetty-session.xml b/platform/platform-paxweb-jettyconfig/src/test/resources/jetty-session.xml
@@ -30,8 +30,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//
-DTD Configure//EN" "http://jetty.mortbay.org/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure_9_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 

diff --git a/platform/security/claims/security-claims-ldap/pom.xml b/platform/security/claims/security-claims-ldap/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap-core</artifactId>
-            <version>2.3.3.RELEASE</version>
+            <version>2.3.8.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/platform/security/core/security-core-services/pom.xml b/platform/security/core/security-core-services/pom.xml
@@ -288,7 +288,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>2.4_MB</maxArtifactSize>
+                                    <maxArtifactSize>3.8_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/platform/security/handler/security-handler-oauth/pom.xml b/platform/security/handler/security-handler-oauth/pom.xml
@@ -137,7 +137,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>2.0_MB</maxArtifactSize>
+                                    <maxArtifactSize>2.4_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/platform/security/handler/security-handler-oidc/pom.xml b/platform/security/handler/security-handler-oidc/pom.xml
@@ -150,7 +150,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>2.0_MB</maxArtifactSize>
+                                    <maxArtifactSize>3.4_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/platform/security/realm/security-realm-oidc/pom.xml b/platform/security/realm/security-realm-oidc/pom.xml
@@ -159,7 +159,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>2.0_MB</maxArtifactSize>
+                                    <maxArtifactSize>2.4_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/platform/security/security-oidc-bundle/pom.xml b/platform/security/security-oidc-bundle/pom.xml
@@ -94,7 +94,7 @@
                         <configuration>
                             <rules>
                                 <ArtifactSizeEnforcerRule implementation="org.codice.maven.artifactsize.ArtifactSizeEnforcerRule">
-                                    <maxArtifactSize>2.0_MB</maxArtifactSize>
+                                    <maxArtifactSize>3.4_MB</maxArtifactSize>
                                 </ArtifactSizeEnforcerRule>
                             </rules>
                         </configuration>

diff --git a/pom.xml b/pom.xml
@@ -179,7 +179,7 @@
         <commons-validator.version>1.6</commons-validator.version>
         <components-font-awesome.version>4.7.0</components-font-awesome.version>
         <countryconverter.version>0.1.8</countryconverter.version>
-        <cryptomator.version>1.4.4</cryptomator.version>
+        <cryptomator.version>1.5.2</cryptomator.version>
         <cxf.version>3.5.3</cxf.version>
         <ddf-admin-ui.version>2.25.0</ddf-admin-ui.version>
         <decanter.version>2.9.0</decanter.version>
@@ -202,7 +202,7 @@
         <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.13.3</jackson.version>
+        <jackson.version>2.17.2</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.6</jakarta.mail.version>
@@ -249,7 +249,7 @@
         <mariadb.version>2.4.1</mariadb.version>
         <maven.failsafe.version>2.22.2</maven.failsafe.version>
         <maven.surefire.version>2.22.2</maven.surefire.version>
-        <mime4j.version>0.8.7</mime4j.version>
+        <mime4j.version>0.8.11</mime4j.version>
         <mpegts-streamer.version>0.1.0_2</mpegts-streamer.version>
         <net.minidev.asm.version>1.0.2</net.minidev.asm.version>
         <netty.version>4.1.46.Final</netty.version>
@@ -277,11 +277,11 @@
         <pdfbox.version>2.0.23</pdfbox.version>
         <poi.version>5.2.2</poi.version>
         <xlsx.transformer.poi.version>5.2.2</xlsx.transformer.poi.version>
-        <protobuf.version>3.12.4</protobuf.version>
+        <protobuf.version>3.21.12</protobuf.version>
         <quartz.version>2.3.2</quartz.version>
         <require-css.version>0.1.10</require-css.version>
         <sardine.version>5.7</sardine.version>
-        <hazelcast.version>3.12.10</hazelcast.version>
+        <hazelcast.version>5.1.7</hazelcast.version>
         <saxon.version>9.6.0-4</saxon.version>
         <servicemix.bundles.poi.version>${poi.version}_2</servicemix.bundles.poi.version>
         <servicemix.bundles.jaxb.version>${jaxb.version}_3</servicemix.bundles.jaxb.version>
@@ -299,12 +299,12 @@
         <solr.spatial4j.version>0.8</solr.spatial4j.version>
         <spark.version>2.9.2</spark.version>
         <spatial4j.version>0.8</spatial4j.version>
-        <spring.version>5.3.14</spring.version>
+        <spring.version>5.3.19</spring.version>
         <spring-osgi-mock.version>1.2.1</spring-osgi-mock.version>
         <tika.version>1.28.4</tika.version>
         <usng4j.version>0.4</usng4j.version>
         <validation.version>1.1.0.Final</validation.version>
-        <woodstox.core.version>6.2.8</woodstox.core.version>
+        <woodstox.core.version>6.5.1</woodstox.core.version>
         <woodstox.stax2-api.version>4.2.1</woodstox.stax2-api.version>
         <wss4j.neethi.version>3.1.1</wss4j.neethi.version>
         <wss4j.version>2.3.3</wss4j.version>
@@ -316,8 +316,8 @@
         <xmlbeans.version>5.0.3</xmlbeans.version>
         <xmlsec.version>2.3.1</xmlsec.version>
         <xpp3.bundle.version>1.1.4c_6</xpp3.bundle.version>
-        <xstream.bundle.version>1.4.19_1</xstream.bundle.version>
-        <xstream.version>1.4.19</xstream.version>
+        <xstream.bundle.version>1.4.20_1</xstream.bundle.version>
+        <xstream.version>1.4.20</xstream.version>
         <micrometer.version>1.8.0</micrometer.version>
         <micrometer.hdrhistogram.version>2.1.12</micrometer.hdrhistogram.version>
         <micrometer.latencyutils.version>2.0.3</micrometer.latencyutils.version>