From 441f4bea745d89647d258d9ddc05cc4cff6c54b6 Mon Sep 17 00:00:00 2001 From: Glen Hein Date: Thu, 21 Nov 2024 13:59:24 -0700 Subject: [PATCH] upgrade various artifacts --- .../core/catalog-core-camelcomponent/pom.xml | 2 +- .../content/FileSystemPersistenceProvider.java | 4 ++-- .../monitor/FileSystemPersistenceProvider.java | 4 ++-- .../catalog-core-resourcesizeplugin/pom.xml | 2 +- .../catalog-core-resourcestatusplugin/pom.xml | 2 +- .../test/itests/test-itests-common/pom.xml | 2 +- features/solr/pom.xml | 2 +- features/utilities/pom.xml | 2 +- .../utilities/src/main/feature/feature.xml | 3 ++- .../session/JettySessionManagementTest.java | 10 +++++++--- .../src/test/resources/jetty-session.xml | 3 +-- .../claims/security-claims-ldap/pom.xml | 2 +- .../core/security-core-services/pom.xml | 2 +- .../handler/security-handler-oauth/pom.xml | 2 +- .../handler/security-handler-oidc/pom.xml | 2 +- .../security/realm/security-realm-oidc/pom.xml | 2 +- platform/security/security-oidc-bundle/pom.xml | 2 +- pom.xml | 18 +++++++++--------- 18 files changed, 35 insertions(+), 31 deletions(-) diff --git a/catalog/core/catalog-core-camelcomponent/pom.xml b/catalog/core/catalog-core-camelcomponent/pom.xml index 9537af631f4d..7565402b378a 100644 --- a/catalog/core/catalog-core-camelcomponent/pom.xml +++ b/catalog/core/catalog-core-camelcomponent/pom.xml @@ -179,7 +179,7 @@ - 12_MB + 14.8_MB diff --git a/catalog/core/catalog-core-camelcomponent/src/main/java/ddf/camel/component/catalog/content/FileSystemPersistenceProvider.java b/catalog/core/catalog-core-camelcomponent/src/main/java/ddf/camel/component/catalog/content/FileSystemPersistenceProvider.java index c5088d1d9ff6..19770fc23138 100644 --- a/catalog/core/catalog-core-camelcomponent/src/main/java/ddf/camel/component/catalog/content/FileSystemPersistenceProvider.java +++ b/catalog/core/catalog-core-camelcomponent/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/catalog/core/catalog-core-directorymonitor/src/main/java/org/codice/ddf/catalog/content/monitor/FileSystemPersistenceProvider.java b/catalog/core/catalog-core-directorymonitor/src/main/java/org/codice/ddf/catalog/content/monitor/FileSystemPersistenceProvider.java index 9f65cd591fdc..c1dc0244dd8e 100644 --- a/catalog/core/catalog-core-directorymonitor/src/main/java/org/codice/ddf/catalog/content/monitor/FileSystemPersistenceProvider.java +++ b/catalog/core/catalog-core-directorymonitor/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 index eaf892439b1c..06aac631faf3 100644 --- a/catalog/core/catalog-core-resourcesizeplugin/pom.xml +++ b/catalog/core/catalog-core-resourcesizeplugin/pom.xml @@ -103,7 +103,7 @@ - 10.5_MB + 13.5_MB diff --git a/catalog/core/catalog-core-resourcestatusplugin/pom.xml b/catalog/core/catalog-core-resourcestatusplugin/pom.xml index 08f004b25462..5627c57b84ff 100644 --- a/catalog/core/catalog-core-resourcestatusplugin/pom.xml +++ b/catalog/core/catalog-core-resourcestatusplugin/pom.xml @@ -100,7 +100,7 @@ - 10.5_MB + 13.5_MB diff --git a/distribution/test/itests/test-itests-common/pom.xml b/distribution/test/itests/test-itests-common/pom.xml index 15b9f735bdaf..a9e5f1c1fa14 100644 --- a/distribution/test/itests/test-itests-common/pom.xml +++ b/distribution/test/itests/test-itests-common/pom.xml @@ -241,7 +241,7 @@ - 6_MB + 6.2_MB diff --git a/features/solr/pom.xml b/features/solr/pom.xml index ebe4f3b8c59d..9d0af0f9f905 100644 --- a/features/solr/pom.xml +++ b/features/solr/pom.xml @@ -112,7 +112,7 @@ org.apache.calcite calcite-core - 1.26.0 + 1.37.0 diff --git a/features/utilities/pom.xml b/features/utilities/pom.xml index 884b9b47db62..654aad578b80 100644 --- a/features/utilities/pom.xml +++ b/features/utilities/pom.xml @@ -151,7 +151,7 @@ org.apache.xmlgraphics batik-all - 1.14 + 1.17 xml-apis diff --git a/features/utilities/src/main/feature/feature.xml b/features/utilities/src/main/feature/feature.xml index b111e28b6f78..7519925d5144 100644 --- a/features/utilities/src/main/feature/feature.xml +++ b/features/utilities/src/main/feature/feature.xml @@ -43,6 +43,7 @@ guava + mvn:org.apache.commons/commons-lang/${commons-lang.version} mvn:ddf.platform/platform-parser-api/${project.version} mvn:ddf.platform/platform-parser-xml/${project.version} @@ -212,7 +213,7 @@ mvn:commons-io/commons-io/${commons-io.version} mvn:org.apache.commons/commons-math3/${commons-math3.version} mvn:org.apache.commons/commons-compress/${commons-compress.version} - wrap:mvn:org.apache.xmlgraphics/batik-all/1.14 + wrap:mvn:org.apache.xmlgraphics/batik-all/1.17 wrap:mvn:xml-apis/xml-apis-ext/1.3.04 mvn:org.apache.santuario/xmlsec/${xmlsec.version} wrap:mvn:org.apache.xmlgraphics/xmlgraphics-commons/2.7 diff --git a/platform/platform-paxweb-jettyconfig/src/test/java/org/codice/ddf/security/session/JettySessionManagementTest.java b/platform/platform-paxweb-jettyconfig/src/test/java/org/codice/ddf/security/session/JettySessionManagementTest.java index ebaaa771c03a..0deba3c15ba5 100644 --- a/platform/platform-paxweb-jettyconfig/src/test/java/org/codice/ddf/security/session/JettySessionManagementTest.java +++ b/platform/platform-paxweb-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 index 0ade734f39ce..76d06f000e99 100644 --- 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. --> - + diff --git a/platform/security/claims/security-claims-ldap/pom.xml b/platform/security/claims/security-claims-ldap/pom.xml index 8f6c578a41a3..aba44bd6cf31 100644 --- a/platform/security/claims/security-claims-ldap/pom.xml +++ b/platform/security/claims/security-claims-ldap/pom.xml @@ -31,7 +31,7 @@ org.springframework.ldap spring-ldap-core - 2.3.3.RELEASE + 2.3.8.RELEASE compile diff --git a/platform/security/core/security-core-services/pom.xml b/platform/security/core/security-core-services/pom.xml index 7106969b52de..c4852140daa7 100644 --- a/platform/security/core/security-core-services/pom.xml +++ b/platform/security/core/security-core-services/pom.xml @@ -288,7 +288,7 @@ - 2.4_MB + 3.8_MB diff --git a/platform/security/handler/security-handler-oauth/pom.xml b/platform/security/handler/security-handler-oauth/pom.xml index bd013494d0cb..29a10cb5a187 100644 --- a/platform/security/handler/security-handler-oauth/pom.xml +++ b/platform/security/handler/security-handler-oauth/pom.xml @@ -137,7 +137,7 @@ - 2.0_MB + 2.4_MB diff --git a/platform/security/handler/security-handler-oidc/pom.xml b/platform/security/handler/security-handler-oidc/pom.xml index 5abab27e2825..2e43d855dc29 100644 --- a/platform/security/handler/security-handler-oidc/pom.xml +++ b/platform/security/handler/security-handler-oidc/pom.xml @@ -150,7 +150,7 @@ - 2.0_MB + 3.4_MB diff --git a/platform/security/realm/security-realm-oidc/pom.xml b/platform/security/realm/security-realm-oidc/pom.xml index 33898444cc8a..7a534bf422b5 100644 --- a/platform/security/realm/security-realm-oidc/pom.xml +++ b/platform/security/realm/security-realm-oidc/pom.xml @@ -159,7 +159,7 @@ - 2.0_MB + 2.4_MB diff --git a/platform/security/security-oidc-bundle/pom.xml b/platform/security/security-oidc-bundle/pom.xml index 939a7bf2c155..a875d757ace7 100644 --- a/platform/security/security-oidc-bundle/pom.xml +++ b/platform/security/security-oidc-bundle/pom.xml @@ -94,7 +94,7 @@ - 2.0_MB + 3.4_MB diff --git a/pom.xml b/pom.xml index 86509ecedacb..13bb68a7d27e 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ 1.6 4.7.0 0.1.8 - 1.4.4 + 1.5.2 3.5.3 2.25.0 2.9.0 @@ -202,7 +202,7 @@ ${httpclient.version} 1.4.0 2.2.1_CODICE_1 - 2.13.3 + 2.17.2 2.3.2 1.2.2 1.6.6 @@ -249,7 +249,7 @@ 2.4.1 2.22.2 2.22.2 - 0.8.7 + 0.8.11 0.1.0_2 1.0.2 4.1.46.Final @@ -277,11 +277,11 @@ 2.0.23 5.2.2 5.2.2 - 3.12.4 + 3.21.12 2.3.2 0.1.10 5.7 - 3.12.10 + 5.1.7 9.6.0-4 ${poi.version}_2 ${jaxb.version}_3 @@ -299,12 +299,12 @@ 0.8 2.9.2 0.8 - 5.3.14 + 5.3.19 1.2.1 1.28.4 0.4 1.1.0.Final - 6.2.8 + 6.5.1 4.2.1 3.1.1 2.3.3 @@ -316,8 +316,8 @@ 5.0.3 2.3.1 1.1.4c_6 - 1.4.19_1 - 1.4.19 + 1.4.20_1 + 1.4.20 1.8.0 2.1.12 2.0.3