diff --git a/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml b/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml index 38e76da76fa9..eab6bf1024a6 100644 --- a/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml +++ b/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml @@ -38,8 +38,42 @@ - - + + + + + + + + + + diff --git a/features/apps/pom.xml b/features/apps/pom.xml index 0c53ba535910..43c0c1b41e49 100644 --- a/features/apps/pom.xml +++ b/features/apps/pom.xml @@ -149,13 +149,6 @@ xml features - - org.codice.opendj.embedded - opendj-embedded-app - ${opendj-embedded.app.version} - xml - features - diff --git a/features/security/src/main/feature/feature.xml b/features/security/src/main/feature/feature.xml index 008bb1276ddf..034dd10dbbe2 100644 --- a/features/security/src/main/feature/feature.xml +++ b/features/security/src/main/feature/feature.xml @@ -313,26 +313,11 @@ mvn:ddf.security.claims/security-claims-ldap/${project.version} - - - mvn:ddf.security.claims/security-claims-ldap/${project.version}/config/default-ldap-claimshandler - - - mvn:ddf.security.jaas/security-jaas-ldap/${project.version}/config/default-ldaplogin - - - security-core-services oidc-auth saml-auth ldap-auth - embedded-ldap diff --git a/platform/security/security-oidc-bundle/pom.xml b/platform/security/security-oidc-bundle/pom.xml index fda1c7e1aa28..068933ee2c26 100644 --- a/platform/security/security-oidc-bundle/pom.xml +++ b/platform/security/security-oidc-bundle/pom.xml @@ -145,6 +145,13 @@ !com.nimbusds.jose.shaded.json, !org.reflections.*, !javassist, + !com.unboundid.*, + !de.flapdoodle.*, + !fi.iki.*, + !org.h2.*, + !org.junit.jupiter.*, + !org.ldaptive.*, + !org.skife.*, net.minidev.*;version="${json-smart.version}", * diff --git a/pom.xml b/pom.xml index e2d87bb85b43..d1e46bb86d5f 100644 --- a/pom.xml +++ b/pom.xml @@ -123,9 +123,9 @@ 2.3-groovy-4.0 3.6.28 4.14.0 - 2.3.2 - 2.7.0 - 8.0.34 + 2.3.3 + 2.7.1 + 8.0.35 1.1.2 5.5.0 4.0.23 @@ -151,9 +151,9 @@ 1.1.3 4.3 1.13.0 - 9.9 + 9.9.1 3.1.6 - 1.83 + 1.84 0.12.0 0.8.1 ${cal10n.version}_1 @@ -170,10 +170,10 @@ 1.4 1.8.1 1.3 - 2.21.0 + 2.22.0 2.6 3.20.0 - 1.3.5 + 1.3.6 3.6.1 3.5 1.6 @@ -182,7 +182,7 @@ 4.7.0 0.2.4 1.6.1 - 3.6.10 + 3.6.11 2.9.0 4.1.25 3.17.200 @@ -198,13 +198,13 @@ 2.13.2 33.4.0-jre 1.11 - 4.5.13 + 4.5.14 4.4.15 ${httpclient.version} 1.4.0 2.2.1_CODICE_1 2.21 - 2.21.1 + 2.21.2 2.3.2 1.2.2 1.6.7 @@ -241,12 +241,12 @@ 1.17.1 2.6.1 1.3.3 - 4.4.10 - 2.4.2 - 1.2.0 + 4.4.11 + 2.4.3 + 1.3.0 1.2.0 0.6.0 - 2.17.2 + 2.25.4 1.2.13 1.2.13 2.4.1 @@ -257,7 +257,6 @@ 1.0.2 3.1 1.2.0 - 1.3.3 3.4.6 3.4.5_2 11.33 @@ -277,7 +276,7 @@ 1.1.0 1.1.0_5 1.0.13 - 6.4.2 + 6.5.2 3.0.5 5.4.1 5.3.0