diff --git a/openam-audit/openam-audit-configuration/pom.xml b/openam-audit/openam-audit-configuration/pom.xml
index 631fff83d2..7356464540 100644
--- a/openam-audit/openam-audit-configuration/pom.xml
+++ b/openam-audit/openam-audit-configuration/pom.xml
@@ -79,6 +79,7 @@
+
com.h2database
h2
diff --git a/openam-audit/openam-audit-context/pom.xml b/openam-audit/openam-audit-context/pom.xml
index 4ba6ba72aa..36fd24c950 100644
--- a/openam-audit/openam-audit-context/pom.xml
+++ b/openam-audit/openam-audit-context/pom.xml
@@ -43,10 +43,15 @@
forgerock-audit-core
+
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.inject
+ jakarta.inject-api
+
+
+
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-audit/openam-audit-core/pom.xml b/openam-audit/openam-audit-core/pom.xml
index cd23cb517d..f326fcff6b 100644
--- a/openam-audit/openam-audit-core/pom.xml
+++ b/openam-audit/openam-audit-core/pom.xml
@@ -54,9 +54,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-adaptive/pom.xml b/openam-authentication/openam-auth-adaptive/pom.xml
index 7bfbf5bc19..3383b06c10 100755
--- a/openam-authentication/openam-auth-adaptive/pom.xml
+++ b/openam-authentication/openam-auth-adaptive/pom.xml
@@ -36,9 +36,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-application/pom.xml b/openam-authentication/openam-auth-application/pom.xml
index b155afb115..b350e3ee41 100755
--- a/openam-authentication/openam-auth-application/pom.xml
+++ b/openam-authentication/openam-auth-application/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-cert/pom.xml b/openam-authentication/openam-auth-cert/pom.xml
index 03e2fcf1be..926e5a1283 100755
--- a/openam-authentication/openam-auth-cert/pom.xml
+++ b/openam-authentication/openam-auth-cert/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-common/pom.xml b/openam-authentication/openam-auth-common/pom.xml
index 3ed5af3419..57ca625e49 100755
--- a/openam-authentication/openam-auth-common/pom.xml
+++ b/openam-authentication/openam-auth-common/pom.xml
@@ -36,14 +36,13 @@
- org.glassfish
- javax.security.auth.message
+ jakarta.security.auth.message
+ jakarta.security.auth.message-api
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-fr-oath/pom.xml b/openam-authentication/openam-auth-fr-oath/pom.xml
index e5ac3ac5b0..29ee0bb54c 100644
--- a/openam-authentication/openam-auth-fr-oath/pom.xml
+++ b/openam-authentication/openam-auth-fr-oath/pom.xml
@@ -42,9 +42,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-hotp/pom.xml b/openam-authentication/openam-auth-hotp/pom.xml
index bf59ff6302..27b69bd758 100755
--- a/openam-authentication/openam-auth-hotp/pom.xml
+++ b/openam-authentication/openam-auth-hotp/pom.xml
@@ -31,14 +31,14 @@
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
provided
com.sun.mail
- javax.mail
+ jakarta.mail
diff --git a/openam-authentication/openam-auth-httpbasic/pom.xml b/openam-authentication/openam-auth-httpbasic/pom.xml
index 187d792b88..5fc2f1b047 100755
--- a/openam-authentication/openam-auth-httpbasic/pom.xml
+++ b/openam-authentication/openam-auth-httpbasic/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-msisdn/pom.xml b/openam-authentication/openam-auth-msisdn/pom.xml
index a6dae91fbc..a2f2cc48cf 100755
--- a/openam-authentication/openam-auth-msisdn/pom.xml
+++ b/openam-authentication/openam-auth-msisdn/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-oath/pom.xml b/openam-authentication/openam-auth-oath/pom.xml
index fe0c35ada0..ca9997cdd2 100755
--- a/openam-authentication/openam-auth-oath/pom.xml
+++ b/openam-authentication/openam-auth-oath/pom.xml
@@ -37,9 +37,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-oauth2/pom.xml b/openam-authentication/openam-auth-oauth2/pom.xml
index 54fbeb62cd..50bacc7014 100755
--- a/openam-authentication/openam-auth-oauth2/pom.xml
+++ b/openam-authentication/openam-auth-oauth2/pom.xml
@@ -42,9 +42,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-oidc/pom.xml b/openam-authentication/openam-auth-oidc/pom.xml
index 4a614d1d57..7ef4b196d0 100755
--- a/openam-authentication/openam-auth-oidc/pom.xml
+++ b/openam-authentication/openam-auth-oidc/pom.xml
@@ -46,9 +46,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-persistentcookie/pom.xml b/openam-authentication/openam-auth-persistentcookie/pom.xml
index bc107d259d..3bdd9f130b 100755
--- a/openam-authentication/openam-auth-persistentcookie/pom.xml
+++ b/openam-authentication/openam-auth-persistentcookie/pom.xml
@@ -41,11 +41,9 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
-
org.testng
testng
diff --git a/openam-authentication/openam-auth-push/pom.xml b/openam-authentication/openam-auth-push/pom.xml
index 9e64304935..91fe5895d1 100644
--- a/openam-authentication/openam-auth-push/pom.xml
+++ b/openam-authentication/openam-auth-push/pom.xml
@@ -40,9 +40,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-saml2/pom.xml b/openam-authentication/openam-auth-saml2/pom.xml
index ba5667ce39..6614ea63b8 100644
--- a/openam-authentication/openam-auth-saml2/pom.xml
+++ b/openam-authentication/openam-auth-saml2/pom.xml
@@ -46,9 +46,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-authentication/openam-auth-scripted/pom.xml b/openam-authentication/openam-auth-scripted/pom.xml
index c60a2ca264..b2c9b7fd75 100644
--- a/openam-authentication/openam-auth-scripted/pom.xml
+++ b/openam-authentication/openam-auth-scripted/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
@@ -56,10 +55,5 @@
org.mockito
mockito-core
-
-
- org.easytesting
- fest-assert
-
diff --git a/openam-authentication/openam-auth-windowsdesktopsso/pom.xml b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml
index cae3540fba..b04f635742 100755
--- a/openam-authentication/openam-auth-windowsdesktopsso/pom.xml
+++ b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-cli/openam-cli-impl/pom.xml b/openam-cli/openam-cli-impl/pom.xml
index 4376979291..bd2d8d00bf 100644
--- a/openam-cli/openam-cli-impl/pom.xml
+++ b/openam-cli/openam-cli-impl/pom.xml
@@ -53,9 +53,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-common-auth-ui/pom.xml b/openam-common-auth-ui/pom.xml
index 19e78c0181..975312bc21 100755
--- a/openam-common-auth-ui/pom.xml
+++ b/openam-common-auth-ui/pom.xml
@@ -31,14 +31,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.servlet.jsp
- jsp-api
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
diff --git a/openam-console/pom.xml b/openam-console/pom.xml
index 090f45e552..c6d56ce75a 100644
--- a/openam-console/pom.xml
+++ b/openam-console/pom.xml
@@ -37,13 +37,6 @@
maven-war-plugin
-
- WEB-INF/lib/jersey-core-1.1.5.2.jar,
- WEB-INF/lib/jaxb-api-1.0.6.jar,
- WEB-INF/lib/jaxb-libs-1.0.6.jar,
- WEB-INF/lib/jaxb-xjc-1.0.6.jar,
-
-
Wren:AM Admin Console
@@ -168,14 +161,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.servlet.jsp
- jsp-api
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
diff --git a/openam-core-rest/pom.xml b/openam-core-rest/pom.xml
index cf4c54943e..89c87d47a4 100755
--- a/openam-core-rest/pom.xml
+++ b/openam-core-rest/pom.xml
@@ -65,9 +65,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-core/pom.xml b/openam-core/pom.xml
index ed41cd1b38..fd3797bd5f 100755
--- a/openam-core/pom.xml
+++ b/openam-core/pom.xml
@@ -324,8 +324,8 @@
- javax.xml
- jaxrpc-api
+ jakarta.xml.rpc
+ jakarta.xml.rpc-api
@@ -359,24 +359,23 @@
- javax.servlet
- jstl
+ jakarta.servlet.jsp.jstl
+ jakarta.servlet.jsp.jstl-api
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.servlet.jsp
- jsp-api
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
com.sun.mail
- javax.mail
+ jakarta.mail
@@ -407,13 +406,13 @@
- org.mockito
- mockito-core
+ org.easytesting
+ fest-assert
- org.easytesting
- fest-assert
+ org.mockito
+ mockito-core
diff --git a/openam-dashboard/pom.xml b/openam-dashboard/pom.xml
index 8450f80d4e..03cbfb74bd 100755
--- a/openam-dashboard/pom.xml
+++ b/openam-dashboard/pom.xml
@@ -52,9 +52,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-distribution/openam-distribution-ssoadmintools/pom.xml b/openam-distribution/openam-distribution-ssoadmintools/pom.xml
index f62824a898..7aea0bb7df 100755
--- a/openam-distribution/openam-distribution-ssoadmintools/pom.xml
+++ b/openam-distribution/openam-distribution-ssoadmintools/pom.xml
@@ -35,11 +35,11 @@
opendj-server,forgerock-util,json,xmlsec,openam-core,
openam-entitlements,openam-shared,openam-dtd-schema,openam-license-manager-cli,openam-license-core,
openam-audit-context,wrensec-guice-core,wrensec-guava-base,wrensec-guava-collect,
- guice,guice-assistedinject,commons-lang,commons-collections,org.apache.servicemix.bundles.javax-inject,
+ guice,guice-assistedinject,commons-lang,commons-collections,jakarta.inject-api,
slf4j-api,slf4j-nop,opendj-core,opendj-grizzly,i18n-core,openam-ldap-utils,grizzly-framework,
forgerock-audit-core,openam-audit-configuration,i18n-slf4j,
opendj-server-legacy,opendj-config,opendj-cli,chf-http-core,joda-time,
- jackson-core,jackson-databind,jackson-annotations,jaxb-api
+ jackson-core,jackson-databind,jackson-annotations,jakarta.xml.bind-api
@@ -247,9 +247,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
+
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
@@ -291,8 +295,8 @@
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.javax-inject
+ jakarta.inject
+ jakarta.inject-api
diff --git a/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml b/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
index 4a1468ca48..7b3c978d58 100644
--- a/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
+++ b/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
@@ -22,7 +22,7 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
-* Portions Copyrighted 2022 Wren Security
+* Portions Copyrighted 2022-2023 Wren Security
-->
org.wrensecurity.wrenam:openam-ldap-utils
org.wrensecurity.wrenam:openam-audit-context
org.forgerock.commons:json-resource
- javax.inject:javax.inject
+ jakarta.inject:jakarta.inject-api
com.google.inject:guice:jar:no_aop
com.google.inject.extensions:guice-assistedinject
commons-lang:commons-lang
commons-collections:commons-collections
- javax.xml:jaxrpc-api
+ jakarta.xml.rpc:jakarta.xml.rpc-api
external:jaxrpc-impl
com.sun.xml.rpc:jaxrpc-spi
org.json:json
@@ -75,7 +75,7 @@
org.codehaus.jackson:jackson-mapper-asl
org.codehaus.jackson:jackson-databind
external:jsr173_api
- javax.mail:mail
+ jakarta.mail:jakarta.mail-api
relaxngDatatype:relaxngDatatype
external:webservices-api
external:webservices-rt
@@ -99,7 +99,7 @@
lib
provided
- javax.servlet:servlet-api
+ jakarta.servlet:jakarta.servlet-api
diff --git a/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml b/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
index 03ce519262..2cd75f41d3 100644
--- a/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
+++ b/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
@@ -23,6 +23,7 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+* Portions Copyrighted 2023 Wren Security
-->
openam-ssoConfiguratorTools
@@ -42,7 +43,8 @@
com.google.inject:guice:jar:no_aop
org.wrensecurity.commons:wrensec-guice-core
org.wrensecurity.wrenam:openam-license-manager-cli
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject
+ jakarta.inject:jakarta.inject-api
+ jakarta.xml.bind:jakarta.xml.bind-api
org.slf4j:slf4j-api
org.slf4j:slf4j-nop
commons-lang:commons-lang
diff --git a/openam-entitlements/pom.xml b/openam-entitlements/pom.xml
index 4c3eb8f53a..712808ddd2 100755
--- a/openam-entitlements/pom.xml
+++ b/openam-entitlements/pom.xml
@@ -72,9 +72,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
@@ -88,13 +87,13 @@
- org.mockito
- mockito-core
+ org.easytesting
+ fest-assert
- org.easytesting
- fest-assert
+ org.mockito
+ mockito-core
diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/rest/XacmlServiceTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/rest/XacmlServiceTest.java
index b1a035244f..9fae057f3c 100644
--- a/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/rest/XacmlServiceTest.java
+++ b/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/rest/XacmlServiceTest.java
@@ -12,6 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2023 Wren Security
*/
package org.forgerock.openam.xacml.v3.rest;
@@ -230,7 +231,7 @@ public void testImportXACMLNoPolicies() throws Exception {
fail("Expect exception");
} catch (ResourceException e) {
assertThat(e.getStatus().getCode()).isEqualTo(BAD_REQUEST);
- assertThat(e.getMessage()).isEqualTo("No policies found in XACML document");
+ assertThat(e.getMessage()).startsWith("No policies found in XACML document");
}
}
@@ -251,7 +252,7 @@ public void testImportXACMLImportFailure() throws Exception {
fail("Expect exception");
} catch (ResourceException e) {
assertThat(e.getStatus().getCode()).isEqualTo(BAD_REQUEST);
- assertThat(e.getMessage()).isEqualTo("JSON Exception.");
+ assertThat(e.getMessage()).startsWith("JSON Exception.");
}
}
@@ -340,7 +341,7 @@ public void testExportXACMLEntitlementException() throws Exception {
fail("Expect exception");
} catch (ResourceException e) {
assertThat(e.getStatus().getCode()).isEqualTo(INTERNAL_ERROR);
- assertThat(e.getMessage()).isEqualTo("JSON Exception.");
+ assertThat(e.getMessage()).startsWith("JSON Exception.");
}
}
diff --git a/openam-examples/openam-example-clientsdk-cli/pom.xml b/openam-examples/openam-example-clientsdk-cli/pom.xml
index 4b4e45a426..b21425c287 100644
--- a/openam-examples/openam-example-clientsdk-cli/pom.xml
+++ b/openam-examples/openam-example-clientsdk-cli/pom.xml
@@ -65,9 +65,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-examples/openam-example-clientsdk-war/pom.xml b/openam-examples/openam-example-clientsdk-war/pom.xml
index b007fd5050..97e495217d 100644
--- a/openam-examples/openam-example-clientsdk-war/pom.xml
+++ b/openam-examples/openam-example-clientsdk-war/pom.xml
@@ -99,9 +99,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-federation/OpenFM/pom.xml b/openam-federation/OpenFM/pom.xml
index e2a88e5197..335517b2d2 100644
--- a/openam-federation/OpenFM/pom.xml
+++ b/openam-federation/OpenFM/pom.xml
@@ -145,9 +145,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-federation/openam-federation-library/pom.xml b/openam-federation/openam-federation-library/pom.xml
index c9cb226805..8c143f6073 100644
--- a/openam-federation/openam-federation-library/pom.xml
+++ b/openam-federation/openam-federation-library/pom.xml
@@ -190,6 +190,11 @@
testng
+
+ org.easytesting
+ fest-assert
+
+
org.apache.santuario
xmlsec
@@ -201,21 +206,20 @@
- javax.xml
- jaxrpc-api
+ jakarta.xml.rpc
+ jakarta.xml.rpc-api
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
com.sun.jersey
jersey-bundle
-
+
external
esapiport
@@ -225,18 +229,13 @@
com.sun.xml.rpc
jaxrpc-impl
-
+
org.wrensecurity.wrenam
openam-idpdiscovery
${project.version}
-
- org.easytesting
- fest-assert
-
-
com.google.inject
guice
diff --git a/openam-federation/openam-fedlet-unconfigured-war/pom.xml b/openam-federation/openam-fedlet-unconfigured-war/pom.xml
index f9aa10ad85..7827fdc097 100644
--- a/openam-federation/openam-fedlet-unconfigured-war/pom.xml
+++ b/openam-federation/openam-fedlet-unconfigured-war/pom.xml
@@ -228,8 +228,8 @@
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-federation/openam-idpdiscovery-war/pom.xml b/openam-federation/openam-idpdiscovery-war/pom.xml
index c372436c68..c2016e77f4 100644
--- a/openam-federation/openam-idpdiscovery-war/pom.xml
+++ b/openam-federation/openam-idpdiscovery-war/pom.xml
@@ -89,9 +89,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-federation/openam-idpdiscovery/pom.xml b/openam-federation/openam-idpdiscovery/pom.xml
index 64549fc350..4b8e981259 100644
--- a/openam-federation/openam-idpdiscovery/pom.xml
+++ b/openam-federation/openam-idpdiscovery/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-notifications-integration/pom.xml b/openam-notifications-integration/pom.xml
index 6ddcc9a738..3c6fbc579d 100644
--- a/openam-notifications-integration/pom.xml
+++ b/openam-notifications-integration/pom.xml
@@ -52,8 +52,8 @@
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-notifications-websocket/pom.xml b/openam-notifications-websocket/pom.xml
index 427c06dd58..f4481585b3 100644
--- a/openam-notifications-websocket/pom.xml
+++ b/openam-notifications-websocket/pom.xml
@@ -50,8 +50,8 @@
- javax.websocket
- javax.websocket-api
+ jakarta.websocket
+ jakarta.websocket-api
diff --git a/openam-notifications/pom.xml b/openam-notifications/pom.xml
index ea64848a58..157ee11acc 100644
--- a/openam-notifications/pom.xml
+++ b/openam-notifications/pom.xml
@@ -39,8 +39,8 @@
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.javax-inject
+ jakarta.inject
+ jakarta.inject-api
diff --git a/openam-oauth2-saml2/pom.xml b/openam-oauth2-saml2/pom.xml
index 87c32679d8..7d09c609ea 100644
--- a/openam-oauth2-saml2/pom.xml
+++ b/openam-oauth2-saml2/pom.xml
@@ -47,9 +47,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-oauth2/pom.xml b/openam-oauth2/pom.xml
index ecfdaa2f88..8aa28cb45e 100644
--- a/openam-oauth2/pom.xml
+++ b/openam-oauth2/pom.xml
@@ -56,9 +56,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
@@ -77,8 +76,8 @@
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.javax-inject
+ jakarta.inject
+ jakarta.inject-api
@@ -135,6 +134,7 @@
org.restlet.jee
org.restlet.ext.freemarker
+
org.freemarker
@@ -154,11 +154,6 @@
${project.version}
-
- org.easytesting
- fest-assert
-
-
org.mockito
mockito-core
@@ -200,8 +195,14 @@
- javassist
+ org.javassist
javassist
+ test
+
+
+
+ org.easytesting
+ fest-assert
diff --git a/openam-plugins/openam-auth-postauthentication/pom.xml b/openam-plugins/openam-auth-postauthentication/pom.xml
index 01edfe2341..c8bbb79412 100644
--- a/openam-plugins/openam-auth-postauthentication/pom.xml
+++ b/openam-plugins/openam-auth-postauthentication/pom.xml
@@ -36,9 +36,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-push-notification/pom.xml b/openam-push-notification/pom.xml
index a50dd1932d..b8249021bd 100644
--- a/openam-push-notification/pom.xml
+++ b/openam-push-notification/pom.xml
@@ -64,8 +64,8 @@
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
test
diff --git a/openam-radius/openam-radius-server/pom.xml b/openam-radius/openam-radius-server/pom.xml
index 93b849e9ca..2ba6fe54d3 100644
--- a/openam-radius/openam-radius-server/pom.xml
+++ b/openam-radius/openam-radius-server/pom.xml
@@ -46,15 +46,14 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
org.wrensecurity.commons.guava
wrensec-guava-eventbus
-
+
@@ -105,7 +104,7 @@
-
+
diff --git a/openam-rest/pom.xml b/openam-rest/pom.xml
index d796a63ce9..7600c75674 100755
--- a/openam-rest/pom.xml
+++ b/openam-rest/pom.xml
@@ -31,9 +31,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
@@ -149,20 +148,20 @@
fest-assert
-
- org.easymock
- easymock
-
+
+
+
+
-
- httpunit
- httpunit
-
+
+
+
+
-
- org.mortbay.jetty
- jetty-servlet-tester
-
+
+
+
+
org.wrensecurity.wrenam
@@ -171,8 +170,8 @@
- javax.ws.rs
- jsr311-api
+ jakarta.inject
+ jakarta.inject-api
diff --git a/openam-restlet/pom.xml b/openam-restlet/pom.xml
index 67a00d26a7..f81b2ac4a1 100755
--- a/openam-restlet/pom.xml
+++ b/openam-restlet/pom.xml
@@ -32,9 +32,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
@@ -111,20 +110,20 @@
fest-assert
-
- org.easymock
- easymock
-
+
+
+
+
-
- httpunit
- httpunit
-
+
+
+
+
-
- org.mortbay.jetty
- jetty-servlet-tester
-
+
+
+
+
org.wrensecurity.wrenam
@@ -133,8 +132,8 @@
- javax.ws.rs
- jsr311-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
diff --git a/openam-samples/custom-authentication-module/pom.xml b/openam-samples/custom-authentication-module/pom.xml
index 3eba99a5e0..5171277b68 100644
--- a/openam-samples/custom-authentication-module/pom.xml
+++ b/openam-samples/custom-authentication-module/pom.xml
@@ -35,16 +35,16 @@
openam-core
${openam.version}
+
org.wrensecurity.wrenam
openam-shared
${openam.version}
+
- javax.servlet
- servlet-api
- 2.5
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-schema/openam-idsvcs-schema/pom.xml b/openam-schema/openam-idsvcs-schema/pom.xml
index 035556a373..493d9bf122 100644
--- a/openam-schema/openam-idsvcs-schema/pom.xml
+++ b/openam-schema/openam-idsvcs-schema/pom.xml
@@ -103,26 +103,6 @@
-
- javax.xml.bind
- jaxb-api
-
-
-
- com.sun.xml.bind
- jaxb1-impl
-
-
-
- javax.xml
- jaxrpc-api
-
-
-
- jakarta.xml.soap
- jakarta.xml.soap-api
-
-
com.sun.xml.rpc
jaxrpc-spi
@@ -135,7 +115,7 @@
com.sun.mail
- javax.mail
+ jakarta.mail
diff --git a/openam-schema/openam-jaxrpc-schema/pom.xml b/openam-schema/openam-jaxrpc-schema/pom.xml
index a761ee3da1..252c7666ae 100644
--- a/openam-schema/openam-jaxrpc-schema/pom.xml
+++ b/openam-schema/openam-jaxrpc-schema/pom.xml
@@ -108,9 +108,8 @@
- org.wrensecurity.wrenam
- openam-federation-library
- ${project.version}
+ com.sun.xml.rpc
+ jaxrpc-impl
@@ -119,23 +118,9 @@
- javax.xml.bind
- jaxb-api
-
-
-
- com.sun.xml.bind
- jaxb1-impl
-
-
-
- javax.xml
- jaxrpc-api
-
-
-
- com.sun.xml.rpc
- jaxrpc-impl
+ org.wrensecurity.wrenam
+ openam-federation-library
+ ${project.version}
diff --git a/openam-schema/openam-liberty-schema/pom.xml b/openam-schema/openam-liberty-schema/pom.xml
index 76ea6a7cd1..06a3d89636 100644
--- a/openam-schema/openam-liberty-schema/pom.xml
+++ b/openam-schema/openam-liberty-schema/pom.xml
@@ -29,70 +29,88 @@
Wren:AM - Liberty Schema
Wren:AM Liberty Schema Components
-
-
-
-
-
+
+
+
+
+
-
-
-
- org.wrensecurity.wrenam
- openam-shared
-
+
+
+
+
+
+
+
-
- javax.xml.bind
- jaxb-api
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
com.sun.xml.bind
- jaxb1-impl
+ jaxb-impl
com.sun.xml.bind
- jaxb-impl
+ jaxb1-impl
com.sun.msv.datatype.xsd
xsdlib
+
+
+ org.wrensecurity.wrenam
+ openam-shared
+
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/xml/bind/Messages.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/xml/bind/Messages.java
new file mode 100644
index 0000000000..54e86b7161
--- /dev/null
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/xml/bind/Messages.java
@@ -0,0 +1,124 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.bind;
+
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+/**
+ * Formats error messages.
+ *
+ * @since 1.0
+ */
+// Wren:AM This is a monkey patch for generated classes that use this jaxb1-impl class
+// whilst there is private enum with the same coordinates in jaxb-impl.
+public class Messages
+{
+ public static String format( String property ) {
+ return format( property, null );
+ }
+
+ public static String format( String property, Object arg1 ) {
+ return format( property, new Object[]{arg1} );
+ }
+
+ public static String format( String property, Object arg1, Object arg2 ) {
+ return format( property, new Object[]{arg1,arg2} );
+ }
+
+ public static String format( String property, Object arg1, Object arg2, Object arg3 ) {
+ return format( property, new Object[]{arg1,arg2,arg3} );
+ }
+
+ // add more if necessary.
+
+ /** Loads a string resource and formats it with specified arguments. */
+ public static String format( String property, Object[] args ) {
+ String text = ResourceBundle.getBundle(Messages.class.getName()).getString(property);
+ return MessageFormat.format(text,args);
+ }
+
+//
+//
+// Message resources
+//
+//
+ public static final String CI_NOT_NULL= // 0 args
+ "DefaultJAXBContextImpl.CINotNull";
+
+ public static final String CI_CI_NOT_NULL = // 0 args
+ "DefaultJAXBContextImpl.CICINotNull";
+
+ public static final String NO_BGM = // 1 arg
+ "GrammarInfo.NoBGM";
+
+ public static final String UNABLE_TO_READ_BGM = // 0 args
+ "GrammarInfo.UnableToReadBGM";
+
+ public static final String COLLISION_DETECTED = // 2 args
+ "GrammarInfoFacade.CollisionDetected";
+
+ public static final String INCOMPATIBLE_VERSION = // 3 args
+ "GrammarInfoFacade.IncompatibleVersion";
+
+ public static final String MISSING_INTERFACE = // 1 arg
+ "ImplementationRegistry.MissingInterface";
+
+ public static final String BUILD_ID = // 0 args
+ "DefaultJAXBContextImpl.buildID";
+
+ public static final String INCORRECT_VERSION =
+ "ContextFactory.IncorrectVersion";
+
+ public static final String ERR_TYPE_MISMATCH = // arg:3 since JAXB 1.0.3
+ "Util.TypeMismatch";
+
+/*
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ */
+}
diff --git a/openam-schema/openam-mib-schema/pom.xml b/openam-schema/openam-mib-schema/pom.xml
index d43fd4c8ba..a2c0ff2d26 100644
--- a/openam-schema/openam-mib-schema/pom.xml
+++ b/openam-schema/openam-mib-schema/pom.xml
@@ -132,13 +132,13 @@
- org.wrensecurity.wrenam
- openam-shared
+ external
+ jdmkrt
- external
- jdmkrt
+ org.wrensecurity.wrenam
+ openam-shared
diff --git a/openam-schema/openam-saml2-schema/pom.xml b/openam-schema/openam-saml2-schema/pom.xml
index a2af17af5e..7ad6a593fa 100644
--- a/openam-schema/openam-saml2-schema/pom.xml
+++ b/openam-schema/openam-saml2-schema/pom.xml
@@ -29,48 +29,45 @@
Wren:AM - SAML2 Schema
Wren:AM SAML2 Schema Components
-
-
-
-
-
-
-
-
- org.wrensecurity.wrenam
- openam-shared
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- javax.xml.bind
- jaxb-api
+ com.sun.xml.bind
+ jaxb-impl
@@ -79,8 +76,8 @@
- com.sun.xml.bind
- jaxb-impl
+ org.wrensecurity.wrenam
+ openam-shared
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/xml/bind/Messages.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/xml/bind/Messages.java
new file mode 100644
index 0000000000..54e86b7161
--- /dev/null
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/xml/bind/Messages.java
@@ -0,0 +1,124 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.bind;
+
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+/**
+ * Formats error messages.
+ *
+ * @since 1.0
+ */
+// Wren:AM This is a monkey patch for generated classes that use this jaxb1-impl class
+// whilst there is private enum with the same coordinates in jaxb-impl.
+public class Messages
+{
+ public static String format( String property ) {
+ return format( property, null );
+ }
+
+ public static String format( String property, Object arg1 ) {
+ return format( property, new Object[]{arg1} );
+ }
+
+ public static String format( String property, Object arg1, Object arg2 ) {
+ return format( property, new Object[]{arg1,arg2} );
+ }
+
+ public static String format( String property, Object arg1, Object arg2, Object arg3 ) {
+ return format( property, new Object[]{arg1,arg2,arg3} );
+ }
+
+ // add more if necessary.
+
+ /** Loads a string resource and formats it with specified arguments. */
+ public static String format( String property, Object[] args ) {
+ String text = ResourceBundle.getBundle(Messages.class.getName()).getString(property);
+ return MessageFormat.format(text,args);
+ }
+
+//
+//
+// Message resources
+//
+//
+ public static final String CI_NOT_NULL= // 0 args
+ "DefaultJAXBContextImpl.CINotNull";
+
+ public static final String CI_CI_NOT_NULL = // 0 args
+ "DefaultJAXBContextImpl.CICINotNull";
+
+ public static final String NO_BGM = // 1 arg
+ "GrammarInfo.NoBGM";
+
+ public static final String UNABLE_TO_READ_BGM = // 0 args
+ "GrammarInfo.UnableToReadBGM";
+
+ public static final String COLLISION_DETECTED = // 2 args
+ "GrammarInfoFacade.CollisionDetected";
+
+ public static final String INCOMPATIBLE_VERSION = // 3 args
+ "GrammarInfoFacade.IncompatibleVersion";
+
+ public static final String MISSING_INTERFACE = // 1 arg
+ "ImplementationRegistry.MissingInterface";
+
+ public static final String BUILD_ID = // 0 args
+ "DefaultJAXBContextImpl.buildID";
+
+ public static final String INCORRECT_VERSION =
+ "ContextFactory.IncorrectVersion";
+
+ public static final String ERR_TYPE_MISMATCH = // arg:3 since JAXB 1.0.3
+ "Util.TypeMismatch";
+
+/*
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ */
+}
diff --git a/openam-schema/openam-wsfederation-schema/pom.xml b/openam-schema/openam-wsfederation-schema/pom.xml
index 276ff9b3e9..42b8bde110 100644
--- a/openam-schema/openam-wsfederation-schema/pom.xml
+++ b/openam-schema/openam-wsfederation-schema/pom.xml
@@ -29,38 +29,32 @@
Wren:AM - WS Federation Schema
Wren:AM Schemata Components
-
-
-
-
-
+
+
+
+
+
-
-
-
- org.wrensecurity.wrenam
- openam-shared
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- javax.xml.bind
- jaxb-api
+ com.sun.xml.bind
+ jaxb-impl
@@ -69,8 +63,8 @@
- com.sun.xml.bind
- jaxb-impl
+ org.wrensecurity.wrenam
+ openam-shared
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/xml/bind/Messages.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/xml/bind/Messages.java
new file mode 100644
index 0000000000..54e86b7161
--- /dev/null
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/xml/bind/Messages.java
@@ -0,0 +1,124 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.bind;
+
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+/**
+ * Formats error messages.
+ *
+ * @since 1.0
+ */
+// Wren:AM This is a monkey patch for generated classes that use this jaxb1-impl class
+// whilst there is private enum with the same coordinates in jaxb-impl.
+public class Messages
+{
+ public static String format( String property ) {
+ return format( property, null );
+ }
+
+ public static String format( String property, Object arg1 ) {
+ return format( property, new Object[]{arg1} );
+ }
+
+ public static String format( String property, Object arg1, Object arg2 ) {
+ return format( property, new Object[]{arg1,arg2} );
+ }
+
+ public static String format( String property, Object arg1, Object arg2, Object arg3 ) {
+ return format( property, new Object[]{arg1,arg2,arg3} );
+ }
+
+ // add more if necessary.
+
+ /** Loads a string resource and formats it with specified arguments. */
+ public static String format( String property, Object[] args ) {
+ String text = ResourceBundle.getBundle(Messages.class.getName()).getString(property);
+ return MessageFormat.format(text,args);
+ }
+
+//
+//
+// Message resources
+//
+//
+ public static final String CI_NOT_NULL= // 0 args
+ "DefaultJAXBContextImpl.CINotNull";
+
+ public static final String CI_CI_NOT_NULL = // 0 args
+ "DefaultJAXBContextImpl.CICINotNull";
+
+ public static final String NO_BGM = // 1 arg
+ "GrammarInfo.NoBGM";
+
+ public static final String UNABLE_TO_READ_BGM = // 0 args
+ "GrammarInfo.UnableToReadBGM";
+
+ public static final String COLLISION_DETECTED = // 2 args
+ "GrammarInfoFacade.CollisionDetected";
+
+ public static final String INCOMPATIBLE_VERSION = // 3 args
+ "GrammarInfoFacade.IncompatibleVersion";
+
+ public static final String MISSING_INTERFACE = // 1 arg
+ "ImplementationRegistry.MissingInterface";
+
+ public static final String BUILD_ID = // 0 args
+ "DefaultJAXBContextImpl.buildID";
+
+ public static final String INCORRECT_VERSION =
+ "ContextFactory.IncorrectVersion";
+
+ public static final String ERR_TYPE_MISMATCH = // arg:3 since JAXB 1.0.3
+ "Util.TypeMismatch";
+
+/*
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ static final String = // arg
+ "";
+ */
+}
diff --git a/openam-schema/openam-wsfederation-schema/src/main/xml/catalog.xml b/openam-schema/openam-wsfederation-schema/src/main/xml/catalog.xml
new file mode 100644
index 0000000000..debef5934b
--- /dev/null
+++ b/openam-schema/openam-wsfederation-schema/src/main/xml/catalog.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/openam-schema/openam-xacml3-schema/pom.xml b/openam-schema/openam-xacml3-schema/pom.xml
index b75ea10858..da9a2760c0 100644
--- a/openam-schema/openam-xacml3-schema/pom.xml
+++ b/openam-schema/openam-xacml3-schema/pom.xml
@@ -31,8 +31,8 @@
- javax.xml.bind
- jaxb-api
+ jakarta.xml.bind
+ jakarta.xml.bind-api
diff --git a/openam-scripting/pom.xml b/openam-scripting/pom.xml
index 31d2852ca6..6ce78c6b8c 100644
--- a/openam-scripting/pom.xml
+++ b/openam-scripting/pom.xml
@@ -103,20 +103,19 @@
- org.mockito
- mockito-core
- test
+ org.easytesting
+ fest-assert
- org.easytesting
- fest-assert
+ org.mockito
+ mockito-core
test
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
test
diff --git a/openam-selfservice/pom.xml b/openam-selfservice/pom.xml
index a6c0633c33..e29a25882f 100644
--- a/openam-selfservice/pom.xml
+++ b/openam-selfservice/pom.xml
@@ -80,9 +80,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-server-auth-ui/pom.xml b/openam-server-auth-ui/pom.xml
index 8ebdaf02be..73071d80a2 100755
--- a/openam-server-auth-ui/pom.xml
+++ b/openam-server-auth-ui/pom.xml
@@ -42,14 +42,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.servlet.jsp
- jsp-api
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml
index 992fa77131..b4ef803c9e 100644
--- a/openam-server-only/pom.xml
+++ b/openam-server-only/pom.xml
@@ -176,14 +176,6 @@
maven-war-plugin
-
- WEB-INF/lib/jersey-core-1.1.5.2.jar,
- WEB-INF/lib/jaxb-api-1.0.6.jar,
- WEB-INF/lib/jaxb-libs-1.0.6.jar,
- WEB-INF/lib/jaxb-xjc-1.0.6.jar,
- WEB-INF/lib/jaxp-api-1.4.2.jar,
-
-
Wren:AM Server
@@ -1015,14 +1007,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.servlet.jsp
- jsp-api
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
diff --git a/openam-shared/pom.xml b/openam-shared/pom.xml
index 09bbe9fa87..fa83abfccc 100755
--- a/openam-shared/pom.xml
+++ b/openam-shared/pom.xml
@@ -56,14 +56,18 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.xml.bind
- jaxb-api
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+
+
+
+ jakarta.validation
+ jakarta.validation-api
@@ -74,13 +78,6 @@
org.wrensecurity.commons
json-resource-http
-
-
-
- com.sun.xml.bind
- jaxb-osgi
-
-
diff --git a/openam-sts/openam-common-sts/pom.xml b/openam-sts/openam-common-sts/pom.xml
index fc4e04325a..01f0dd8277 100644
--- a/openam-sts/openam-common-sts/pom.xml
+++ b/openam-sts/openam-common-sts/pom.xml
@@ -63,14 +63,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.ws.rs
- jsr311-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
diff --git a/openam-sts/openam-publish-sts/pom.xml b/openam-sts/openam-publish-sts/pom.xml
index f92d8b696b..a7290dbdb1 100644
--- a/openam-sts/openam-publish-sts/pom.xml
+++ b/openam-sts/openam-publish-sts/pom.xml
@@ -80,14 +80,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.ws.rs
- jsr311-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
diff --git a/openam-sts/openam-rest-sts/pom.xml b/openam-sts/openam-rest-sts/pom.xml
index d1ba418335..5d9e9b3054 100644
--- a/openam-sts/openam-rest-sts/pom.xml
+++ b/openam-sts/openam-rest-sts/pom.xml
@@ -80,14 +80,13 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.ws.rs
- jsr311-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml b/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml
index 739a823321..f899b67a0a 100644
--- a/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml
+++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml
@@ -80,6 +80,7 @@
org.apache.cxf
cxf-rt-frontend-jaxws
${cxf.version}
+
org.apache.geronimo.genesis
diff --git a/openam-sts/openam-token-service-sts/pom.xml b/openam-sts/openam-token-service-sts/pom.xml
index ed9f8e51b3..1d2c04c52b 100644
--- a/openam-sts/openam-token-service-sts/pom.xml
+++ b/openam-sts/openam-token-service-sts/pom.xml
@@ -85,9 +85,8 @@
Necessary because SSOTokenManager is referenced?
-->
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-test/pom.xml b/openam-test/pom.xml
index a09098ada6..c9e598137c 100755
--- a/openam-test/pom.xml
+++ b/openam-test/pom.xml
@@ -75,9 +75,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-tokens/pom.xml b/openam-tokens/pom.xml
index 49dbde5020..617bdd2e74 100644
--- a/openam-tokens/pom.xml
+++ b/openam-tokens/pom.xml
@@ -50,8 +50,8 @@
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.javax-inject
+ jakarta.inject
+ jakarta.inject-api
diff --git a/openam-tools/build-helper-plugin/pom.xml b/openam-tools/build-helper-plugin/pom.xml
index 22668237ac..654e686c2e 100644
--- a/openam-tools/build-helper-plugin/pom.xml
+++ b/openam-tools/build-helper-plugin/pom.xml
@@ -68,14 +68,13 @@
- org.apache.maven.plugin-tools
- maven-plugin-annotations
+ org.apache.maven
+ maven-core
- org.wrensecurity.wrenam
- openam-cli-definitions
- ${project.version}
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
@@ -84,13 +83,14 @@
- org.apache.maven
- maven-project
+ commons-lang
+ commons-lang
- commons-lang
- commons-lang
+ org.wrensecurity.wrenam
+ openam-cli-definitions
+ ${project.version}
diff --git a/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java b/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java
index 6a51bae576..a04f64dc73 100644
--- a/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java
+++ b/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java
@@ -68,7 +68,7 @@ public class CLIDefinitionGenerator extends AbstractMojo {
@Parameter(required = true)
private String outputDir;
- @Parameter(defaultValue = "${project}",required = true, readonly = true)
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
protected MavenProject project = new MavenProject();
@Override
diff --git a/openam-tools/openam-configurator-tool/pom.xml b/openam-tools/openam-configurator-tool/pom.xml
index e2a7b954f2..ac88491c0b 100644
--- a/openam-tools/openam-configurator-tool/pom.xml
+++ b/openam-tools/openam-configurator-tool/pom.xml
@@ -99,8 +99,8 @@
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.javax-inject
+ jakarta.inject
+ jakarta.inject-api
diff --git a/openam-tools/openam-license-servlet/pom.xml b/openam-tools/openam-license-servlet/pom.xml
index 942f4a63bb..29308d47d0 100644
--- a/openam-tools/openam-license-servlet/pom.xml
+++ b/openam-tools/openam-license-servlet/pom.xml
@@ -41,9 +41,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
diff --git a/openam-tools/openam-upgrade-tool/pom.xml b/openam-tools/openam-upgrade-tool/pom.xml
index b7a43adf10..737f31910b 100644
--- a/openam-tools/openam-upgrade-tool/pom.xml
+++ b/openam-tools/openam-upgrade-tool/pom.xml
@@ -99,8 +99,8 @@
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.javax-inject
+ jakarta.inject
+ jakarta.inject-api
diff --git a/openam-uma/pom.xml b/openam-uma/pom.xml
index fdd760e73b..cd10cf7ee3 100755
--- a/openam-uma/pom.xml
+++ b/openam-uma/pom.xml
@@ -72,9 +72,8 @@
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
@@ -99,6 +98,7 @@
org.wrensecurity.commons
json-resource
test-jar
+ test
diff --git a/openam-upgrade/pom.xml b/openam-upgrade/pom.xml
index 635753dbbe..da6df85d47 100644
--- a/openam-upgrade/pom.xml
+++ b/openam-upgrade/pom.xml
@@ -79,24 +79,18 @@
- javax.servlet
- jstl
+ jakarta.servlet.jsp.jstl
+ jakarta.servlet.jsp.jstl-api
- javax.servlet
- javax.servlet-api
- provided
+ jakarta.servlet
+ jakarta.servlet-api
- javax.servlet.jsp
- jsp-api
-
-
-
- org.easytesting
- fest-assert
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
@@ -106,6 +100,11 @@
test-jar
test
+
+
+ org.easytesting
+ fest-assert
+
@@ -140,6 +139,7 @@
org.wrensecurity.wrenam
openam-build-tools
${project.version}
+
diff --git a/pom.xml b/pom.xml
index e7a2a0d358..033813a7b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
- 1.7.7
+ 1.7.8
1.2.0
@@ -145,65 +145,90 @@
18.0.5
22.1.2
+
5.5.0
+
+
1.0b3
- 3.0
- 2.3.4
- 1.7.21
- 3.0.2
- 2.3.0
- 1.8.3
- 1.6
+
+
+ 1.9.4
+ 1.16.0
3.2.2
2.1
1.5
- 2.3
+ 2.13.0
2.6
- 1.1.3
+ 1.2
1.1
- 2013-12-04
- 2.0.0
+ 2.3.32
+ 3.0
+ 2.15.2
+ 1.2.2
+ 1.3.5
+ 1.1.3
+ 1.0.5
+ 1.6.7
+ 1.6.7
+ 4.0.4
+ 2.3.6
+ 1.2.7
+ 2.0.2
+ 1.1.2
+ 2.1.5
+ 1.1.4
+ 2.3.3
+ 1.4.2
+ 2.3.3
+ 0.17
+ 3.29.1-GA
+ 2.4.3
+ 1.7.36
+ 2.2
+
+
+ 1.2.18
+ 2.3.8
+ 2.2.5-1
+ 1.1.6
+ 1.1.6
+ 1.19.1
+ 1.19.4
+ 1.5.3
+ 2.3.3
+
+
+ 2.4.1
+ 2.2.220
+
+
+ 9.4.0.M0
+
+
2.4.6
1.6
- 2.3.1
- 2.3.7
- 2.2.5-1
- 1.1
- 1.1.4_01-wren1
- 1.1.4_01-wren1
- 1.1.1-ea
- 2005-05-04
- 2008-08-08
- 1.1.1
- 1.1.2
+ 1.7.14
+
+
+ 5.18.2
+ 1.10.72
+ 2.5.10
+ 2.0.0
+ 20090211
1.5.1
- 1.1.5.2
- 20020414
- 1.7R4
- 1.3.4
- 1.3.19
- 2.1
- 20060615
+
+
2005-08-12
+ 2008-08-08
+ 2.3.0
+ 2013-12-04
2006-26-09
+ 2005-05-04
2007-01-10
2004-30-01
- 3.1
- 2.3.19
- 0.14
- 20090211
- 2.4.1
- 2.2.220
- 5.18.2
- 1_2
- 1.2.13
- 9.4.0.M0
- 1.10.72
- 1.1
- 1.3.5
- 1.4.2
- 2.3.3
- 2.0
+ 20020414
+ 20060615
+ 1.4
@@ -258,6 +283,8 @@
+
+
org.wrensecurity.commons
commons-bom
@@ -267,12 +294,178 @@
- org.mockito
- mockito-core
- ${mockito.version}
- test
+ com.fasterxml.jackson
+ jackson-bom
+ ${jackson.version}
+ import
+ pom
+
+
+
+
+
+ org.wrensecurity.commons
+ api-descriptor
+ ${wrensec-commons.version}
+
+
+
+
+ com.sun.xml.bind
+ jaxb-osgi
+
+
+
+ javax.validation
+ validation-api
+
+
+
+
+
+ org.wrensecurity.commons
+ forgerock-audit-core
+ ${wrensec-commons.version}
+
+
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.javax-inject
+
+
+
+
+
+ org.wrensecurity.commons
+ forgerock-audit-json
+ ${wrensec-commons.version}
+
+
+
+
+ javax.validation
+ validation-api
+
+
+
+
+
+ org.wrensecurity.commons
+ forgerock-audit-handler-elasticsearch
+ ${wrensec-commons.version}
+
+
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.javax-inject
+
+
+
+
+
+ org.wrensecurity.commons
+ forgerock-audit-handler-json
+ ${wrensec-commons.version}
+
+
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.javax-inject
+
+
+
+
+
+ org.wrensecurity.commons
+ forgerock-selfservice-core
+ ${wrensec-commons.version}
+
+
+
+
+ com.sun.xml.bind
+ jaxb-osgi
+
+
+
+ org.apache.servicemix.bundles
+ org.apache.servicemix.bundles.javax-inject
+
+
+
+
+
+ org.wrensecurity.commons
+ json-resource
+ ${wrensec-commons.version}
+
+
+
+
+ com.sun.xml.bind
+ jaxb-osgi
+
+
+
+
+
+ org.wrensecurity.commons
+ json-resource-http
+ ${wrensec-commons.version}
+
+
+
+
+ com.sun.mail
+ javax.mail
+
+
+
+ com.sun.xml.bind
+ jaxb-osgi
+
+
+
+
+
+
+ org.wrensecurity.commons
+ json-resource-http
+ ${wrensec-commons.version}
+
+
+
+
+ com.sun.mail
+ javax.mail
+
+
+
+ com.sun.xml.bind
+ jaxb-osgi
+
+
+
+
+
+ org.wrensecurity.commons
+ json-web-token
+ ${wrensec-commons.version}
+
+
+
+
+ com.sun.xml.bind
+ jaxb-osgi
+
+
+
+
org.wrensecurity.wrenam
openam-audit-context
@@ -346,180 +539,133 @@
- org.apache.click
- click-extras
- ${click.version}
+ org.wrensecurity.wrenam
+ openam-test-utils
+ ${project.version}
+ test
- org.apache.click
- click-nodeps
- ${click.version}
+ org.wrensecurity.wrenam
+ openam-time-travel
+ ${project.version}
+ test
+
+
+
- commons-beanutils
- commons-beanutils
- ${commons-beanutils.version}
+ com.amazonaws
+ aws-java-sdk-sns
+ ${amazon.sns.version}
+
+
+
+ org.apache.httpcomponents
+ httpcore
+
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+
- commons-codec
- commons-codec
- ${commons-codec.version}
+ com.googlecode.java-ipv6
+ java-ipv6
+ ${java-ipv6.version}
+
- commons-collections
- commons-collections
- ${commons-collections.version}
+ com.h2database
+ h2
+ ${h2database.version}
+
- commons-digester
- commons-digester
- ${commons-digester.version}
+ com.maxmind.geoip2
+ geoip2
+ ${geoip.version}
+
+
+
+ org.apache.httpcomponents
+ httpcore
+
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
- commons-fileupload
- commons-fileupload
- ${commons-fileupload.version}
+ com.sun.jersey
+ jersey-bundle
+ ${jersey-bundle.version}
+
+
+
+
+ javax.ws.rs
+ jsr311-api
+
+
- commons-io
- commons-io
- ${commons-io.version}
+ com.sun.jersey.contribs.jersey-oauth
+ oauth-client
+ ${jersey-oauth.version}
- commons-lang
- commons-lang
- ${commons-lang.version}
+ com.sun.jersey.contribs.jersey-oauth
+ oauth-server
+ ${jersey-oauth.version}
- commons-logging
- commons-logging
- ${commons-logging.version}
+ com.sun.jersey.contribs.jersey-oauth
+ oauth-signature
+ ${jersey-oauth.version}
- commons-logging
- commons-logging-api
- ${commons-logging-api.version}
-
-
-
- org.mozilla
- rhino
- ${rhino.version}
-
-
-
- org.codehaus.groovy
- groovy-jsr223
- ${groovy.version}
-
-
-
- org.codehaus.groovy
- groovy-json
- ${groovy.version}
-
-
-
-
-
- org.kohsuke
- groovy-sandbox
- ${groovy-sandbox.version}
-
-
-
- org.codehaus.groovy
- groovy
-
-
-
-
-
-
- external
- esapiport
- ${esapiport.version}
-
-
-
-
-
- com.maxmind.geoip2
- geoip2
- ${geoip.version}
-
-
- org.apache.httpcomponents
- httpcore
-
-
- org.apache.httpcomponents
- httpclient
-
-
-
-
-
- com.amazonaws
- aws-java-sdk-sns
- ${amazon.sns.version}
-
-
- org.apache.httpcomponents
- httpcore
-
-
- org.apache.httpcomponents
- httpclient
-
-
-
-
-
- javax.websocket
- javax.websocket-api
- ${javax.websocket-api.version}
- provided
-
-
-
- javax.xml.bind
- jaxb-api
- ${jaxb-api.version}
+ com.sun.mail
+ jakarta.mail
+ ${jakarta.mail-impl.version}
com.sun.xml.bind
jaxb1-impl
- ${jaxb1.version}
+ ${jaxb1-impl.version}
com.sun.xml.bind
jaxb-impl
- ${jaxb.version}
+ ${jaxb-impl.version}
- javax.xml
- jaxrpc-api
- ${jaxrpc-api.version}
+ com.sun.xml.fastinfoset
+ FastInfoset
+ ${fastinfoset.version}
+
+
+
+ com.sun.xml.messaging.saaj
+ saaj-impl
+ ${saaj-impl.version}
@@ -535,406 +681,466 @@
- jakarta.annotation
- jakarta.annotation-api
- ${jakarta.annotation-api.version}
+ com.zaxxer
+ HikariCP
+ ${hikaricp.version}
- jakarta.xml.soap
- jakarta.xml.soap-api
- ${jakarta.xml.soap-api.version}
+ commons-beanutils
+ commons-beanutils
+ ${commons-beanutils.version}
- jakarta.xml.ws
- jakarta.xml.ws-api
- ${jakarta.xml.ws-api.version}
+ commons-codec
+ commons-codec
+ ${commons-codec.version}
- com.sun.jersey
- jersey-bundle
- ${jersey-bundle.version}
+ commons-collections
+ commons-collections
+ ${commons-collections.version}
- com.iplanet.jato
- jato
- ${jato.version}
+ commons-digester
+ commons-digester
+ ${commons-digester.version}
- com.sun.web.ui
- cc
- ${cc-ui.version}
+ commons-fileupload
+ commons-fileupload
+ ${commons-fileupload.version}
- com.sun.web.ui
- cc_de
- ${cc-ui.version}
- runtime
+ commons-io
+ commons-io
+ ${commons-io.version}
- com.sun.web.ui
- cc_es
- ${cc-ui.version}
- runtime
+ commons-lang
+ commons-lang
+ ${commons-lang.version}
- com.sun.web.ui
- cc_fr
- ${cc-ui.version}
- runtime
+ commons-logging
+ commons-logging
+ ${commons-logging.version}
- com.sun.web.ui
- cc_it
- ${cc-ui.version}
- runtime
+ commons-logging
+ commons-logging-api
+ ${commons-logging-api.version}
- com.sun.web.ui
- cc_ja
- ${cc-ui.version}
- runtime
+ jakarta.activation
+ jakarta.activation-api
+ ${jakarta.activation-api.version}
- com.sun.web.ui
- cc_ko
- ${cc-ui.version}
- runtime
+ jakarta.annotation
+ jakarta.annotation-api
+ ${jakarta.annotation-api.version}
- com.sun.web.ui
- cc_sv
- ${cc-ui.version}
- runtime
+ jakarta.inject
+ jakarta.inject-api
+ ${jakarta.inject-api.version}
- com.sun.web.ui
- cc_zh
- ${cc-ui.version}
- runtime
+ jakarta.mail
+ jakarta.mail-api
+ ${jakarta.mail-api.version}
- com.sun.web.ui
- cc_zh_CN
- ${cc-ui.version}
- runtime
+ jakarta.security.auth.message
+ jakarta.security.auth.message-api
+ ${jakarta.security.message-api.version}
- com.sun.web.ui
- cc_zh_HK
- ${cc-ui.version}
- runtime
+ jakarta.servlet
+ jakarta.servlet-api
+ ${jakarta.servlet-api.version}
+ provided
- com.sun.web.ui
- cc_zh_TW
- ${cc-ui.version}
- runtime
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
+ ${jakarta.servlet.jsp-api.version}
+ provided
- javax.ws.rs
- jsr311-api
- ${jsr311-api.version}
+ jakarta.servlet.jsp.jstl
+ jakarta.servlet.jsp.jstl-api
+ ${jakarta.servlet.jstl-api.version}
- javax.servlet
- jstl
- ${jstl.version}
+ jakarta.validation
+ jakarta.validation-api
+ ${jakarta.validation-api.version}
- org.slf4j
- slf4j-nop
- ${slf4j.version}
- provided
+ jakarta.websocket
+ jakarta.websocket-api
+ ${jakarta.websocket-api.version}
- com.sun.mail
- javax.mail
- ${mail.version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api.version}
- com.sun.jersey.contribs.jersey-oauth
- oauth-client
- ${jersey-oauth.version}
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${jakarta.xml.bind-api.version}
- com.sun.jersey.contribs.jersey-oauth
- oauth-server
- ${jersey-oauth.version}
+ jakarta.xml.rpc
+ jakarta.xml.rpc-api
+ ${jakarta.xml.rpc-api.version}
- com.sun.jersey.contribs.jersey-oauth
- oauth-signature
- ${jersey-oauth.version}
+ jakarta.xml.soap
+ jakarta.xml.soap-api
+ ${jakarta.xml.soap-api.version}
- relaxngDatatype
- relaxngDatatype
- ${relaxngDatatype.version}
+ jakarta.xml.ws
+ jakarta.xml.ws-api
+ ${jakarta.xml.ws-api.version}
- javax.xml.soap
- saaj-api
- ${saaj-api.version}
+ org.apache.activemq
+ activemq-client
+ ${activemq.version}
+ test
- com.sun.xml.messaging.saaj
- saaj-impl
- ${saaj-impl.version}
+
+ org.hdrhistogram
+ HdrHistogram
+ 2.1.9
+ test
- com.sun.xml.fastinfoset
- FastInfoset
- ${fastinfoset.version}
+ org.apache.santuario
+ xmlsec
+ ${xmlsec.version}
+
- javax.servlet.jsp
- jsp-api
- ${jsp-api.version}
- provided
-
+ org.asciidoctor
+ asciidoctorj
+ ${asciidoctorj.version}
-
- com.sun.msv.datatype.xsd
- xsdlib
- ${xsdlib.version}
+
+
+ com.beust
+ jcommander
+
+
- org.wrensecurity.wrends
- opendj-core
- ${wrends.version}
+ org.codehaus.groovy
+ groovy-jsr223
+ ${groovy.version}
- org.wrensecurity.wrends
- opendj-grizzly
- ${wrends.version}
+ org.codehaus.groovy
+ groovy-json
+ ${groovy.version}
+
- org.wrensecurity.wrends
- opendj-server
- ${wrends.version}
+ org.freemarker
+ freemarker
+ ${freemarker.version}
- org.wrensecurity.wrends
- opendj-server-legacy
- ${wrends.version}
-
-
- org.slf4j
- slf4j-jdk14
-
-
- javax.servlet
- javax.servlet-api
-
-
+ org.javassist
+ javassist
+ ${javassist.version}
-
-
-
-
+
- org.apache.maven
- maven-plugin-api
- 3.0.5
- provided
-
-
- org.apache.maven
- maven-project
- 3.0-alpha-2
- provided
+ org.jgrapht
+ jgrapht-core
+ 0.9.1
+
+
- org.apache.maven.plugin-tools
- maven-plugin-annotations
- 3.3
- provided
+ org.json
+ json
+ ${json.version}
- external
- authapi
- ${authapi.version}
+ org.mockito
+ mockito-core
+ ${mockito.version}
+ test
+
- external
- FastInfoset
- ${FastInfoset.version}
+ org.mozilla
+ rhino
+ ${rhino.version}
+
+
- external
- jdmkrt
- ${jdmk.version}
+ org.restlet.jee
+ org.restlet
+ ${restlet.version}
+
- external
- jdmktk
- ${jdmk.version}
- compile
+ org.restlet.jee
+ org.restlet.ext.crypto
+ ${restlet.version}
+
- external
- jsr173_api
- ${jsr173_api.version}
+ org.restlet.jee
+ org.restlet.ext.freemarker
+ ${restlet.version}
-
org.restlet.jee
- org.restlet
+ org.restlet.ext.httpclient
${restlet.version}
+
org.restlet.jee
org.restlet.ext.jackson
${restlet.version}
+
+
+
+ javax.validation
+ validation-api
+
+
+
javax.xml.stream
stax-api
+
org.restlet.jee
org.restlet.ext.json
${restlet.version}
+
org.restlet.jee
- org.restlet.ext.xml
+ org.restlet.ext.net
${restlet.version}
+
org.restlet.jee
org.restlet.ext.servlet
${restlet.version}
+
org.restlet.jee
- org.restlet.ext.freemarker
+ org.restlet.ext.simple
${restlet.version}
+
org.restlet.jee
- org.restlet.ext.ssl
+ org.restlet.ext.slf4j
${restlet.version}
+
org.restlet.jee
- org.restlet.ext.simple
+ org.restlet.ext.ssl
${restlet.version}
+
org.restlet.jee
- org.restlet.ext.crypto
+ org.restlet.ext.xml
${restlet.version}
- org.restlet.jee
- org.restlet.ext.httpclient
- ${restlet.version}
+ org.slf4j
+ slf4j-nop
+ ${slf4j.version}
+ provided
- org.restlet.jee
- org.restlet.ext.net
- ${restlet.version}
+ org.wrensecurity.commons
+ forgerock-bloomfilter-core
+ ${wrensec-commons.version}
- org.restlet.jee
- org.restlet.ext.slf4j
- ${restlet.version}
+ org.wrensecurity.commons
+ forgerock-bloomfilter-monitoring
+ ${wrensec-commons.version}
-
org.wrensecurity.commons
- forgerock-bloomfilter-core
+ wrensec-guice-core
${wrensec-commons.version}
+
org.wrensecurity.commons
- forgerock-bloomfilter-monitoring
+ wrensec-guice-servlet
${wrensec-commons.version}
+
- com.google.code.findbugs
- jsr305
- 3.0.0
+ org.wrensecurity.commons
+ wrensec-guice-test
+ ${wrensec-commons.version}
+ test
-
- org.glassfish
- javax.security.auth.message
- ${javax.security.auth.message.version}
+ org.wrensecurity.wrends
+ opendj-core
+ ${wrends.version}
-
- org.freemarker
- freemarker
- ${freemarker.version}
+ org.wrensecurity.wrends
+ opendj-grizzly
+ ${wrends.version}
+
- com.googlecode.java-ipv6
- java-ipv6
- ${java-ipv6.version}
+ org.wrensecurity.wrends
+ opendj-server
+ ${wrends.version}
-
+
- org.json
- json
- ${json.version}
+ org.wrensecurity.wrends
+ opendj-server-legacy
+ ${wrends.version}
+
+
+
+
+ com.sun.mail
+ javax.mail
+
+
+
+
+ javax.ws.rs
+ jsr311-api
+
+
+
+
+
+
+ org.yaml
+ snakeyaml
+ ${snakeyaml.version}
+
+
+
+
+
+ org.apache.maven
+ maven-core
+ 3.9.4
+ provided
+
+
+
+ org.apache.maven
+ maven-plugin-api
+ 3.9.4
+ provided
+
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ 3.9.0
+ provided
+
+
+
+
+
+ com.iplanet.jato
+ jato
+ ${jato.version}
+
+ com.google.code.findbugs
+ jsr305
+ 3.0.2
+
+
+
+
com.google.inject
guice
${guice.version}
no_aop
+
aopalliance
aopalliance
+
javax.inject
@@ -942,10 +1148,25 @@
+
+
+ com.google.inject.extensions
+ guice-assistedinject
+ ${guice.version}
+
+
+
+ com.google.inject
+ guice
+
+
+
+
com.google.inject.extensions
guice-multibindings
${guice.version}
+
com.google.inject
@@ -953,150 +1174,173 @@
+
+
+ com.sun.msv.datatype.xsd
+ xsdlib
+ ${xsdlib.version}
+
+
+
+ com.sun.web.ui
+ cc
+ ${cc-ui.version}
+
+
+
+ com.sun.web.ui
+ cc_de
+ ${cc-ui.version}
+ runtime
+
+
- com.google.inject.extensions
- guice-assistedinject
- ${guice.version}
-
-
- com.google.inject
- guice
-
-
+ com.sun.web.ui
+ cc_es
+ ${cc-ui.version}
+ runtime
+
- org.wrensecurity.commons
- wrensec-guice-core
- ${wrensec-commons.version}
+ com.sun.web.ui
+ cc_fr
+ ${cc-ui.version}
+ runtime
+
- org.wrensecurity.commons
- wrensec-guice-servlet
- ${wrensec-commons.version}
+ com.sun.web.ui
+ cc_it
+ ${cc-ui.version}
+ runtime
+
- org.wrensecurity.commons
- wrensec-guice-test
- ${wrensec-commons.version}
- test
+ com.sun.web.ui
+ cc_ja
+ ${cc-ui.version}
+ runtime
-
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.javax-inject
- ${javax.inject.version}
+ com.sun.web.ui
+ cc_ko
+ ${cc-ui.version}
+ runtime
- org.jgrapht
- jgrapht-core
- 0.9.1
+ com.sun.web.ui
+ cc_sv
+ ${cc-ui.version}
+ runtime
- org.asciidoctor
- asciidoctorj
- 2.5.10
-
-
- com.beust
- jcommander
-
-
+ com.sun.web.ui
+ cc_zh
+ ${cc-ui.version}
+ runtime
-
- org.apache.santuario
- xmlsec
- ${santuario.xmlsec.version}
+ com.sun.web.ui
+ cc_zh_CN
+ ${cc-ui.version}
+ runtime
-
- org.codehaus.jstestrunner
- jstestrunner-junit
- 1.0.1
- test
+ com.sun.web.ui
+ cc_zh_HK
+ ${cc-ui.version}
+ runtime
+
- org.easytesting
- fest-assert
- 1.4
- test
+ com.sun.web.ui
+ cc_zh_TW
+ ${cc-ui.version}
+ runtime
+
- org.easymock
- easymock
- 3.2
- test
+ external
+ authapi
+ ${authapi.version}
+
- httpunit
- httpunit
- 1.7
- test
+ external
+ FastInfoset
+ ${FastInfoset.version}
+
- org.mortbay.jetty
- jetty-servlet-tester
- 7.0.0.pre5
- test
-
-
- org.mortbay.jetty
- servlet-api
-
-
+ external
+ jdmkrt
+ ${jdmk.version}
+
- javassist
- javassist
- 3.12.1.GA
- test
+ external
+ jdmktk
+ ${jdmk.version}
+ compile
+
+
- com.h2database
- h2
- ${h2database.version}
- test
+ external
+ esapiport
+ ${esapiport.version}
+
- org.apache.activemq
- activemq-client
- ${activemq.version}
- test
+ external
+ jsr173_api
+ ${jsr173_api.version}
+
- org.wrensecurity.wrenam
- openam-test-utils
- ${project.version}
- test
+ org.apache.click
+ click-extras
+ ${click.version}
+
-
- org.hdrhistogram
- HdrHistogram
- 2.1.4
+ org.apache.click
+ click-nodeps
+ ${click.version}
+
- com.zaxxer
- HikariCP
- ${hikaricp.version}
+ org.easytesting
+ fest-assert
+ ${fest-assert.version}
+ test
+
+
- org.wrensecurity.wrenam
- openam-time-travel
- ${project.version}
+
+ org.kohsuke
+ groovy-sandbox
+ ${groovy-sandbox.version}
+
+
+
+
+ org.codehaus.groovy
+ groovy
+
+
-
+
- org.yaml
- snakeyaml
- ${snakeyaml.version}
+ relaxngDatatype
+ relaxngDatatype
+ ${relaxngDatatype.version}
@@ -1106,10 +1350,12 @@
org.testng
testng
+
org.mockito
mockito-core
+
org.assertj
assertj-core
@@ -1119,80 +1365,105 @@
-
- com.github.searls
- jasmine-maven-plugin
- 2.0-alpha-01
-
${project.groupId}
build-helper-plugin
${project.version}
+
+
- org.codehaus.mojo
- jaxb2-maven-plugin
- 1.3.1
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
+ com.github.mcheely
+ requirejs-maven-plugin
+ 2.0.0
+
+
- org.apache.portals.jetspeed-2
- jetspeed-unpack-maven-plugin
- 2.2.2
+ com.github.searls
+ jasmine-maven-plugin
+ 2.0-alpha-01
+
+
net.ju-n.maven.plugins
checksum-maven-plugin
1.2
+
+
- org.codehaus.mojo
- buildnumber-maven-plugin
- 3.0.0
+ org.apache.portals.jetspeed-2
+ jetspeed-unpack-maven-plugin
+ 2.2.2
+
+
org.bsc.maven
maven-processor-plugin
2.2.4
+
+
+
+ org.codehaus.cargo
+ cargo-maven3-plugin
+ 1.9.13
+
+
org.codehaus.mojo
- xml-maven-plugin
- 1.0
+ build-helper-maven-plugin
+ 3.4.0
+
org.codehaus.mojo
- jslint-maven-plugin
- 1.0.1
+ buildnumber-maven-plugin
+ 3.1.0
+
org.codehaus.mojo
- webminifier-maven-plugin
+ jaxb2-maven-plugin
+ 2.5.0
+
+
+
+
+ org.codehaus.mojo
+ js-import-maven-plugin
1.0.1
+
+
- org.mortbay.jetty
- jetty-maven-plugin
- 8.1.12.v20130726
+ org.codehaus.mojo
+ jslint-maven-plugin
+ 1.0.1
+
+
org.codehaus.mojo
- js-import-maven-plugin
+ webminifier-maven-plugin
1.0.1
+
+
- com.github.mcheely
- requirejs-maven-plugin
- 2.0.0
+ org.codehaus.mojo
+ xml-maven-plugin
+ 1.1.0
+
+
- org.codehaus.cargo
- cargo-maven3-plugin
- 1.9.13
+ org.mortbay.jetty
+ jetty-maven-plugin
+ 8.1.12.v20130726
@@ -1298,6 +1569,7 @@
\
UTF-8
+
bin
@@ -1333,7 +1605,9 @@
ttf
+
false
+
${*}
@@ -1343,9 +1617,11 @@
org.apache.maven.plugins
maven-jar-plugin
+
true
+
${project.name}
${project.version} - ${buildNumber}
@@ -1377,11 +1653,13 @@
all,-missing,-html
+
supported.all.api
a
+
supported.api
a
@@ -1393,6 +1671,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
+