From cd09b3e800b5d951151fc655c371a4be20a8bdc0 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 14 Jul 2025 12:42:22 +0300 Subject: [PATCH 01/30] update apache felix to 7.0.5 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5b6813b8b..5eb9dc839 100644 --- a/pom.xml +++ b/pom.xml @@ -139,9 +139,9 @@ 1.0.1 1.1.0 - 6.0.5 - 1.9.18 - 1.5.0 + 7.0.5 + 1.9.26 + 1.6.4 1.1.4 1.0.6 @@ -217,7 +217,7 @@ openidm-security openidm-smartevent openidm-system - openidm-ui + openidm-util openidm-workflow-activiti openidm-maintenance From 112b66e9322ea76d67fc9fd2481a82248c46d94e Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 15 Jul 2025 14:05:50 +0300 Subject: [PATCH 02/30] jetty exclude optional deps --- .../internal/ErrorServletComponent.java | 4 +- openidm-jetty-fragment/pom.xml | 19 ++++ .../impl/ServletRegistrationSingleton.java | 6 +- .../ui/internal/service/ResourceServlet.java | 2 +- openidm-zip/pom.xml | 4 +- pom.xml | 93 ++++++++++++++++++- 6 files changed, 117 insertions(+), 11 deletions(-) diff --git a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java index 8d3597f78..154ad4ba2 100644 --- a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java +++ b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java @@ -81,14 +81,14 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse logger.info("Registered servlet at {}", ERROR_SERVLET_ALIAS); httpService.registerErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE, ERROR_SERVLET_ALIAS, - httpService.getDefaultSharedHttpContext()); + httpService.createDefaultSharedHttpContext()); } @Deactivate protected synchronized void deactivate(ComponentContext context) { servletRegistration.unregisterServlet(errorServlet); httpService.unregisterErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE, - httpService.getDefaultSharedHttpContext()); + httpService.createDefaultSharedHttpContext()); } } diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml index f9b967b62..0fae9be2f 100644 --- a/openidm-jetty-fragment/pom.xml +++ b/openidm-jetty-fragment/pom.xml @@ -48,6 +48,19 @@ pax-web-jetty-bundle + + org.ops4j.pax.web + pax-web-tomcat-common + ${paxweb.version} + + + + + javax.websocket + javax.websocket-api + 1.1 + + org.osgi @@ -66,6 +79,12 @@ org.apache.felix.http.servlet-api + + + + + + org.testng diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java index f3f64ffb6..f5d8c23d8 100644 --- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java +++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java @@ -126,7 +126,7 @@ public void deactivate(ComponentContext context) { */ @SuppressWarnings("rawtypes") public void registerServlet(String alias, Servlet servlet, Dictionary initparams) throws ServletException, NamespaceException { - webContainer.registerServlet(alias, servlet, initparams, webContainer.getDefaultSharedHttpContext()); + webContainer.registerServlet(alias, servlet, initparams, webContainer.createDefaultSharedHttpContext()); } /** @@ -237,8 +237,8 @@ public URL apply(JsonValue jsonValue) throws JsonValueException { webContainer.registerFilter(proxiedFilter, urlPatterns.toArray(new String[urlPatterns.size()]), servletNames.toArray(new String[servletNames.size()]), - new Hashtable(initParams), - webContainer.getDefaultSharedHttpContext()); + new Hashtable<>(initParams), + webContainer.createDefaultSharedHttpContext()); return proxiedFilter; } diff --git a/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java b/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java index bf71e865c..3b4243416 100644 --- a/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java +++ b/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java @@ -188,7 +188,7 @@ private void init(ComponentContext context) throws ServletException, NamespaceEx contextRoot = prependSlash(config.get(CONFIG_CONTEXT_ROOT).asString()); Dictionary props = new Hashtable<>(); - webContainer.registerServlet(contextRoot, this, props, webContainer.getDefaultSharedHttpContext()); + webContainer.registerServlet(contextRoot, this, props, webContainer.createDefaultSharedHttpContext()); logger.debug("Registered UI servlet at {}", contextRoot); } diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index 918d2b231..520fc3190 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -340,7 +340,7 @@ org.ops4j.base ops4j-base-lang - 1.5.0 + 1.5.1 diff --git a/pom.xml b/pom.xml index 5eb9dc839..2c8c30d86 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 2.0.0-alpha-1 2.9.4 2.2.220 - 7.4.6 + 8.0.32 1_2 4.5 5.0.4 @@ -139,7 +139,7 @@ 1.0.1 1.1.0 - 7.0.5 + 6.0.5 1.9.26 1.6.4 1.1.4 @@ -174,7 +174,7 @@ - 1.10 + 1.17.2 1.0b3 @@ -648,6 +648,93 @@ org.ops4j.pax.web pax-web-jetty-bundle ${paxweb.version} + + + org.eclipse.jetty + jetty-alpn-client + + + + + + + org.eclipse.jetty + jetty-alpn-openjdk8-server + + + org.eclipse.jetty + jetty-alpn-java-server + + + + org.eclipse.jetty + jetty-annotations + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jaas + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-util-ajax + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty + jetty-webapp + + + org.eclipse.jetty.alpn + alpn-api + + + org.eclipse.jetty.http2 + http2-common + + + org.eclipse.jetty.http2 + http2-hpack + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-common + + + org.eclipse.jetty.websocket + websocket-server + + + org.eclipse.jetty.websocket + javax-websocket-client-impl + + + org.ops4j.pax.web + pax-web-websocket + + From fa86d034173f90551165aa5cb23023946ca265c6 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 16 Jul 2025 15:06:27 +0300 Subject: [PATCH 03/30] change pax-web-jetty-bundle to pax-web-jetty --- .../internal/ErrorServletComponent.java | 4 +- openidm-authnfilter/pom.xml | 2 +- .../integrators-guide/chap-services.adoc | 2 +- .../integrators-guide/chap-services.xml | 2 +- .../openidm/info/impl/HealthService.java | 2 +- openidm-jetty-fragment/pom.xml | 16 +++- openidm-security-jetty/pom.xml | 2 +- .../ServletRegistration.java | 3 + .../impl/ServletRegistrationSingleton.java | 16 +++- .../ui/internal/service/ResourceServlet.java | 22 +++-- .../openidm/logging/util/LogFilter.java | 2 +- openidm-zip/src/main/resources/conf/jetty.xml | 2 +- .../main/resources/conf/ui.context-admin.json | 5 +- .../main/resources/conf/ui.context-api.json | 5 +- .../conf/ui.context-selfservice.json | 5 +- pom.xml | 89 +------------------ 16 files changed, 69 insertions(+), 110 deletions(-) diff --git a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java index 154ad4ba2..54d9a8415 100644 --- a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java +++ b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java @@ -81,14 +81,14 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse logger.info("Registered servlet at {}", ERROR_SERVLET_ALIAS); httpService.registerErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE, ERROR_SERVLET_ALIAS, - httpService.createDefaultSharedHttpContext()); + servletRegistration.getContext()); } @Deactivate protected synchronized void deactivate(ComponentContext context) { servletRegistration.unregisterServlet(errorServlet); httpService.unregisterErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE, - httpService.createDefaultSharedHttpContext()); + servletRegistration.getContext()); } } diff --git a/openidm-authnfilter/pom.xml b/openidm-authnfilter/pom.xml index d03b6ff4c..558557843 100644 --- a/openidm-authnfilter/pom.xml +++ b/openidm-authnfilter/pom.xml @@ -71,7 +71,7 @@ org.ops4j.pax.web - pax-web-jetty-bundle + pax-web-jetty diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc index b01f429e0..65088771b 100644 --- a/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc +++ b/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc @@ -542,7 +542,7 @@ OpenIDM checks all required modules. Examples of those modules are shown here: "org.forgerock.openidm.quartz-fragment" "org.ops4j.pax.web.pax-web-extender-whiteboard" "org.forgerock.openidm.scheduler" - "org.ops4j.pax.web.pax-web-jetty-bundle" + "org.ops4j.pax.web.pax-web-jetty" "org.forgerock.openidm.repo-jdbc" "org.forgerock.openidm.repo-orientdb" "org.forgerock.openidm.config" diff --git a/openidm-doc/src/main/docbkx/integrators-guide/chap-services.xml b/openidm-doc/src/main/docbkx/integrators-guide/chap-services.xml index 9b5e3e500..77893b265 100644 --- a/openidm-doc/src/main/docbkx/integrators-guide/chap-services.xml +++ b/openidm-doc/src/main/docbkx/integrators-guide/chap-services.xml @@ -499,7 +499,7 @@ Stopping OpenIDM (454) "org.forgerock.openidm.quartz-fragment" "org.ops4j.pax.web.pax-web-extender-whiteboard" "org.forgerock.openidm.scheduler" -"org.ops4j.pax.web.pax-web-jetty-bundle" +"org.ops4j.pax.web.pax-web-jetty" "org.forgerock.openidm.repo-jdbc" "org.forgerock.openidm.repo-orientdb" "org.forgerock.openidm.config" diff --git a/openidm-infoservice/src/main/java/org/forgerock/openidm/info/impl/HealthService.java b/openidm-infoservice/src/main/java/org/forgerock/openidm/info/impl/HealthService.java index a3021bf2c..f8b3a1723 100644 --- a/openidm-infoservice/src/main/java/org/forgerock/openidm/info/impl/HealthService.java +++ b/openidm-infoservice/src/main/java/org/forgerock/openidm/info/impl/HealthService.java @@ -239,7 +239,7 @@ enum AppState { "org.openidentityplatform.openidm.keystore", // 3rd Party Bundles - "org.ops4j.pax.web.pax-web-jetty-bundle" + "org.ops4j.pax.web.pax-web-jetty" }; /** diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml index 0fae9be2f..ef23c7d91 100644 --- a/openidm-jetty-fragment/pom.xml +++ b/openidm-jetty-fragment/pom.xml @@ -45,7 +45,13 @@ org.ops4j.pax.web - pax-web-jetty-bundle + pax-web-jetty + + + + org.ops4j.pax.web + pax-web-runtime + ${paxweb.version} @@ -53,6 +59,12 @@ pax-web-tomcat-common ${paxweb.version} + + org.eclipse.jetty + jetty-servlets + 9.4.57.v20241219 + + @@ -115,7 +127,7 @@ org.forgerock.openidm.jaas - org.ops4j.pax.web.pax-web-jetty-bundle + org.ops4j.pax.web.pax-web-jetty org.forgerock.openidm.jetty diff --git a/openidm-security-jetty/pom.xml b/openidm-security-jetty/pom.xml index a1f98795f..23b04998c 100644 --- a/openidm-security-jetty/pom.xml +++ b/openidm-security-jetty/pom.xml @@ -42,7 +42,7 @@ org.ops4j.pax.web - pax-web-jetty-bundle + pax-web-jetty org.ops4j.pax.web diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java index 8baf01242..457c3f6d6 100644 --- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java +++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java @@ -20,6 +20,7 @@ import javax.servlet.ServletException; import org.forgerock.json.JsonValue; +import org.osgi.service.http.HttpContext; import org.osgi.service.http.NamespaceException; import java.util.Dictionary; @@ -92,4 +93,6 @@ public interface ServletRegistration { */ void unregisterServlet(Servlet servlet); + HttpContext getContext(); + } diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java index f5d8c23d8..0d1ffe993 100644 --- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java +++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java @@ -65,6 +65,7 @@ import org.osgi.service.component.annotations.ConfigurationPolicy; import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; +import org.osgi.service.http.HttpContext; import org.osgi.service.http.NamespaceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,7 +97,9 @@ public class ServletRegistrationSingleton implements ServletRegistration { @Reference private WebContainer webContainer; - + + private HttpContext sharedContext; + private List filters = new ArrayList(); private final static Object registrationLock = new Object(); @@ -109,6 +112,7 @@ public class ServletRegistrationSingleton implements ServletRegistration { @Activate public void activate(ComponentContext context) { bundleContext = context.getBundleContext(); + sharedContext = webContainer.createDefaultSharedHttpContext(); } /** @@ -126,7 +130,7 @@ public void deactivate(ComponentContext context) { */ @SuppressWarnings("rawtypes") public void registerServlet(String alias, Servlet servlet, Dictionary initparams) throws ServletException, NamespaceException { - webContainer.registerServlet(alias, servlet, initparams, webContainer.createDefaultSharedHttpContext()); + webContainer.registerServlet(alias, servlet, initparams, sharedContext); } /** @@ -135,6 +139,12 @@ public void registerServlet(String alias, Servlet servlet, Dictionary initparams public void unregisterServlet(Servlet servlet) { webContainer.unregisterServlet(servlet); } + + @Override + public HttpContext getContext() { + return sharedContext; + } + /** * {@inheritDoc} */ @@ -238,7 +248,7 @@ public URL apply(JsonValue jsonValue) throws JsonValueException { urlPatterns.toArray(new String[urlPatterns.size()]), servletNames.toArray(new String[servletNames.size()]), new Hashtable<>(initParams), - webContainer.createDefaultSharedHttpContext()); + sharedContext); return proxiedFilter; } diff --git a/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java b/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java index 3b4243416..4e44b2b0e 100644 --- a/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java +++ b/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java @@ -27,6 +27,7 @@ import java.net.URLConnection; import java.util.Dictionary; import java.util.Hashtable; +import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -37,6 +38,7 @@ import org.forgerock.openidm.config.enhanced.EnhancedConfig; import org.forgerock.openidm.core.IdentityServer; import org.forgerock.openidm.core.PropertyUtil; +import org.forgerock.openidm.servletregistration.ServletRegistration; import org.ops4j.pax.web.service.WebContainer; import org.osgi.service.component.ComponentContext; import org.osgi.service.component.annotations.Activate; @@ -72,6 +74,8 @@ public final class ResourceServlet extends HttpServlet { private static final String CONFIG_DEFAULT_DIR = "defaultDir"; private static final String CONFIG_EXTENSION_DIR = "extensionDir"; + private static final String CONFIG_PARAMS = "params"; + /** the Felix web console self-attaches to this servlet target */ private static final String FELIX_WEB_CONSOLE = "/system/console"; @@ -87,6 +91,10 @@ public final class ResourceServlet extends HttpServlet { @Reference(policy = ReferencePolicy.DYNAMIC) private volatile EnhancedConfig enhancedConfig; + @Reference + private ServletRegistration servletRegistration; + + @Activate protected void activate(ComponentContext context) throws ServletException, NamespaceException { logger.info("Activating resource servlet with configuration {}", context.getProperties()); @@ -112,9 +120,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse res) logger.debug("GET call on {}", req); // the request pathInfo is always null for root contexts - String target = ("/".equals(contextRoot)) - ? req.getServletPath() - : req.getPathInfo(); + String target = req.getPathInfo(); if (target == null || "".equals(target)) { res.sendRedirect(req.getServletPath() + "/"); } else { @@ -187,11 +193,17 @@ private void init(ComponentContext context) throws ServletException, NamespaceEx extensionDir = config.get(CONFIG_EXTENSION_DIR).asString(); contextRoot = prependSlash(config.get(CONFIG_CONTEXT_ROOT).asString()); + Dictionary props = new Hashtable<>(); - webContainer.registerServlet(contextRoot, this, props, webContainer.createDefaultSharedHttpContext()); + if (config.get(CONFIG_PARAMS).isNotNull()) { + Map params = config.get(CONFIG_PARAMS).asMap(); + params.forEach(props::put); + } + + webContainer.registerServlet(contextRoot, this, props, servletRegistration.getContext()); logger.debug("Registered UI servlet at {}", contextRoot); } - + /** * Clears the servlet, unregistering it with the WebContainer and removing the bundle listener. */ diff --git a/openidm-system/src/main/java/org/forgerock/openidm/logging/util/LogFilter.java b/openidm-system/src/main/java/org/forgerock/openidm/logging/util/LogFilter.java index 19d950004..ac8f03c9b 100644 --- a/openidm-system/src/main/java/org/forgerock/openidm/logging/util/LogFilter.java +++ b/openidm-system/src/main/java/org/forgerock/openidm/logging/util/LogFilter.java @@ -62,7 +62,7 @@ public boolean isLoggable(LogRecord rec) { || rec.getMessage() .endsWith( "[org.forgerock.openidm.managed] Component instance could not be created, activation failed") - || (rec.getMessage().contains("org.ops4j.pax.web.pax-web-jetty-bundle [") && rec + || (rec.getMessage().contains("org.ops4j.pax.web.pax-web-jetty [") && rec .getMessage().endsWith("] FrameworkEvent ERROR"))) { return false; } diff --git a/openidm-zip/src/main/resources/conf/jetty.xml b/openidm-zip/src/main/resources/conf/jetty.xml index 787292919..c1e3f43b2 100644 --- a/openidm-zip/src/main/resources/conf/jetty.xml +++ b/openidm-zip/src/main/resources/conf/jetty.xml @@ -239,7 +239,7 @@ - + diff --git a/openidm-zip/src/main/resources/conf/ui.context-admin.json b/openidm-zip/src/main/resources/conf/ui.context-admin.json index defc8f4f5..c5220e929 100644 --- a/openidm-zip/src/main/resources/conf/ui.context-admin.json +++ b/openidm-zip/src/main/resources/conf/ui.context-admin.json @@ -2,5 +2,8 @@ "enabled" : true, "urlContextRoot" : "/admin", "defaultDir" : "&{launcher.install.location}/ui/admin/default", - "extensionDir" : "&{launcher.install.location}/ui/admin/extension" + "extensionDir" : "&{launcher.install.location}/ui/admin/extension", + "params": { + "servlet-name": "admin-servlet" + } } \ No newline at end of file diff --git a/openidm-zip/src/main/resources/conf/ui.context-api.json b/openidm-zip/src/main/resources/conf/ui.context-api.json index 181b653fc..754238b46 100644 --- a/openidm-zip/src/main/resources/conf/ui.context-api.json +++ b/openidm-zip/src/main/resources/conf/ui.context-api.json @@ -2,5 +2,8 @@ "enabled" : true, "urlContextRoot" : "/api", "defaultDir" : "&{launcher.install.location}/ui/api/default", - "extensionDir" : "&{launcher.install.location}/ui/api/extension" + "extensionDir" : "&{launcher.install.location}/ui/api/extension", + "params": { + "servlet-name": "api-servlet" + } } \ No newline at end of file diff --git a/openidm-zip/src/main/resources/conf/ui.context-selfservice.json b/openidm-zip/src/main/resources/conf/ui.context-selfservice.json index eb8af90e4..d730a0703 100644 --- a/openidm-zip/src/main/resources/conf/ui.context-selfservice.json +++ b/openidm-zip/src/main/resources/conf/ui.context-selfservice.json @@ -2,5 +2,8 @@ "enabled" : true, "urlContextRoot" : "/", "defaultDir" : "&{launcher.install.location}/ui/selfservice/default", - "extensionDir" : "&{launcher.install.location}/ui/selfservice/extension" + "extensionDir" : "&{launcher.install.location}/ui/selfservice/extension", + "params": { + "servlet-name": "selfservice-servlet" + } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2c8c30d86..1c175ae68 100644 --- a/pom.xml +++ b/pom.xml @@ -646,95 +646,8 @@ org.ops4j.pax.web - pax-web-jetty-bundle + pax-web-jetty ${paxweb.version} - - - org.eclipse.jetty - jetty-alpn-client - - - - - - - org.eclipse.jetty - jetty-alpn-openjdk8-server - - - org.eclipse.jetty - jetty-alpn-java-server - - - - org.eclipse.jetty - jetty-annotations - - - org.eclipse.jetty - jetty-continuation - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-jaas - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-util-ajax - - - org.eclipse.jetty - jetty-security - - - org.eclipse.jetty - jetty-webapp - - - org.eclipse.jetty.alpn - alpn-api - - - org.eclipse.jetty.http2 - http2-common - - - org.eclipse.jetty.http2 - http2-hpack - - - org.eclipse.jetty.websocket - websocket-api - - - org.eclipse.jetty.websocket - websocket-common - - - org.eclipse.jetty.websocket - websocket-server - - - org.eclipse.jetty.websocket - javax-websocket-client-impl - - - org.ops4j.pax.web - pax-web-websocket - - From dd87278cbdf12d971940495a5cbf5fb325e4c32c Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 17 Jul 2025 15:10:35 +0300 Subject: [PATCH 04/30] restore openidm-ui --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c175ae68..56a366c76 100644 --- a/pom.xml +++ b/pom.xml @@ -217,7 +217,7 @@ openidm-security openidm-smartevent openidm-system - + openidm-ui openidm-util openidm-workflow-activiti openidm-maintenance From 6f03df0754890579c97061bc189a720b0d66a7fb Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 17 Jul 2025 15:18:39 +0300 Subject: [PATCH 05/30] Suppress warnings of failed error page model validation --- openidm-zip/src/main/resources/conf/logging.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openidm-zip/src/main/resources/conf/logging.properties b/openidm-zip/src/main/resources/conf/logging.properties index 9cb1a9dce..2727c49b1 100644 --- a/openidm-zip/src/main/resources/conf/logging.properties +++ b/openidm-zip/src/main/resources/conf/logging.properties @@ -70,6 +70,9 @@ org.activiti.osgi.BarURLHandler.level=SEVERE # Suppress warnings of failed connector loading org.identityconnectors.framework.impl.api.local.LocalConnectorInfoManagerImpl.level=SEVERE +# Suppress warnings of failed error page model validation +org.ops4j.pax.web.service.spi.model.elements.ErrorPageModel.level=SEVERE + ############################################################ # Handler specific properties. # Describes specific configuration info for Handlers. From 9e6762780ccfac91f34058c6048e3f786aedf353 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 22 Jul 2025 11:09:59 +0300 Subject: [PATCH 06/30] move jetty version to properties --- openidm-jetty-fragment/pom.xml | 7 ------- openidm-zip/pom.xml | 5 +++++ pom.xml | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml index 8644fb86b..7851e4462 100644 --- a/openidm-jetty-fragment/pom.xml +++ b/openidm-jetty-fragment/pom.xml @@ -59,13 +59,6 @@ pax-web-tomcat-common ${paxweb.version} - - org.eclipse.jetty - jetty-servlets - 9.4.57.v20241219 - - - javax.websocket diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index 6d85983ea..30539fb44 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -355,6 +355,11 @@ 2.0.4 --> + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + diff --git a/pom.xml b/pom.xml index f0a0522fb..40a5137c6 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,7 @@ 2.9.4 2.2.220 8.0.32 + 9.4.57.v20241219 1_2 4.5 5.0.4 From 74f44233bdf430a4f1bdd9091f515c299f78d3a4 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 23 Jul 2025 10:05:08 +0300 Subject: [PATCH 07/30] Fix No SLF4J providers were found for SLF4J 2 --- openidm-zip/pom.xml | 5 +++++ openidm-zip/src/main/resources/bin/launcher.json | 6 +++++- pom.xml | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index 30539fb44..efd2f75c2 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -366,6 +366,11 @@ org.slf4j jcl-over-slf4j + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.7 + diff --git a/openidm-zip/src/main/resources/bin/launcher.json b/openidm-zip/src/main/resources/bin/launcher.json index 97709ef48..f2ae5bde0 100644 --- a/openidm-zip/src/main/resources/bin/launcher.json +++ b/openidm-zip/src/main/resources/bin/launcher.json @@ -4,6 +4,8 @@ { "location":"bundle", "includes":[ + "**/*org.apache.aries.spifly*.jar", + "**/*org.slf4j.slf4j-jdk14*.jar", "**/*openidm-system-*.jar", "**/*javax.transaction-*.jar" ], @@ -84,7 +86,9 @@ "**/*pax-web-jetty-bundle*.jar", "**/*openidm-scheduler*.jar", "**/*groovy-all*.jar", - "**/*openidm-httpclient-fragment*.jar" + "**/*openidm-httpclient-fragment*.jar", + "**/*org.apache.aries.spifly*.jar", + "**/*org.slf4j.slf4j-jdk14*.jar" ] }, { diff --git a/pom.xml b/pom.xml index 40a5137c6..b4dff22c0 100644 --- a/pom.xml +++ b/pom.xml @@ -123,8 +123,8 @@ 8.0.32 9.4.57.v20241219 1_2 - 4.5 - 5.0.4 + 4.27 + 9.6 1.8.6_1 1.7.14_2 @@ -414,7 +414,7 @@ org.openidentityplatform openicf - 1.8.0 + 1.8.1-SNAPSHOT pom import @@ -686,7 +686,7 @@ ch.qos.logback logback-classic - 1.2.13 + 1.3.15 test From d6d4a5f60114b488dd7f4c2723cd11aabe57ea81 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 23 Jul 2025 12:45:14 +0300 Subject: [PATCH 08/30] Update to PAX 9 initial commit --- openidm-api-servlet/pom.xml | 6 +- .../auth/ResourceQueryAuthenticator.java | 11 ++-- openidm-core/pom.xml | 6 +- openidm-httpcontext/pom.xml | 6 +- openidm-jetty-fragment/pom.xml | 21 +++---- .../openidm/jetty/DisableOpenIDMAuth.java | 7 ++- openidm-maintenance/pom.xml | 6 +- openidm-servlet-registrator/pom.xml | 6 +- openidm-servlet/pom.xml | 6 +- openidm-zip/pom.xml | 20 ++++++- openidm-zip/src/main/assembly/zip.xml | 3 +- .../src/main/resources/bin/launcher.json | 10 ++-- .../trustedservletfilter/filter/pom.xml | 6 +- pom.xml | 58 ++++++++++++++++--- 14 files changed, 119 insertions(+), 53 deletions(-) diff --git a/openidm-api-servlet/pom.xml b/openidm-api-servlet/pom.xml index 5dd9b371c..f146317ef 100644 --- a/openidm-api-servlet/pom.xml +++ b/openidm-api-servlet/pom.xml @@ -13,7 +13,7 @@ ~ information: "Portions copyright [year] [name of copyright owner]". ~ ~ Copyright 2013-2016 ForgeRock AS. - ~ Portions Copyrighted 2024 3A Systems LLC. + ~ Portions Copyrighted 2024-2025 3A Systems LLC. --> 4.0.0 @@ -94,8 +94,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java index 479dbcb67..2eac9c923 100644 --- a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java +++ b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2015 ForgeRock AS. + * Portions copyright 2024 3A Systems LLC. */ package org.forgerock.openidm.auth; import static org.forgerock.json.resource.ResourceException.newResourceException; -import org.eclipse.jetty.jaas.spi.UserInfo; +import org.eclipse.jetty.security.UserPrincipal; import org.eclipse.jetty.util.security.Password; import org.forgerock.json.crypto.JsonCryptoException; import org.forgerock.json.resource.ConnectionFactory; @@ -111,11 +112,11 @@ public AuthenticatorResult authenticate(String username, String password, Contex throw new InternalServerErrorException(jce.getMessage(), jce); } } else { - final UserInfo userInfo = getRepoUserInfo(username, resource); + final UserPrincipal userInfo = getRepoUserInfo(username, resource); if (userInfo == null) { // getResource already logged why return AuthenticatorResult.FAILED; - } else if (userInfo.checkCredential(password)) { + } else if (userInfo.authenticate(password)) { logger.debug("Authentication succeeded for {}", username); return AuthenticatorResult.authenticationSuccess(resource); } @@ -159,7 +160,7 @@ private ResourceResponse getResource(String username, Context context) throws Re return result.iterator().next(); // the retrieved resource } - private UserInfo getRepoUserInfo(String username, ResourceResponse resource) throws ResourceException { + private UserPrincipal getRepoUserInfo(String username, ResourceResponse resource) throws ResourceException { final CryptoService cryptoService = cryptoServiceProvider.get(); if (cryptoService == null) { throw new InternalServerErrorException("No CryptoService available"); @@ -171,6 +172,6 @@ private UserInfo getRepoUserInfo(String username, ResourceResponse resource) thr final String retrievedCred = cryptoService.decryptIfNecessary(resource.getContent().get(userCredentialProperty)).asString(); - return new UserInfo(username, new Password(retrievedCred), null); + return new UserPrincipal(username, new Password(retrievedCred)); } } diff --git a/openidm-core/pom.xml b/openidm-core/pom.xml index 4b7c0a94b..da793a058 100644 --- a/openidm-core/pom.xml +++ b/openidm-core/pom.xml @@ -22,7 +22,7 @@ ~ your own identifying information: ~ "Portions Copyrighted [year] [name of copyright owner]" ~ - ~ Portions Copyrighted 2024 3A Systems LLC. + ~ Portions Copyrighted 2024-2025 3A Systems LLC. --> 4.0.0 @@ -153,8 +153,8 @@ test - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/openidm-httpcontext/pom.xml b/openidm-httpcontext/pom.xml index 6ee51ca5a..4ce5f055b 100644 --- a/openidm-httpcontext/pom.xml +++ b/openidm-httpcontext/pom.xml @@ -22,7 +22,7 @@ ~ your own identifying information: ~ "Portions Copyrighted [year] [name of copyright owner]" ~ - ~ Portions Copyrighted 2024 3A Systems LLC. + ~ Portions Copyrighted 2024-2025 3A Systems LLC. --> 4.0.0 @@ -56,8 +56,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml index 7851e4462..dff141cfa 100644 --- a/openidm-jetty-fragment/pom.xml +++ b/openidm-jetty-fragment/pom.xml @@ -48,6 +48,7 @@ pax-web-jetty + org.ops4j.pax.web pax-web-runtime @@ -75,21 +76,21 @@ org.apache.felix org.apache.felix.framework + + + + - org.osgi - org.osgi.service.http.whiteboard - - - org.apache.felix - org.apache.felix.http.servlet-api + jakarta.servlet + jakarta.servlet-api - - - - + + + + org.testng diff --git a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/DisableOpenIDMAuth.java b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/DisableOpenIDMAuth.java index 37d80a41a..bf5512b51 100644 --- a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/DisableOpenIDMAuth.java +++ b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/DisableOpenIDMAuth.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2015 ForgeRock AS. + * Portions copyright 3A Systems LLC. */ package org.forgerock.openidm.jetty; @@ -21,6 +22,7 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.util.ssl.SslContextFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,8 +53,9 @@ public static void add(ServerConnector serverConnector) { int port = -1; SslConnectionFactory sslConnectionFactory = (SslConnectionFactory) serverConnector.getConnectionFactory("SSL-http/1.1"); port = serverConnector.getPort(); - if (sslConnectionFactory != null) { - boolean needClientAuth = sslConnectionFactory.getSslContextFactory().getNeedClientAuth(); + if (sslConnectionFactory != null + && sslConnectionFactory.getSslContextFactory() instanceof SslContextFactory.Server) { + boolean needClientAuth = ((SslContextFactory.Server)sslConnectionFactory.getSslContextFactory()).getNeedClientAuth(); if (needClientAuth == false) { logger.warn("OpenIDM authentication disabled on port {} without the port requiring SSL mutual authentication.", port); } else { diff --git a/openidm-maintenance/pom.xml b/openidm-maintenance/pom.xml index 3bf7e53f6..a5e6fbce2 100644 --- a/openidm-maintenance/pom.xml +++ b/openidm-maintenance/pom.xml @@ -13,7 +13,7 @@ ~ information: "Portions copyright [year] [name of copyright owner]". ~ ~ Copyright 2011-2016 ForgeRock AS. - ~ Portions Copyrighted 2024 3A Systems LLC. + ~ Portions Copyrighted 2024-2025 3A Systems LLC. --> 4.0.0 @@ -139,8 +139,8 @@ test - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/openidm-servlet-registrator/pom.xml b/openidm-servlet-registrator/pom.xml index 77b692c85..84128f9be 100644 --- a/openidm-servlet-registrator/pom.xml +++ b/openidm-servlet-registrator/pom.xml @@ -22,7 +22,7 @@ ~ your own identifying information: ~ "Portions Copyrighted [year] [name of copyright owner]" ~ - ~ Portions Copyrighted 2024 3A Systems LLC. + ~ Portions Copyrighted 2024-2025 3A Systems LLC. --> 4.0.0 @@ -52,8 +52,8 @@ util - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/openidm-servlet/pom.xml b/openidm-servlet/pom.xml index 15af0a4f6..1d37a3b25 100644 --- a/openidm-servlet/pom.xml +++ b/openidm-servlet/pom.xml @@ -22,7 +22,7 @@ ~ your own identifying information: ~ "Portions Copyrighted [year] [name of copyright owner]" ~ - ~ Portions Copyrighted 2024 3A Systems LLC. + ~ Portions Copyrighted 2024-2025 3A Systems LLC. --> 4.0.0 @@ -57,8 +57,8 @@ util - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index efd2f75c2..aa6e13d49 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -342,6 +342,11 @@ ops4j-base-lang 1.5.1 + + org.ops4j.pax.web + pax-web-extender-whiteboard + ${paxweb.version} + org.slf4j @@ -371,6 +384,11 @@ org.apache.aries.spifly.dynamic.bundle 1.3.7 + + jakarta.servlet + jakarta.servlet-api + compile + diff --git a/openidm-zip/src/main/assembly/zip.xml b/openidm-zip/src/main/assembly/zip.xml index 2888ab020..2c450e379 100644 --- a/openidm-zip/src/main/assembly/zip.xml +++ b/openidm-zip/src/main/assembly/zip.xml @@ -1207,7 +1207,8 @@ org.apache.httpcomponents:httpclient org.apache.httpcomponents:httpasyncclient org.apache.httpcomponents:httpcore - jakarta* + jakarta.xml* + jakarta.activation* org.bouncycastle:bc*-fips org.openjdk.nashorn:* diff --git a/openidm-zip/src/main/resources/bin/launcher.json b/openidm-zip/src/main/resources/bin/launcher.json index f2ae5bde0..c6afd7075 100644 --- a/openidm-zip/src/main/resources/bin/launcher.json +++ b/openidm-zip/src/main/resources/bin/launcher.json @@ -7,7 +7,8 @@ "**/*org.apache.aries.spifly*.jar", "**/*org.slf4j.slf4j-jdk14*.jar", "**/*openidm-system-*.jar", - "**/*javax.transaction-*.jar" + "**/*javax.transaction-*.jar", + "**/*jakarta.servlet*.jar" ], "start-level":1, "action":"install.start" @@ -83,18 +84,19 @@ "**/*javax.transaction-*.jar", "**/*org.apache.servicemix.transaction-*.jar", "**/*openidm-httpcontext-*.jar", - "**/*pax-web-jetty-bundle*.jar", + "**/*pax-web-jetty*.jar", "**/*openidm-scheduler*.jar", "**/*groovy-all*.jar", "**/*openidm-httpclient-fragment*.jar", "**/*org.apache.aries.spifly*.jar", - "**/*org.slf4j.slf4j-jdk14*.jar" + "**/*org.slf4j.slf4j-jdk14*.jar", + "**/*jakarta.servlet*.jar" ] }, { "location":"bundle", "includes":[ - "**/*pax-web-jetty-bundle*.jar" + "**/*pax-web-jetty*.jar" ], "start-level":11, "action":"install.start" diff --git a/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml b/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml index 23219c35e..1df44fda6 100644 --- a/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml +++ b/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml @@ -7,9 +7,9 @@ Sample Trusted Servlet Filter - javax.servlet - javax.servlet-api - 3.0.1 + jakarta.servlet + jakarta.servlet-api + 4.0.4 diff --git a/pom.xml b/pom.xml index b4dff22c0..42ad452af 100644 --- a/pom.xml +++ b/pom.xml @@ -120,8 +120,8 @@ 2.0.0-alpha-1 2.9.4 2.2.220 - 8.0.32 - 9.4.57.v20241219 + 9.0.21 + 10.0.24 1_2 4.27 9.6 @@ -138,7 +138,7 @@ 1.1.1 1.1.0 1.0.1 - 1.1.0 + 1.1.1 6.0.5 1.9.26 @@ -158,7 +158,7 @@ 1.0.10 1.0.4 1.0.4 - 1.1.2 + 1.2.0 scp://community.internal.forgerock.com/var/www/vhosts/openidm.forgerock.org/httpdocs @@ -218,7 +218,7 @@ openidm-security openidm-smartevent openidm-system - openidm-ui + openidm-util openidm-workflow-activiti openidm-maintenance @@ -432,9 +432,9 @@ - javax.servlet - javax.servlet-api - 3.0.1 + jakarta.servlet + jakarta.servlet-api + 4.0.4 provided @@ -650,7 +650,22 @@ pax-web-jetty ${paxweb.version} - + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + com.h2database @@ -700,6 +715,31 @@ joda-time ${joda-time.version} + + org.glassfish.grizzly + grizzly-framework + 2.4.4 + + + org.glassfish.grizzly + grizzly-http-servlet + 2.4.4 + + + org.glassfish.grizzly + grizzly-http + 2.4.4 + + + org.glassfish.grizzly + grizzly-http-server + 2.4.4 + + + org.glassfish.grizzly + grizzly-websockets + 2.4.4 + From ed8f727fc16d7591c8487a0a47e28aeaec86fc6a Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 23 Jul 2025 20:10:33 +0300 Subject: [PATCH 09/30] pax web 10 initial commit --- .../internal/ErrorServletComponent.java | 2 +- openidm-jetty-fragment/pom.xml | 8 ++++++++ .../openidm/jetty/JettyErrorHandler.java | 6 +++--- openidm-zip/pom.xml | 8 ++++---- .../resources/conf/servletfilter-cors.json | 2 +- pom.xml | 18 +++++++++--------- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java index 54d9a8415..8b770eb14 100644 --- a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java +++ b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java @@ -26,7 +26,7 @@ import java.util.Dictionary; import java.util.Hashtable; -import org.eclipse.jetty.servlet.ErrorPageErrorHandler; +import org.eclipse.jetty.ee8.servlet.ErrorPageErrorHandler; import org.forgerock.openidm.jetty.JettyErrorHandler; import org.forgerock.openidm.servletregistration.ServletRegistration; import org.ops4j.pax.web.service.WebContainer; diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml index dff141cfa..11a83c605 100644 --- a/openidm-jetty-fragment/pom.xml +++ b/openidm-jetty-fragment/pom.xml @@ -126,6 +126,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 11 + 11 + + diff --git a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java index 2b1e0e786..476289487 100644 --- a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java +++ b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java @@ -30,14 +30,14 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.MimeTypes; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Response; +import org.eclipse.jetty.ee8.nested.Request; +import org.eclipse.jetty.ee8.nested.Response; /** * Custom {@code org.eclipse.jetty.server.handler.ErrorHandler} implementation that removes sensitive information * from HTTP error-responses. */ -public class JettyErrorHandler extends org.eclipse.jetty.server.handler.ErrorHandler { +public class JettyErrorHandler extends org.eclipse.jetty.ee8.nested.ErrorHandler { /** * Handles Jetty errors originating from HTTP requests. Add the following entry to {@code jetty.xml} or directly diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index aa6e13d49..130c76b49 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -361,16 +361,16 @@ --> - org.eclipse.jetty - jetty-servlets + org.eclipse.jetty.ee8 + jetty-ee8-servlets org.eclipse.jetty jetty-server - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee8 + jetty-ee8-servlet diff --git a/openidm-zip/src/main/resources/conf/servletfilter-cors.json b/openidm-zip/src/main/resources/conf/servletfilter-cors.json index 9c14b6a9d..e9f7a8099 100644 --- a/openidm-zip/src/main/resources/conf/servletfilter-cors.json +++ b/openidm-zip/src/main/resources/conf/servletfilter-cors.json @@ -13,5 +13,5 @@ "urlPatterns" : [ "/*" ], - "filterClass" : "org.eclipse.jetty.servlets.CrossOriginFilter" + "filterClass" : "org.eclipse.jetty.ee8.servlets.CrossOriginFilter" } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 42ad452af..0a99e8f1f 100644 --- a/pom.xml +++ b/pom.xml @@ -110,8 +110,8 @@ UTF-8 - 8 - 8 + 11 + 11 @@ -120,8 +120,8 @@ 2.0.0-alpha-1 2.9.4 2.2.220 - 9.0.21 - 10.0.24 + 10.0.0 + 12.0.22 1_2 4.27 9.6 @@ -367,7 +367,7 @@ maven-compiler-plugin true - 8 + 11 -XDignore.symbol.file -Xlint:unchecked @@ -651,8 +651,8 @@ ${paxweb.version} - org.eclipse.jetty - jetty-servlets + org.eclipse.jetty.ee8 + jetty-ee8-servlets ${jetty.version} @@ -661,8 +661,8 @@ ${jetty.version} - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee8 + jetty-ee8-servlet ${jetty.version} From edb50919e684c5189b1f2951bbd713798b8f074c Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 29 Jul 2025 10:31:51 +0300 Subject: [PATCH 10/30] pax web 11 initial commit --- .../internal/ErrorServletComponent.java | 14 ++++---- .../servlet/internal/ServletComponent.java | 8 ++--- .../impl/RepositoryAuditEventHandler.java | 3 +- .../audit/impl/RouterAuditEventHandler.java | 3 +- .../openidm/auth/AuthenticationService.java | 4 +-- .../openidm/auth/AuthenticatorFactory.java | 3 +- .../auth/PassthroughAuthenticator.java | 3 +- .../auth/ResourceQueryAuthenticator.java | 4 +-- .../auth/modules/ClientCertAuthModule.java | 3 +- .../openidm/http/ContextRegistrator.java | 4 +-- .../openidm/http/SecurityConfigurator.java | 6 ++-- openidm-jetty-fragment/pom.xml | 10 ++---- .../openidm/jetty/JettyErrorHandler.java | 30 ++++++++++------- openidm-messaging/pom.xml | 6 ++-- .../openidm/messaging/MessagingService.java | 2 +- .../messaging/jms/JmsMessageSubscriber.java | 13 ++++---- .../jms/common/JmsContextManager.java | 5 +-- .../jms/common/JndiConfiguration.java | 5 +-- .../jms/common/JndiJmsContextManager.java | 5 +-- .../jms/common/SessionModeConfig.java | 3 +- .../messaging/MessagingServiceTest.java | 18 +++++----- .../internal/JettySecurityConfigurator.java | 6 ++-- .../stage/SocialUserDetailsStage.java | 3 +- .../servletregistration/RegisteredFilter.java | 5 +-- .../ServletRegistration.java | 9 ++--- .../impl/RegisteredFilterImpl.java | 4 ++- .../impl/ServletRegistrationSingleton.java | 14 ++++---- .../servletregistration/EmptyFilter.java | 12 +++---- .../ui/internal/service/ResourceServlet.java | 12 +++---- openidm-zip/pom.xml | 23 ++++++++----- openidm-zip/src/main/resources/conf/jetty.xml | 1 - .../resources/conf/servletfilter-cors.json | 2 +- .../src/main/java/SimpleConsumer.java | 19 ++++++----- .../trustedservletfilter/filter/pom.xml | 2 +- .../SampleTrustedServletFilter.java | 15 +++++---- pom.xml | 33 ++++++++++--------- 36 files changed, 169 insertions(+), 143 deletions(-) diff --git a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java index 8b770eb14..7ad56527d 100644 --- a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java +++ b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java @@ -12,21 +12,21 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions Copyrighted 2024 3A Systems LLC. + * Portions Copyrighted 2024-2025 3A Systems LLC. */ package org.forgerock.openidm.servlet.internal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Dictionary; import java.util.Hashtable; -import org.eclipse.jetty.ee8.servlet.ErrorPageErrorHandler; +import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; import org.forgerock.openidm.jetty.JettyErrorHandler; import org.forgerock.openidm.servletregistration.ServletRegistration; import org.ops4j.pax.web.service.WebContainer; @@ -36,7 +36,7 @@ import org.osgi.service.component.annotations.ConfigurationPolicy; import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; -import org.osgi.service.http.NamespaceException; +import org.ops4j.pax.web.service.http.NamespaceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java index b942de571..85c59358e 100644 --- a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java +++ b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2024 3A Systems LLC. + * Portions Copyrighted 2024-2025 3A Systems LLC. */ package org.forgerock.openidm.servlet.internal; @@ -27,8 +27,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import javax.script.ScriptException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; import org.forgerock.http.ApiProducer; import org.forgerock.http.DescribedHttpApplication; @@ -64,7 +64,7 @@ import org.osgi.service.event.Event; import org.osgi.service.event.EventHandler; import org.osgi.service.event.propertytypes.EventTopics; -import org.osgi.service.http.NamespaceException; +import org.ops4j.pax.web.service.http.NamespaceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RepositoryAuditEventHandler.java b/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RepositoryAuditEventHandler.java index 33134e022..7e646cf45 100644 --- a/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RepositoryAuditEventHandler.java +++ b/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RepositoryAuditEventHandler.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.audit.impl; @@ -21,7 +22,7 @@ import static org.forgerock.json.resource.Requests.newReadRequest; import static org.forgerock.util.promise.Promises.newResultPromise; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.forgerock.audit.Audit; import org.forgerock.audit.AuditingContext; diff --git a/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandler.java b/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandler.java index 48822bf5f..be5cf2775 100644 --- a/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandler.java +++ b/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandler.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.audit.impl; @@ -23,7 +24,7 @@ import static org.forgerock.util.promise.Promises.newResultPromise; import static org.forgerock.util.query.QueryFilter.equalTo; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticationService.java b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticationService.java index b51117ec1..567e6fd8e 100644 --- a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticationService.java +++ b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticationService.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS - * Portions Copyrighted 2024 3A Systems LLC. + * Portions copyright 2024-2025 3A Systems LLC. */ package org.forgerock.openidm.auth; @@ -27,7 +27,7 @@ import static org.forgerock.openidm.auth.modules.IDMAuthModuleWrapper.*; import static org.forgerock.openidm.idp.impl.IdentityProviderService.withoutClientSecret; -import javax.inject.Provider; +import jakarta.inject.Provider; import java.io.UnsupportedEncodingException; import java.security.Key; import java.util.ArrayList; diff --git a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticatorFactory.java b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticatorFactory.java index ee6ecf486..730c9bdaa 100644 --- a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticatorFactory.java +++ b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/AuthenticatorFactory.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.auth; -import javax.inject.Provider; +import jakarta.inject.Provider; import com.google.common.base.Function; import org.forgerock.json.JsonValue; diff --git a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/PassthroughAuthenticator.java b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/PassthroughAuthenticator.java index 452d50b65..8443c2c09 100644 --- a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/PassthroughAuthenticator.java +++ b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/PassthroughAuthenticator.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.auth; import static org.forgerock.util.Reject.checkNotNull; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.forgerock.json.resource.ActionResponse; import org.forgerock.json.resource.ConnectionFactory; diff --git a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java index 2eac9c923..956b4831a 100644 --- a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java +++ b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/ResourceQueryAuthenticator.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2015 ForgeRock AS. - * Portions copyright 2024 3A Systems LLC. + * Portions copyright 2024-2025 3A Systems LLC. */ package org.forgerock.openidm.auth; @@ -36,7 +36,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * Authenticator class which performs authentication against managed/internal user tables using a queryId to fetch diff --git a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/ClientCertAuthModule.java b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/ClientCertAuthModule.java index 29ffae59c..3750ec830 100644 --- a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/ClientCertAuthModule.java +++ b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/ClientCertAuthModule.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.auth.modules; @@ -213,7 +214,7 @@ private boolean usernameMatchesPatterns(String username) { // This is currently Jetty specific private X509Certificate[] getClientCerts(Context context) { Map requestAttributes = context.asContext(AttributesContext.class).getAttributes(); - Object checkCerts = requestAttributes.get("javax.servlet.request.X509Certificate"); + Object checkCerts = requestAttributes.get("jakarta.servlet.request.X509Certificate"); if (checkCerts instanceof X509Certificate[]) { return (X509Certificate[]) checkCerts; } else { diff --git a/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/ContextRegistrator.java b/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/ContextRegistrator.java index 616dd4e46..676fbeb18 100644 --- a/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/ContextRegistrator.java +++ b/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/ContextRegistrator.java @@ -21,7 +21,7 @@ * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * - * Portions Copyrighted 2024 3A Systems LLC. + * Portions Copyrighted 2024-2025 3A Systems LLC. */ package org.forgerock.openidm.http; @@ -42,7 +42,7 @@ import org.osgi.service.component.annotations.ConfigurationPolicy; import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; -import org.osgi.service.http.HttpContext; +import org.ops4j.pax.web.service.http.HttpContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/SecurityConfigurator.java b/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/SecurityConfigurator.java index d2802ef54..f1bda09ff 100644 --- a/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/SecurityConfigurator.java +++ b/openidm-httpcontext/src/main/java/org/forgerock/openidm/http/SecurityConfigurator.java @@ -20,12 +20,14 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2025 3A Systems LLC. */ package org.forgerock.openidm.http; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.HttpContext; -import org.osgi.service.http.HttpService; +import org.ops4j.pax.web.service.http.HttpContext ; +import org.ops4j.pax.web.service.http.HttpService; /** * Interface to configure security diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml index 11a83c605..095006908 100644 --- a/openidm-jetty-fragment/pom.xml +++ b/openidm-jetty-fragment/pom.xml @@ -81,15 +81,9 @@ - jakarta.servlet - jakarta.servlet-api + org.apache.felix + org.apache.felix.http.servlet-api - - - - - - diff --git a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java index 476289487..a9239154b 100644 --- a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java +++ b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java @@ -12,14 +12,15 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.jetty; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; import java.nio.ByteBuffer; @@ -28,16 +29,18 @@ import java.nio.file.Path; import java.nio.file.Paths; +import org.eclipse.jetty.ee10.servlet.ServletContextRequest; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.MimeTypes; -import org.eclipse.jetty.ee8.nested.Request; -import org.eclipse.jetty.ee8.nested.Response; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Response; +import org.eclipse.jetty.util.Callback; /** * Custom {@code org.eclipse.jetty.server.handler.ErrorHandler} implementation that removes sensitive information * from HTTP error-responses. */ -public class JettyErrorHandler extends org.eclipse.jetty.ee8.nested.ErrorHandler { +public class JettyErrorHandler extends org.eclipse.jetty.ee10.servlet.ErrorHandler { /** * Handles Jetty errors originating from HTTP requests. Add the following entry to {@code jetty.xml} or directly @@ -62,10 +65,13 @@ public class JettyErrorHandler extends org.eclipse.jetty.ee8.nested.ErrorHandler * @throws IOException I/O error */ @Override - public void handle(final String target, final Request baseRequest, final HttpServletRequest request, - final HttpServletResponse response) throws IOException { - baseRequest.setHandled(true); - outputErrorPageResponse(request, response); + public boolean handle(Request request, Response response, Callback callback) throws Exception { + ServletContextRequest servletContextRequest = Request.asInContext(request, ServletContextRequest.class); + HttpServletRequest httpServletRequest = servletContextRequest.getServletApiRequest(); + HttpServletResponse httpServletResponse = servletContextRequest.getHttpServletResponse(); + outputErrorPageResponse(httpServletRequest, httpServletResponse); + callback.succeeded(); + return true; } /** @@ -92,7 +98,7 @@ public static void outputErrorPageResponse(HttpServletRequest request, HttpServl response.setHeader(HttpHeader.CACHE_CONTROL.asString(), "must-revalidate,no-cache,no-store"); // clear any error-reasons from the response - ((Response) response).setStatusWithReason(status, null); + ((Response) response).setStatus(status); Path path = Paths.get(String.format("ui/errors/%1$d.html", status)); if (!Files.exists(path)) { diff --git a/openidm-messaging/pom.xml b/openidm-messaging/pom.xml index 7e916296f..aa2eb1e92 100644 --- a/openidm-messaging/pom.xml +++ b/openidm-messaging/pom.xml @@ -12,9 +12,9 @@ This bundle provides messaging subscription and publication support. - javax.jms - javax.jms-api - 2.0.1 + jakarta.jms + jakarta.jms-api + 3.0.0 org.openidentityplatform.openidm diff --git a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/MessagingService.java b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/MessagingService.java index 449eca950..27083673b 100644 --- a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/MessagingService.java +++ b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/MessagingService.java @@ -18,7 +18,7 @@ import static com.google.common.collect.FluentIterable.from; -import javax.jms.Message; +import jakarta.jms.Message; import java.util.ArrayList; import java.util.List; diff --git a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/JmsMessageSubscriber.java b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/JmsMessageSubscriber.java index 0c6a692a2..44ea3ffc4 100644 --- a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/JmsMessageSubscriber.java +++ b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/JmsMessageSubscriber.java @@ -12,14 +12,15 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.messaging.jms; -import javax.jms.Connection; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Session; import org.forgerock.json.JsonValue; import org.forgerock.json.resource.InternalServerErrorException; @@ -88,7 +89,7 @@ public void subscribe(final MessageHandler messageHandler) throws Resou connection.setExceptionListener(new SubscriptionExceptionListener(messageHandler)); session = connection.createSession(false, sessionMode.getMode()); session.createConsumer(contextManager.getDestination(), messageSelector) - .setMessageListener(new javax.jms.MessageListener() { + .setMessageListener(new jakarta.jms.MessageListener() { @Override public void onMessage(Message message) { String jmsMessageID = getMessageID(message); diff --git a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JmsContextManager.java b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JmsContextManager.java index 647ef81fb..ce55bc60e 100644 --- a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JmsContextManager.java +++ b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JmsContextManager.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.messaging.jms.common; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; import org.forgerock.json.resource.InternalServerErrorException; diff --git a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiConfiguration.java b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiConfiguration.java index 0bf2e85d3..caaf83516 100644 --- a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiConfiguration.java +++ b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiConfiguration.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.messaging.jms.common; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; import javax.naming.InitialContext; import java.util.Collections; import java.util.Map; diff --git a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiJmsContextManager.java b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiJmsContextManager.java index cedaeb638..aa75fe3d5 100644 --- a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiJmsContextManager.java +++ b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/JndiJmsContextManager.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.messaging.jms.common; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; import javax.naming.InitialContext; import javax.naming.NamingException; import java.util.Hashtable; diff --git a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/SessionModeConfig.java b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/SessionModeConfig.java index 96c56d8d0..01c6c7eb9 100644 --- a/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/SessionModeConfig.java +++ b/openidm-messaging/src/main/java/org/forgerock/openidm/messaging/jms/common/SessionModeConfig.java @@ -12,10 +12,11 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.messaging.jms.common; -import javax.jms.Session; +import jakarta.jms.Session; /** * Configuration wrapper for JMS {@link Session#getAcknowledgeMode()} SessionMode setting. diff --git a/openidm-messaging/src/test/java/org/forgerock/openidm/messaging/MessagingServiceTest.java b/openidm-messaging/src/test/java/org/forgerock/openidm/messaging/MessagingServiceTest.java index 6ce1fdfa5..8cd724caa 100644 --- a/openidm-messaging/src/test/java/org/forgerock/openidm/messaging/MessagingServiceTest.java +++ b/openidm-messaging/src/test/java/org/forgerock/openidm/messaging/MessagingServiceTest.java @@ -23,15 +23,15 @@ import static org.mockito.Mockito.*; import static org.mockito.Mockito.matches; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; import java.util.Hashtable; diff --git a/openidm-security-jetty/src/main/java/org/forgerock/openidm/http/internal/JettySecurityConfigurator.java b/openidm-security-jetty/src/main/java/org/forgerock/openidm/http/internal/JettySecurityConfigurator.java index 92f03c67c..02055b9dd 100644 --- a/openidm-security-jetty/src/main/java/org/forgerock/openidm/http/internal/JettySecurityConfigurator.java +++ b/openidm-security-jetty/src/main/java/org/forgerock/openidm/http/internal/JettySecurityConfigurator.java @@ -20,14 +20,16 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2025 3A Systems LLC. */ package org.forgerock.openidm.http.internal; import org.forgerock.openidm.http.SecurityConfigurator; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.HttpContext; -import org.osgi.service.http.HttpService; +import org.ops4j.pax.web.service.http.HttpContext; +import org.ops4j.pax.web.service.http.HttpService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openidm-selfservice/src/main/java/org/forgerock/openidm/selfservice/stage/SocialUserDetailsStage.java b/openidm-selfservice/src/main/java/org/forgerock/openidm/selfservice/stage/SocialUserDetailsStage.java index 25ecf4c76..347c79c40 100644 --- a/openidm-selfservice/src/main/java/org/forgerock/openidm/selfservice/stage/SocialUserDetailsStage.java +++ b/openidm-selfservice/src/main/java/org/forgerock/openidm/selfservice/stage/SocialUserDetailsStage.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.selfservice.stage; @@ -29,7 +30,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.forgerock.http.Client; diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/RegisteredFilter.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/RegisteredFilter.java index 6594c9c22..cd67f02c2 100644 --- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/RegisteredFilter.java +++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/RegisteredFilter.java @@ -21,12 +21,13 @@ * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * +* Portions Copyrighted 2025 3A Systems LLC. */ package org.forgerock.openidm.servletregistration; import java.util.UUID; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.forgerock.json.JsonValue; @@ -40,7 +41,7 @@ public interface RegisteredFilter extends Comparable { String FILTER_ORDER = "order"; /** - * Returns the registered filter's underlying javax.servlet.Filter object + * Returns the registered filter's underlying jakarta.servlet.Filter object * * @return the Filter object */ diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java index 457c3f6d6..22cd0fff8 100644 --- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java +++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java @@ -12,16 +12,17 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.servletregistration; -import javax.servlet.Servlet; -import javax.servlet.ServletException; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; import org.forgerock.json.JsonValue; -import org.osgi.service.http.HttpContext; -import org.osgi.service.http.NamespaceException; +import org.ops4j.pax.web.service.http.HttpContext; +import org.ops4j.pax.web.service.http.NamespaceException; import java.util.Dictionary; diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/RegisteredFilterImpl.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/RegisteredFilterImpl.java index 097d90aa0..939e6dbd5 100644 --- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/RegisteredFilterImpl.java +++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/RegisteredFilterImpl.java @@ -21,13 +21,15 @@ * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * +* Portions Copyrighted 2025 3A Systems LLC. +* */ package org.forgerock.openidm.servletregistration.impl; import java.util.Objects; import java.util.UUID; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.forgerock.json.JsonValue; import org.forgerock.openidm.servletregistration.RegisteredFilter; diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java index 0d1ffe993..345ed6115 100644 --- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java +++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java @@ -21,7 +21,7 @@ * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * - * Portions Copyrighted 2024 3A Systems LLC. + * Portions Copyrighted 2024-2025 3A Systems LLC. */ package org.forgerock.openidm.servletregistration.impl; @@ -44,10 +44,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.Filter; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonValue; @@ -65,8 +65,8 @@ import org.osgi.service.component.annotations.ConfigurationPolicy; import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; -import org.osgi.service.http.HttpContext; -import org.osgi.service.http.NamespaceException; +import org.ops4j.pax.web.service.http.HttpContext; +import org.ops4j.pax.web.service.http.NamespaceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openidm-servlet-registrator/src/test/java/org/forgerock/openidm/servletregistration/EmptyFilter.java b/openidm-servlet-registrator/src/test/java/org/forgerock/openidm/servletregistration/EmptyFilter.java index 061d285d6..462880131 100644 --- a/openidm-servlet-registrator/src/test/java/org/forgerock/openidm/servletregistration/EmptyFilter.java +++ b/openidm-servlet-registrator/src/test/java/org/forgerock/openidm/servletregistration/EmptyFilter.java @@ -1,12 +1,12 @@ package org.forgerock.openidm.servletregistration; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class EmptyFilter implements Filter { diff --git a/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java b/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java index 4e44b2b0e..c9702b57c 100644 --- a/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java +++ b/openidm-servlet/src/main/java/org/forgerock/openidm/ui/internal/service/ResourceServlet.java @@ -15,7 +15,7 @@ * limitations under the License. * * Portions copyright 2013-2015 ForgeRock AS. - * Portions Copyrighted 2024 3A Systems LLC. + * Portions Copyrighted 2024-2025 3A Systems LLC. */ package org.forgerock.openidm.ui.internal.service; @@ -29,10 +29,10 @@ import java.util.Hashtable; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.forgerock.json.JsonValue; import org.forgerock.openidm.config.enhanced.EnhancedConfig; @@ -48,7 +48,7 @@ import org.osgi.service.component.annotations.Modified; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferencePolicy; -import org.osgi.service.http.NamespaceException; +import org.ops4j.pax.web.service.http.NamespaceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index 130c76b49..ae947e1ff 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -361,16 +361,16 @@ --> - org.eclipse.jetty.ee8 - jetty-ee8-servlets + org.eclipse.jetty.ee10 + jetty-ee10-servlets org.eclipse.jetty jetty-server - org.eclipse.jetty.ee8 - jetty-ee8-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet @@ -384,11 +384,11 @@ org.apache.aries.spifly.dynamic.bundle 1.3.7 - - jakarta.servlet - jakarta.servlet-api - compile - + + + + + @@ -689,6 +689,11 @@ org.apache.commons commons-lang3 + + org.owasp.encoder + encoder + 1.3.1 + org.testng diff --git a/openidm-zip/src/main/resources/conf/jetty.xml b/openidm-zip/src/main/resources/conf/jetty.xml index c1e3f43b2..b3c32f3b5 100644 --- a/openidm-zip/src/main/resources/conf/jetty.xml +++ b/openidm-zip/src/main/resources/conf/jetty.xml @@ -324,7 +324,6 @@ - diff --git a/openidm-zip/src/main/resources/conf/servletfilter-cors.json b/openidm-zip/src/main/resources/conf/servletfilter-cors.json index e9f7a8099..0f1c76b75 100644 --- a/openidm-zip/src/main/resources/conf/servletfilter-cors.json +++ b/openidm-zip/src/main/resources/conf/servletfilter-cors.json @@ -13,5 +13,5 @@ "urlPatterns" : [ "/*" ], - "filterClass" : "org.eclipse.jetty.ee8.servlets.CrossOriginFilter" + "filterClass" : "org.eclipse.jetty.ee10.servlets.CrossOriginFilter" } \ No newline at end of file diff --git a/openidm-zip/src/main/resources/samples/audit-jms-sample/consumer/src/main/java/SimpleConsumer.java b/openidm-zip/src/main/resources/samples/audit-jms-sample/consumer/src/main/java/SimpleConsumer.java index 12e5cba19..0df7c1028 100644 --- a/openidm-zip/src/main/resources/samples/audit-jms-sample/consumer/src/main/java/SimpleConsumer.java +++ b/openidm-zip/src/main/resources/samples/audit-jms-sample/consumer/src/main/java/SimpleConsumer.java @@ -12,17 +12,18 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; import javax.naming.InitialContext; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml b/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml index 1df44fda6..8cc2a088a 100644 --- a/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml +++ b/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/pom.xml @@ -9,7 +9,7 @@ jakarta.servlet jakarta.servlet-api - 4.0.4 + 6.0.0 diff --git a/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/src/main/java/org/forgerock/openidm/sample/trustedservletfilter/SampleTrustedServletFilter.java b/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/src/main/java/org/forgerock/openidm/sample/trustedservletfilter/SampleTrustedServletFilter.java index ae6aba590..88fcd6616 100644 --- a/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/src/main/java/org/forgerock/openidm/sample/trustedservletfilter/SampleTrustedServletFilter.java +++ b/openidm-zip/src/main/resources/samples/trustedservletfilter/filter/src/main/java/org/forgerock/openidm/sample/trustedservletfilter/SampleTrustedServletFilter.java @@ -12,18 +12,19 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.openidm.sample.trustedservletfilter; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * A ServletFilter to demonstrate setting the request attribute via a special request header. diff --git a/pom.xml b/pom.xml index 0a99e8f1f..efe463c51 100644 --- a/pom.xml +++ b/pom.xml @@ -120,8 +120,9 @@ 2.0.0-alpha-1 2.9.4 2.2.220 - 10.0.0 + 11.0.0 12.0.22 + 4.0.2 1_2 4.27 9.6 @@ -140,7 +141,7 @@ 1.0.1 1.1.1 - 6.0.5 + 7.0.5 1.9.26 1.6.4 1.1.4 @@ -148,17 +149,17 @@ 1.1.2 3.6.4 - 1.2.2 + 1.3.0 2.1.20 1.4.3 1.4.1 - 4.8.12 + 5.0.12 2.1.0 1.1.8 1.0.10 - 1.0.4 + 1.1.0 1.0.4 - 1.2.0 + 6.1.0 scp://community.internal.forgerock.com/var/www/vhosts/openidm.forgerock.org/httpdocs @@ -434,7 +435,7 @@ jakarta.servlet jakarta.servlet-api - 4.0.4 + 6.1.0 provided @@ -651,8 +652,8 @@ ${paxweb.version} - org.eclipse.jetty.ee8 - jetty-ee8-servlets + org.eclipse.jetty.ee10 + jetty-ee10-servlets ${jetty.version} @@ -661,8 +662,8 @@ ${jetty.version} - org.eclipse.jetty.ee8 - jetty-ee8-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet ${jetty.version} @@ -718,27 +719,27 @@ org.glassfish.grizzly grizzly-framework - 2.4.4 + ${grizzly.version} org.glassfish.grizzly grizzly-http-servlet - 2.4.4 + ${grizzly.version} org.glassfish.grizzly grizzly-http - 2.4.4 + ${grizzly.version} org.glassfish.grizzly grizzly-http-server - 2.4.4 + ${grizzly.version} org.glassfish.grizzly grizzly-websockets - 2.4.4 + ${grizzly.version} From 443af7e3a01c1fdd3e4ecc877572e341eb87bbd9 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 29 Jul 2025 18:04:18 +0300 Subject: [PATCH 11/30] Migrate to OSGI compliant bundles --- custom-scripted-connector-bundler/pom.xml | 8 +------- openidm-zip/pom.xml | 6 ++++++ openidm-zip/src/main/assembly/zip.xml | 4 ++++ pom.xml | 5 +++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/custom-scripted-connector-bundler/pom.xml b/custom-scripted-connector-bundler/pom.xml index e8f58cc0c..ddc8ac282 100644 --- a/custom-scripted-connector-bundler/pom.xml +++ b/custom-scripted-connector-bundler/pom.xml @@ -94,13 +94,7 @@ com.github.jknack handlebars - 2.0.0 - - - org.mozilla - rhino - - + 4.4.0 org.slf4j diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index ae947e1ff..08c9f91a2 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -540,6 +540,12 @@ org.apache.tomcat tomcat-jdbc 7.0.53 + + + org.apache.tomcat + tomcat-juli + + org.apache.geronimo.ext.tomcat diff --git a/openidm-zip/src/main/assembly/zip.xml b/openidm-zip/src/main/assembly/zip.xml index 2c450e379..59c6cd138 100644 --- a/openidm-zip/src/main/assembly/zip.xml +++ b/openidm-zip/src/main/assembly/zip.xml @@ -1211,6 +1211,8 @@ jakarta.activation* org.bouncycastle:bc*-fips org.openjdk.nashorn:* + org.apache.felix:org.apache.felix.utils + org.codehaus.mojo:animal-sniffer-annotations @@ -1287,6 +1289,8 @@ xerces:xercesImpl xml-apis:xml-apis xml-resolver:xml-resolver + org.apache.felix:org.apache.felix.utils + org.codehaus.mojo:animal-sniffer-annotations diff --git a/pom.xml b/pom.xml index efe463c51..cd713024e 100644 --- a/pom.xml +++ b/pom.xml @@ -741,6 +741,11 @@ grizzly-websockets ${grizzly.version} + + org.codehaus.mojo + animal-sniffer-annotations + 1.24 + From 0992f353525bcee1cb8ee719c6e1d1ecfac4378e Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 30 Jul 2025 16:52:29 +0300 Subject: [PATCH 12/30] Set min JDK 17 in GitHub workflows --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 692f511fc..327a6eef1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [ '8', '11', '17', '21', '24' ] + java: [ '17', '21', '24' ] os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ] fail-fast: false steps: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 640651bcb..292c529ff 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Java for publishing to Maven Central Repository OSS uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '17' distribution: 'temurin' server-id: ossrh server-username: MAVEN_USERNAME diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e87f10a5..83057e685 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Java for publishing to Maven Central Repository OSS uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '17' distribution: 'temurin' server-id: ossrh server-username: MAVEN_USERNAME From de63d6b41552ff20c5cfa405dc6a8af6a0d4f967 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 31 Jul 2025 13:39:46 +0300 Subject: [PATCH 13/30] Set maven compiler version to 17 and remove deprecated profiles --- pom.xml | 70 ++++++++++++++------------------------------------------- 1 file changed, 17 insertions(+), 53 deletions(-) diff --git a/pom.xml b/pom.xml index cd713024e..684189c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -110,8 +110,8 @@ UTF-8 - 11 - 11 + 17 + 17 @@ -179,7 +179,12 @@ 1.17.2 1.0b3 - + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.io=ALL-UNNAMED + --add-opens java.base/java.security=ALL-UNNAMED + --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + @@ -355,55 +360,6 @@ - - set-compiler-release - - [9,) - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - 11 - - -XDignore.symbol.file - -Xlint:unchecked - - - - - - - - - jdk11.options - - [11,) - - - - --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED - - - - - jdk17.options - - [17,) - - - - --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.io=ALL-UNNAMED - --add-opens java.base/java.security=ALL-UNNAMED - --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED - - - @@ -798,7 +754,15 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 + + true + ${maven.compiler.target} + + -XDignore.symbol.file + -Xlint:unchecked + + org.apache.maven.plugins From 5a934a43ca871fdf51a83047ea7404861c97b9a6 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 31 Jul 2025 15:36:13 +0300 Subject: [PATCH 14/30] Add SECURITY.md --- SECURITY.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..40b632ced --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,18 @@ +# Security Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Version | Java Versions Support | EE | Supported | +|------------------------------------|-----------------------|------------|-----------------------------------------------| +| Open Identity Platform OpenIDM 7.x | 17 and later | Jakarta EE | :white_check_mark: | +| Open Identity Platform OpenIDM 6.x | 8 and later | Java EE | :white_check_mark: | +| Open Identity Platform OpenIDM 5.x | 8 and later | Java EE | :white_check_mark: | +| ForgeRock OpenIDM 5.x | 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | +| ForgeRock OpenIDM 4.x | 1.7, 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | + +## Reporting a Vulnerability + +Please create issue https://github.com/OpenIdentityPlatform/OpenIDM/issues/new?template=Bug_report.md \ No newline at end of file From 84e10b3d6c17e814710662076a7eec1a1404990f Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 31 Jul 2025 15:37:15 +0300 Subject: [PATCH 15/30] Set project version to 7.0.0 --- custom-scripted-connector-bundler/pom.xml | 4 ++-- openidm-api-servlet/pom.xml | 2 +- openidm-audit/pom.xml | 2 +- openidm-authnfilter/pom.xml | 2 +- openidm-cluster/pom.xml | 2 +- openidm-config/pom.xml | 2 +- openidm-core/pom.xml | 2 +- openidm-crypto/pom.xml | 2 +- openidm-customendpoint/pom.xml | 2 +- openidm-doc/pom.xml | 2 +- openidm-enhanced-config/pom.xml | 2 +- openidm-external-email/pom.xml | 2 +- openidm-external-rest/pom.xml | 2 +- openidm-felix-webconsole/pom.xml | 2 +- openidm-httpcontext/pom.xml | 2 +- openidm-identity-provider/pom.xml | 2 +- openidm-infoservice/pom.xml | 2 +- openidm-jetty-fragment/pom.xml | 2 +- openidm-keystore/pom.xml | 2 +- openidm-maintenance/pom.xml | 2 +- openidm-messaging/pom.xml | 2 +- openidm-policy/pom.xml | 2 +- openidm-provisioner-openicf/pom.xml | 2 +- openidm-provisioner/pom.xml | 2 +- openidm-quartz-fragment/pom.xml | 2 +- openidm-repo-jdbc/pom.xml | 2 +- openidm-repo-orientdb/pom.xml | 2 +- openidm-repo/pom.xml | 2 +- openidm-router/pom.xml | 2 +- openidm-scheduler/pom.xml | 2 +- openidm-script/pom.xml | 2 +- openidm-security-jetty/pom.xml | 2 +- openidm-security/pom.xml | 2 +- openidm-selfservice/pom.xml | 2 +- openidm-servlet-registrator/pom.xml | 2 +- openidm-servlet/pom.xml | 2 +- openidm-shell/pom.xml | 2 +- openidm-smartevent/pom.xml | 2 +- openidm-system/pom.xml | 2 +- openidm-util/pom.xml | 2 +- openidm-workflow-activiti/pom.xml | 2 +- openidm-zip/pom.xml | 2 +- pom.xml | 2 +- 43 files changed, 44 insertions(+), 44 deletions(-) diff --git a/custom-scripted-connector-bundler/pom.xml b/custom-scripted-connector-bundler/pom.xml index ddc8ac282..14c70e246 100644 --- a/custom-scripted-connector-bundler/pom.xml +++ b/custom-scripted-connector-bundler/pom.xml @@ -29,12 +29,12 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT org.openidentityplatform.openidm.tools custom-scripted-connector-bundler - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT OpenIDM Custom Scripted Groovy Connector Bundler This is a tool to bundle the Groovy connector using configured bundle name and configuration parameters without the user needing to write connector code manually (aside from the Groovy scripts). diff --git a/openidm-api-servlet/pom.xml b/openidm-api-servlet/pom.xml index f146317ef..004a899cd 100644 --- a/openidm-api-servlet/pom.xml +++ b/openidm-api-servlet/pom.xml @@ -20,7 +20,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-api-servlet bundle diff --git a/openidm-audit/pom.xml b/openidm-audit/pom.xml index fd36c5e83..3dd6eb071 100644 --- a/openidm-audit/pom.xml +++ b/openidm-audit/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-audit bundle diff --git a/openidm-authnfilter/pom.xml b/openidm-authnfilter/pom.xml index 47c0383d1..21b93f725 100644 --- a/openidm-authnfilter/pom.xml +++ b/openidm-authnfilter/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-authnfilter OpenIDM Authentication Filter diff --git a/openidm-cluster/pom.xml b/openidm-cluster/pom.xml index c12d27ea5..60ba07719 100644 --- a/openidm-cluster/pom.xml +++ b/openidm-cluster/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-cluster bundle diff --git a/openidm-config/pom.xml b/openidm-config/pom.xml index 8429777d9..d833d5bc2 100644 --- a/openidm-config/pom.xml +++ b/openidm-config/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-config bundle diff --git a/openidm-core/pom.xml b/openidm-core/pom.xml index da793a058..db1d7899a 100644 --- a/openidm-core/pom.xml +++ b/openidm-core/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-core bundle diff --git a/openidm-crypto/pom.xml b/openidm-crypto/pom.xml index f13d40207..3821f0a84 100644 --- a/openidm-crypto/pom.xml +++ b/openidm-crypto/pom.xml @@ -20,7 +20,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-crypto bundle diff --git a/openidm-customendpoint/pom.xml b/openidm-customendpoint/pom.xml index 354c7cf43..d0e52bfb6 100644 --- a/openidm-customendpoint/pom.xml +++ b/openidm-customendpoint/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-customendpoint bundle diff --git a/openidm-doc/pom.xml b/openidm-doc/pom.xml index 2916199fa..f0efaf69d 100644 --- a/openidm-doc/pom.xml +++ b/openidm-doc/pom.xml @@ -21,7 +21,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT OpenIDM Documentation diff --git a/openidm-enhanced-config/pom.xml b/openidm-enhanced-config/pom.xml index 6a8322b40..d9b26c1d2 100644 --- a/openidm-enhanced-config/pom.xml +++ b/openidm-enhanced-config/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-enhanced-config bundle diff --git a/openidm-external-email/pom.xml b/openidm-external-email/pom.xml index 07e30b1ec..4582167ef 100644 --- a/openidm-external-email/pom.xml +++ b/openidm-external-email/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-external-email bundle diff --git a/openidm-external-rest/pom.xml b/openidm-external-rest/pom.xml index 828a4d5b2..88c95faf9 100644 --- a/openidm-external-rest/pom.xml +++ b/openidm-external-rest/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-external-rest bundle diff --git a/openidm-felix-webconsole/pom.xml b/openidm-felix-webconsole/pom.xml index a26ec7b58..6e0855c25 100644 --- a/openidm-felix-webconsole/pom.xml +++ b/openidm-felix-webconsole/pom.xml @@ -19,7 +19,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 diff --git a/openidm-httpcontext/pom.xml b/openidm-httpcontext/pom.xml index 4ce5f055b..2edff5373 100644 --- a/openidm-httpcontext/pom.xml +++ b/openidm-httpcontext/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-httpcontext bundle diff --git a/openidm-identity-provider/pom.xml b/openidm-identity-provider/pom.xml index 987d71d05..5ca5d100d 100644 --- a/openidm-identity-provider/pom.xml +++ b/openidm-identity-provider/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-identity-provider OpenIDM Identity Provider Service diff --git a/openidm-infoservice/pom.xml b/openidm-infoservice/pom.xml index 35b7d60c5..b399cb282 100644 --- a/openidm-infoservice/pom.xml +++ b/openidm-infoservice/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT org.openidentityplatform.openidm openidm-infoservice diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml index 095006908..fba130fd8 100644 --- a/openidm-jetty-fragment/pom.xml +++ b/openidm-jetty-fragment/pom.xml @@ -20,7 +20,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-jetty-fragment bundle diff --git a/openidm-keystore/pom.xml b/openidm-keystore/pom.xml index 69fa51915..7fcee2aa0 100644 --- a/openidm-keystore/pom.xml +++ b/openidm-keystore/pom.xml @@ -19,7 +19,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 diff --git a/openidm-maintenance/pom.xml b/openidm-maintenance/pom.xml index a5e6fbce2..333b4f4dd 100644 --- a/openidm-maintenance/pom.xml +++ b/openidm-maintenance/pom.xml @@ -20,7 +20,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-maintenance OpenIDM maintenance, upgrade, and patching handler diff --git a/openidm-messaging/pom.xml b/openidm-messaging/pom.xml index aa2eb1e92..b3bc7f0bf 100644 --- a/openidm-messaging/pom.xml +++ b/openidm-messaging/pom.xml @@ -4,7 +4,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-messaging bundle diff --git a/openidm-policy/pom.xml b/openidm-policy/pom.xml index 08c1ee2e2..c64e09c47 100644 --- a/openidm-policy/pom.xml +++ b/openidm-policy/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-policy bundle diff --git a/openidm-provisioner-openicf/pom.xml b/openidm-provisioner-openicf/pom.xml index e65abc2cd..6a109839c 100644 --- a/openidm-provisioner-openicf/pom.xml +++ b/openidm-provisioner-openicf/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-provisioner-openicf bundle diff --git a/openidm-provisioner/pom.xml b/openidm-provisioner/pom.xml index 7fbe919f4..87d5a408c 100644 --- a/openidm-provisioner/pom.xml +++ b/openidm-provisioner/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-provisioner bundle diff --git a/openidm-quartz-fragment/pom.xml b/openidm-quartz-fragment/pom.xml index be38be693..87a66d946 100644 --- a/openidm-quartz-fragment/pom.xml +++ b/openidm-quartz-fragment/pom.xml @@ -27,7 +27,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-quartz-fragment OpenIDM Quartz Fragment diff --git a/openidm-repo-jdbc/pom.xml b/openidm-repo-jdbc/pom.xml index de0ebf8f1..30809e604 100644 --- a/openidm-repo-jdbc/pom.xml +++ b/openidm-repo-jdbc/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-repo-jdbc bundle diff --git a/openidm-repo-orientdb/pom.xml b/openidm-repo-orientdb/pom.xml index c6561770c..5d6dfffb1 100644 --- a/openidm-repo-orientdb/pom.xml +++ b/openidm-repo-orientdb/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-repo-orientdb bundle diff --git a/openidm-repo/pom.xml b/openidm-repo/pom.xml index 14b8adfde..cb5353c53 100644 --- a/openidm-repo/pom.xml +++ b/openidm-repo/pom.xml @@ -27,7 +27,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-repo OpenIDM repository common diff --git a/openidm-router/pom.xml b/openidm-router/pom.xml index 468d031d2..24045ea08 100644 --- a/openidm-router/pom.xml +++ b/openidm-router/pom.xml @@ -20,7 +20,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-router bundle diff --git a/openidm-scheduler/pom.xml b/openidm-scheduler/pom.xml index 64c034e27..201fb404c 100644 --- a/openidm-scheduler/pom.xml +++ b/openidm-scheduler/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-scheduler OpenIDM scheduler diff --git a/openidm-script/pom.xml b/openidm-script/pom.xml index ad8c9c1e6..98611ae58 100644 --- a/openidm-script/pom.xml +++ b/openidm-script/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-script bundle diff --git a/openidm-security-jetty/pom.xml b/openidm-security-jetty/pom.xml index be50365d3..6d30e4079 100644 --- a/openidm-security-jetty/pom.xml +++ b/openidm-security-jetty/pom.xml @@ -19,7 +19,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT org.openidentityplatform.openidm openidm-security-jetty diff --git a/openidm-security/pom.xml b/openidm-security/pom.xml index 3e0843a82..d9a15168f 100644 --- a/openidm-security/pom.xml +++ b/openidm-security/pom.xml @@ -20,7 +20,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-security bundle diff --git a/openidm-selfservice/pom.xml b/openidm-selfservice/pom.xml index 59ea68056..fe4b0a769 100644 --- a/openidm-selfservice/pom.xml +++ b/openidm-selfservice/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-selfservice bundle diff --git a/openidm-servlet-registrator/pom.xml b/openidm-servlet-registrator/pom.xml index 84128f9be..2af2969e4 100644 --- a/openidm-servlet-registrator/pom.xml +++ b/openidm-servlet-registrator/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-servlet-registrator bundle diff --git a/openidm-servlet/pom.xml b/openidm-servlet/pom.xml index 1d37a3b25..6b1f23ad8 100644 --- a/openidm-servlet/pom.xml +++ b/openidm-servlet/pom.xml @@ -29,7 +29,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-servlet OpenIDM Web Servlet diff --git a/openidm-shell/pom.xml b/openidm-shell/pom.xml index 23dc13d03..261eb8567 100644 --- a/openidm-shell/pom.xml +++ b/openidm-shell/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-shell OpenIDM Felix Gogo Shell diff --git a/openidm-smartevent/pom.xml b/openidm-smartevent/pom.xml index a42a8e1f9..2f03850d4 100644 --- a/openidm-smartevent/pom.xml +++ b/openidm-smartevent/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-smartevent bundle diff --git a/openidm-system/pom.xml b/openidm-system/pom.xml index a1a3f7953..b2e2805f6 100644 --- a/openidm-system/pom.xml +++ b/openidm-system/pom.xml @@ -19,7 +19,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-system bundle diff --git a/openidm-util/pom.xml b/openidm-util/pom.xml index d46e9b13d..9b43de7d7 100644 --- a/openidm-util/pom.xml +++ b/openidm-util/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-util bundle diff --git a/openidm-workflow-activiti/pom.xml b/openidm-workflow-activiti/pom.xml index 0df27e654..9bb9e48a0 100644 --- a/openidm-workflow-activiti/pom.xml +++ b/openidm-workflow-activiti/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-workflow-activiti OpenIDM Activiti BPMN 2.0 Integration diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml index 08c9f91a2..afbba1841 100644 --- a/openidm-zip/pom.xml +++ b/openidm-zip/pom.xml @@ -29,7 +29,7 @@ org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-zip OpenIDM ZIP file assembly diff --git a/pom.xml b/pom.xml index 684189c4e..7bc7905ea 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.openidentityplatform.openidm openidm-project - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT pom OpenIDM project OpenIDM is an open standards based Identity Management, Provisioning and Compliance solution. From 9aa815acd9c0b75c15c279b1966ce5074b52ab30 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 10:19:22 +0300 Subject: [PATCH 16/30] Update SECURITY.md --- SECURITY.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 40b632ced..4f3d3f683 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -5,13 +5,13 @@ Use this section to tell people about which versions of your project are currently being supported with security updates. -| Version | Java Versions Support | EE | Supported | -|------------------------------------|-----------------------|------------|-----------------------------------------------| -| Open Identity Platform OpenIDM 7.x | 17 and later | Jakarta EE | :white_check_mark: | -| Open Identity Platform OpenIDM 6.x | 8 and later | Java EE | :white_check_mark: | -| Open Identity Platform OpenIDM 5.x | 8 and later | Java EE | :white_check_mark: | -| ForgeRock OpenIDM 5.x | 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | -| ForgeRock OpenIDM 4.x | 1.7, 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | +| Version | Java Versions Support | EE | Supported | +|------------------------------------|-----------------------|------------|---------------------------------------------------------------------------------------------------------------------------------------------| +| Open Identity Platform OpenIDM 7.x | 17 and later | Jakarta EE | :white_check_mark: Community support, [approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | +| Open Identity Platform OpenIDM 6.x | 8 and later | Java EE | :white_check_mark: :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | +| Open Identity Platform OpenIDM 5.x | 8 and later | Java EE | :white_check_mark: :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | +| ForgeRock OpenIDM 5.x | 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | +| ForgeRock OpenIDM 4.x | 1.7, 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | ## Reporting a Vulnerability From 730dbb8521155effc7f1942f71f5779e23b973c5 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 10:19:41 +0300 Subject: [PATCH 17/30] Update SECURITY.md --- SECURITY.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 4f3d3f683..c56e9aad0 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -5,13 +5,13 @@ Use this section to tell people about which versions of your project are currently being supported with security updates. -| Version | Java Versions Support | EE | Supported | -|------------------------------------|-----------------------|------------|---------------------------------------------------------------------------------------------------------------------------------------------| -| Open Identity Platform OpenIDM 7.x | 17 and later | Jakarta EE | :white_check_mark: Community support, [approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | -| Open Identity Platform OpenIDM 6.x | 8 and later | Java EE | :white_check_mark: :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | -| Open Identity Platform OpenIDM 5.x | 8 and later | Java EE | :white_check_mark: :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | -| ForgeRock OpenIDM 5.x | 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | -| ForgeRock OpenIDM 4.x | 1.7, 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | +| Version | Java Versions Support | EE | Supported | +|------------------------------------|-----------------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------| +| Open Identity Platform OpenIDM 7.x | 17 and later | Jakarta EE | :white_check_mark: Community support, [approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | +| Open Identity Platform OpenIDM 6.x | 8 and later | Java EE | :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | +| Open Identity Platform OpenIDM 5.x | 8 and later | Java EE | :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) | +| ForgeRock OpenIDM 5.x | 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | +| ForgeRock OpenIDM 4.x | 1.7, 8 and later | Java EE | :x: upgrade to Open Identity Platform OpenIDM | ## Reporting a Vulnerability From 4303c73b2bf163c1ebfe87cbcbe8f147ea221e30 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 14:00:27 +0300 Subject: [PATCH 18/30] Update Docker Alpine image to JDK 17 --- Dockerfile-alpine | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile-alpine b/Dockerfile-alpine index b8b697d14..4d03824a5 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM alpine:latest LABEL org.opencontainers.image.authors="Open Identity Platform Community" @@ -6,13 +6,13 @@ ENV USER="openidm" ENV OPENIDM_OPTS="-server -XX:+UseContainerSupport -Dlogback.configurationFile=conf/logging-config.groovy" ENV OPENIDM_PASSWORD="openidm-admin" -ARG VERSION +ARG VERSION=6.3.0 WORKDIR /opt #COPY openidm-zip/target/openidm-*.zip ./ -RUN apk add --update --no-cache --virtual builddeps curl unzip \ +RUN apk add --update --no-cache --virtual builddeps curl unzip libc6-compat openjdk17-jre \ && apk upgrade --update --no-cache \ && apk add bash \ && apk update \ From 63f37fa2df75117e9cd1fdf24a2baa4dd3de0c9f Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 14:06:42 +0300 Subject: [PATCH 19/30] Update OpenICF to 2.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7bc7905ea..eb5fa6ac0 100644 --- a/pom.xml +++ b/pom.xml @@ -371,7 +371,7 @@ org.openidentityplatform openicf - 1.8.1-SNAPSHOT + 2.0.0-SNAPSHOT pom import From 430b9177de0af12f55364ab23ee45fa39bd0b8d9 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 14:29:38 +0300 Subject: [PATCH 20/30] restore openidm-ui --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb5fa6ac0..512b92707 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ openidm-security openidm-smartevent openidm-system - + openidm-ui openidm-util openidm-workflow-activiti openidm-maintenance From 74b720707fe48875bc966758cf6f7075e181592c Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 14:42:31 +0300 Subject: [PATCH 21/30] restore openidm-ui --- openidm-ui/openidm-ui-admin/pom.xml | 2 +- openidm-ui/openidm-ui-api/pom.xml | 2 +- openidm-ui/openidm-ui-common/pom.xml | 2 +- openidm-ui/openidm-ui-enduser/pom.xml | 2 +- openidm-ui/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openidm-ui/openidm-ui-admin/pom.xml b/openidm-ui/openidm-ui-admin/pom.xml index 4afb733e0..85abdfa7d 100644 --- a/openidm-ui/openidm-ui-admin/pom.xml +++ b/openidm-ui/openidm-ui-admin/pom.xml @@ -27,7 +27,7 @@ openidm-ui org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-ui-admin diff --git a/openidm-ui/openidm-ui-api/pom.xml b/openidm-ui/openidm-ui-api/pom.xml index 03ed7b1e3..9072af0e0 100644 --- a/openidm-ui/openidm-ui-api/pom.xml +++ b/openidm-ui/openidm-ui-api/pom.xml @@ -19,7 +19,7 @@ openidm-ui org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-ui-api diff --git a/openidm-ui/openidm-ui-common/pom.xml b/openidm-ui/openidm-ui-common/pom.xml index 52b89a52f..a8ae85fe0 100644 --- a/openidm-ui/openidm-ui-common/pom.xml +++ b/openidm-ui/openidm-ui-common/pom.xml @@ -27,7 +27,7 @@ openidm-ui org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-ui-common diff --git a/openidm-ui/openidm-ui-enduser/pom.xml b/openidm-ui/openidm-ui-enduser/pom.xml index df5e588a3..04c09ebed 100644 --- a/openidm-ui/openidm-ui-enduser/pom.xml +++ b/openidm-ui/openidm-ui-enduser/pom.xml @@ -27,7 +27,7 @@ openidm-ui org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT openidm-ui-enduser diff --git a/openidm-ui/pom.xml b/openidm-ui/pom.xml index 08f839d02..a45254fef 100644 --- a/openidm-ui/pom.xml +++ b/openidm-ui/pom.xml @@ -27,7 +27,7 @@ openidm-project org.openidentityplatform.openidm - 6.3.1-SNAPSHOT + 7.0.0-SNAPSHOT From f0174d2eb8b735808e6c9d5e4476182f6bcc50da Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 14:43:03 +0300 Subject: [PATCH 22/30] Set bunlde version range to [2.0.0.0,3) --- .../provisioner.openicf.json.template | 2 +- .../provisioner.openicf-adldap.json | 2 +- .../provisioner.openicf-saphr.json | 2 +- .../provisioner.openicf-sapr3.json | 2 +- .../asciidoc/connectors-guide/chap-ad.adoc | 2 +- .../asciidoc/connectors-guide/chap-csv.adoc | 2 +- .../connectors-guide/chap-google.adoc | 2 +- .../asciidoc/connectors-guide/chap-ldap.adoc | 2 +- .../connectors-guide/chap-powershell.adoc | 2 +- .../asciidoc/connectors-guide/chap-sap.adoc | 4 +- .../asciidoc/connectors-guide/chap-xml.adoc | 2 +- .../asciidoc/install-guide/chap-update.adoc | 2 +- .../integrators-guide/appendix-rest.adoc | 2 +- .../integrators-guide/chap-configuration.adoc | 2 +- .../integrators-guide/chap-resource-conf.adoc | 40 +++++++++---------- .../integrators-guide/chap-services.adoc | 2 +- .../samples-guide/chap-groovy-samples.adoc | 8 ++-- .../samples-guide/chap-kerberos-sample.adoc | 2 +- .../chap-powershell-samples.adoc | 4 +- .../impl/OpenICFProvisionerService.java | 4 +- .../provisioner.openicf-BusinessCSV.json | 2 +- ...rovisioner.openicf-errorBadNativeType.json | 2 +- .../config/provisioner.openicf-groovy.json | 2 +- .../provisioner.openicf-groovyremote.json | 2 +- .../config/provisioner.openicf-xml.json | 2 +- .../scheduler/SchedulerDetailsViewTest.js | 2 +- .../conf/provisioner.openicf-scriptedsql.json | 2 +- .../conf/provisioner.openicf-engineering.json | 2 +- .../conf/provisioner.openicf-hr.json | 2 +- .../resources/samples/powershell2AD/README | 2 +- .../samples/powershell2AzureAD/README.md | 2 +- .../provisioners/provisioner.openicf-ad.json | 2 +- .../provisioner.openicf-adldap.json | 2 +- .../provisioner.openicf-adldsldap.json | 2 +- .../provisioner.openicf-adpowershell.json | 2 +- ...provisioner.openicf-azureadpowershell.json | 2 +- .../provisioner.openicf-contractordb.json | 2 +- .../provisioners/provisioner.openicf-csv.json | 2 +- .../provisioner.openicf-kerberos.json | 2 +- .../provisioner.openicf-ldap.json | 2 +- .../provisioner.openicf-ldap2.json | 2 +- .../provisioner.openicf-opendjldap.json | 2 +- .../provisioner.openicf-racfldap.json | 2 +- .../provisioner.openicf-scriptedazure.json | 2 +- .../provisioner.openicf-scriptedcrest.json | 2 +- .../provisioner.openicf-scriptedrest.json | 2 +- .../provisioner.openicf-scriptedsql.json | 2 +- .../provisioners/provisioner.openicf-ssh.json | 2 +- .../provisioners/provisioner.openicf-xml.json | 2 +- .../conf/provisioner.openicf-xml_AD.json | 2 +- .../conf/provisioner.openicf-xml_LDAP.json | 2 +- .../provisioner.openicf-fakead.json | 2 +- .../conf/provisioner.openicf-scimxml.json | 2 +- .../samples/scriptedcrest2dj/README.md | 2 +- .../samples/scriptedrest2dj/README.md | 2 +- .../conf/provisioner.openicf-BusinessCSV.json | 2 +- .../conf/provisioner.openicf-HRldap.json | 2 +- .../conf/provisioner.openicf-csv.json | 2 +- .../conf/provisioner.openicf-xml.json | 2 +- 59 files changed, 84 insertions(+), 84 deletions(-) diff --git a/custom-scripted-connector-bundler/src/main/resources/provisioner.openicf.json.template b/custom-scripted-connector-bundler/src/main/resources/provisioner.openicf.json.template index f94428815..74452b949 100644 --- a/custom-scripted-connector-bundler/src/main/resources/provisioner.openicf.json.template +++ b/custom-scripted-connector-bundler/src/main/resources/provisioner.openicf.json.template @@ -6,7 +6,7 @@ "author" : "{{author}}", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.{{lower packageName}}-connector", - "bundleVersion" : "[1.4.0.0,2.0.0.0)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.{{lower packageName}}.{{packageName}}Connector" }, "producerBufferSize" : 100, diff --git a/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-adldap.json b/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-adldap.json index 19dd8b177..441ab4efe 100644 --- a/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-adldap.json +++ b/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-adldap.json @@ -4,7 +4,7 @@ "connectorHostRef": "#LOCAL", "connectorName" : "org.identityconnectors.ldap.LdapConnector", "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2)" + "bundleVersion" : "[2.0.0.0,3)" }, "poolConfigOption": { "maxObjects": 10, diff --git a/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-saphr.json b/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-saphr.json index ddc95eb4f..4b78ed8b2 100644 --- a/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-saphr.json +++ b/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-saphr.json @@ -4,7 +4,7 @@ "connectorHostRef" : "#LOCAL", "connectorName" : "org.forgerock.openicf.connectors.sap.SapConnector", "bundleName" : "org.forgerock.openicf.connectors.sap-connector", - "bundleVersion" : "1.4.0.0-SNAPSHOT" + "bundleVersion" : "[2.0.0.0,3)" }, "poolConfigOption" : { "maxObjects" : 10, diff --git a/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-sapr3.json b/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-sapr3.json index 5c018c23a..3e3652fc6 100644 --- a/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-sapr3.json +++ b/openidm-doc/src/main/asciidoc/attachments/provisioner.openicf-sapr3.json @@ -5,7 +5,7 @@ "connectorHostRef" : "#LOCAL", "connectorName" : "org.forgerock.openicf.connectors.sap.SapConnector", "bundleName" : "org.forgerock.openicf.connectors.sap-connector", - "bundleVersion" : "1.4.0.0-SNAPSHOT" + "bundleVersion" : "[2.0.0.0,3)" }, "poolConfigOption" : { "maxObjects" : 10, diff --git a/openidm-doc/src/main/asciidoc/connectors-guide/chap-ad.adoc b/openidm-doc/src/main/asciidoc/connectors-guide/chap-ad.adoc index 4794ad27c..013283621 100644 --- a/openidm-doc/src/main/asciidoc/connectors-guide/chap-ad.adoc +++ b/openidm-doc/src/main/asciidoc/connectors-guide/chap-ad.adoc @@ -81,7 +81,7 @@ The following configuration extract shows sample values for the `connectorRef` a "connectorHostRef" : "dotnet", "connectorName" : "Org.IdentityConnectors.ActiveDirectory.ActiveDirectoryConnector", "bundleName" : "ActiveDirectory.Connector", - "bundleVersion" : "[1.4.0.0,2.0.0.0)" + "bundleVersion" : "[2.0.0.0,3)" }, ... "configurationProperties" : { diff --git a/openidm-doc/src/main/asciidoc/connectors-guide/chap-csv.adoc b/openidm-doc/src/main/asciidoc/connectors-guide/chap-csv.adoc index 5cfab1cf2..e3791b9c9 100644 --- a/openidm-doc/src/main/asciidoc/connectors-guide/chap-csv.adoc +++ b/openidm-doc/src/main/asciidoc/connectors-guide/chap-csv.adoc @@ -38,7 +38,7 @@ The following example shows an excerpt of the provisioner configuration. The `co "connectorRef": { "connectorHostRef": "#LOCAL", "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector" } } diff --git a/openidm-doc/src/main/asciidoc/connectors-guide/chap-google.adoc b/openidm-doc/src/main/asciidoc/connectors-guide/chap-google.adoc index cd4f23535..12f8631fc 100644 --- a/openidm-doc/src/main/asciidoc/connectors-guide/chap-google.adoc +++ b/openidm-doc/src/main/asciidoc/connectors-guide/chap-google.adoc @@ -40,7 +40,7 @@ The following is an excerpt of the provisioner configuration file. This example "connectorHostRef": "#LOCAL", "connectorName": "org.forgerock.openicf.connectors.googleapps.GoogleAppsConnector", "bundleName": "org.forgerock.openicf.connectors.googleapps-connector", - "bundleVersion": "[1.4.0.0,2.0.0.0)" + "bundleVersion": "[2.0.0.0,3)" }, ---- The following excerpt shows the required configuration properties: diff --git a/openidm-doc/src/main/asciidoc/connectors-guide/chap-ldap.adoc b/openidm-doc/src/main/asciidoc/connectors-guide/chap-ldap.adoc index 0a46cc8f9..99517b306 100644 --- a/openidm-doc/src/main/asciidoc/connectors-guide/chap-ldap.adoc +++ b/openidm-doc/src/main/asciidoc/connectors-guide/chap-ldap.adoc @@ -51,7 +51,7 @@ The `connectorRef` configuration property provides information about the LDAP co "connectorHostRef": "#LOCAL", "connectorName": "org.identityconnectors.ldap.LdapConnector", "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" } } ---- diff --git a/openidm-doc/src/main/asciidoc/connectors-guide/chap-powershell.adoc b/openidm-doc/src/main/asciidoc/connectors-guide/chap-powershell.adoc index 0233f5129..732484352 100644 --- a/openidm-doc/src/main/asciidoc/connectors-guide/chap-powershell.adoc +++ b/openidm-doc/src/main/asciidoc/connectors-guide/chap-powershell.adoc @@ -157,7 +157,7 @@ $ curl \ "connectorRef" : { "connectorName" : "Org.Forgerock.OpenICF.Connectors.MsPowerShell.MsPowerShellConnector", "bundleName" : "MsPowerShell.Connector", - "bundleVersion" : "[1.4.3.0,2.0.0.0)" + "bundleVersion" : "[2.0.0.0,3)" }, "displayName" : "PowerShell Connector", "ok" : true diff --git a/openidm-doc/src/main/asciidoc/connectors-guide/chap-sap.adoc b/openidm-doc/src/main/asciidoc/connectors-guide/chap-sap.adoc index a2006c98e..599a2e6dd 100644 --- a/openidm-doc/src/main/asciidoc/connectors-guide/chap-sap.adoc +++ b/openidm-doc/src/main/asciidoc/connectors-guide/chap-sap.adoc @@ -204,7 +204,7 @@ $ curl \ "connectorRef" : { "connectorName" : "org.forgerock.openicf.connectors.sap.SapConnector", "bundleName" : "org.forgerock.openicf.connectors.sap-connector", - "bundleVersion" : "1.4.0.0" + "bundleVersion" : "2.0.0.0" }, "displayName" : "Sap Connector", "ok" : true @@ -569,7 +569,7 @@ $ curl \ "connectorRef": { "connectorName": "org.forgerock.openicf.connectors.sap.SapConnector", "bundleName": "org.forgerock.openicf.connectors.sap-connector", - "bundleVersion": "1.4.0.0" + "bundleVersion": "2.0.0.0" }, "displayName": "Sap Connector", "ok": true diff --git a/openidm-doc/src/main/asciidoc/connectors-guide/chap-xml.adoc b/openidm-doc/src/main/asciidoc/connectors-guide/chap-xml.adoc index 1680c1dd1..99d4b3fff 100644 --- a/openidm-doc/src/main/asciidoc/connectors-guide/chap-xml.adoc +++ b/openidm-doc/src/main/asciidoc/connectors-guide/chap-xml.adoc @@ -38,7 +38,7 @@ A sample XML connector configuration is provided in `path/to/openidm/samples/pro "connectorRef": { "connectorHostRef": "#LOCAL", "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" } } diff --git a/openidm-doc/src/main/asciidoc/install-guide/chap-update.adoc b/openidm-doc/src/main/asciidoc/install-guide/chap-update.adoc index 9bb99159a..f88898326 100644 --- a/openidm-doc/src/main/asciidoc/install-guide/chap-update.adoc +++ b/openidm-doc/src/main/asciidoc/install-guide/chap-update.adoc @@ -1031,7 +1031,7 @@ Check that your customizations work as expected, then port the changes for OpenI ---- "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.ldap.LdapConnector" }, ---- diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc index 819369f59..9a4eaf7aa 100644 --- a/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc +++ b/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc @@ -1033,7 +1033,7 @@ $ curl \ "ok": true, "displayName": "LDAP Connector", "connectorRef": { - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", "connectorName" : "org.identityconnectors.ldap.LdapConnector" }, diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc index 5a6237859..8ded4b15e 100644 --- a/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc +++ b/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc @@ -313,7 +313,7 @@ $ curl \ "name" : "xmlfile", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, ... diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/chap-resource-conf.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/chap-resource-conf.adoc index 14effeb13..1b17a6b8c 100644 --- a/openidm-doc/src/main/asciidoc/integrators-guide/chap-resource-conf.adoc +++ b/openidm-doc/src/main/asciidoc/integrators-guide/chap-resource-conf.adoc @@ -280,7 +280,7 @@ The `key` that you specify here must match the password that you set when you in "connectorRef" : { "connectorHostRef" : "csv", "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector" }, ... @@ -293,7 +293,7 @@ The `key` that you specify here must match the password that you set when you in * The `connectorHostRef` property indicates which remote connector server to use, and refers to the `name` property you specified in the `provisioner.openicf.connectorinfoprovider.json` file. -* The `bundleVersion : 1.5.1.4` must be exactly the same as the version of the CSV connector that you are using. If you specify a range here, the CSV connector version must be included in this range. +* The `bundleVersion : 2.0.0.0` must be exactly the same as the version of the CSV connector that you are using. If you specify a range here, the CSV connector version must be included in this range. * The `csvFile` property must specify the absolute path to the CSV data file that you copied to the remote host on which the Java Connector Server is running. @@ -329,7 +329,7 @@ $ curl \ "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.csvfile-connector", "connectorName": "org.forgerock.openicf.csvfile.CSVFileConnector", - "bundleVersion": "[1.5.1.4,2)" + "bundleVersion": "[2.0.0.0,3)" }, "displayName": "CSV File Connector", "ok": true @@ -463,7 +463,7 @@ The following example shows a connector reference object: ---- { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector", "connectorHostRef" : "host" } @@ -1649,63 +1649,63 @@ The preceding command therefore returns the following output: "displayName": "XML Connector", "bundleName": "org.openidentityplatform.openicf.connectors.xml-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.1.0.3,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.identityconnectors.ldap.LdapConnector", "displayName": "LDAP Connector", "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.forgerock.openicf.connectors.scriptedsql.ScriptedSQLConnector", "displayName": "Scripted SQL Connector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.forgerock.openicf.connectors.scriptedrest.ScriptedRESTConnector", "displayName": "Scripted REST Connector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.forgerock.openicf.connectors.scriptedcrest.ScriptedCRESTConnector", "displayName": "Scripted CREST Connector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.forgerock.openicf.connectors.groovy.ScriptedPoolableConnector", "displayName": "Scripted Poolable Groovy Connector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.forgerock.openicf.connectors.groovy.ScriptedConnector", "displayName": "Scripted Groovy Connector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.identityconnectors.databasetable.DatabaseTableConnector", "displayName": "Database Table Connector", "bundleName": "org.openidentityplatform.openicf.connectors.databasetable-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.1.0.2,2)" + "bundleVersion": "[2.0.0.0,3)" }, { "connectorName": "org.forgerock.openicf.csvfile.CSVFileConnector", "displayName": "CSV File Connector", "bundleName": "org.openidentityplatform.openicf.connectors.csvfile-connector", "systemType": "provisioner.openicf", - "bundleVersion": "[1.5.1.4,2)" + "bundleVersion": "[2.0.0.0,3)" } ] } @@ -1723,7 +1723,7 @@ $ curl \ {"connectorName": "org.forgerock.openicf.connectors.xml.XMLConnector", "displayName": "XML Connector", "bundleName": "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion": "[1.1.0.3,2)"} + "bundleVersion": "[2.0.0.0,3)"} }' \ "http//localhost:8080/openidm/system?_action=createCoreConfig" ---- @@ -1766,7 +1766,7 @@ This command returns a core connector configuration, similar to the following: "xmlFilePath": null }, "connectorRef": { - "bundleVersion": "[1.1.0.3,2)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "org.openidentityplatform.openicf.connectors.xml-connector", "displayName": "XML Connector", "connectorName": "org.forgerock.openicf.connectors.xml.XMLConnector" @@ -1820,7 +1820,7 @@ $ curl \ "maxObjects": 10 }, "connectorRef": { - "bundleVersion": "[1.1.0.3,2)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "org.openidentityplatform.openicf.connectors.xml-connector", "displayName": "XML Connector", "connectorName": "org.forgerock.openicf.connectors.xml.XMLConnector" @@ -1862,7 +1862,7 @@ $ curl \ "ok": true, "displayName": "LDAP Connector", "connectorRef": { - "bundleVersion": "[1.4.0.0,2)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", "connectorName": "org.identityconnectors.ldap.LdapConnector" }, @@ -1892,7 +1892,7 @@ $ curl \ "ok": true, "displayName": "LDAP Connector", "connectorRef": { - "bundleVersion": "[1.4.0.0,2)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", "connectorName": "org.identityconnectors.ldap.LdapConnector" }, @@ -1920,7 +1920,7 @@ $ curl \ "error": "localhost:1389", "displayName": "LDAP Connector", "connectorRef": { - "bundleVersion": "[1.4.0.0,2)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", "connectorName": "org.identityconnectors.ldap.LdapConnector" }, @@ -1946,7 +1946,7 @@ $ curl \ "name" : "xmlfile", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc index 65088771b..92e43e726 100644 --- a/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc +++ b/openidm-doc/src/main/asciidoc/integrators-guide/chap-services.adoc @@ -196,7 +196,7 @@ The `"connectorName"` must be the precise string from the connector configuratio "connectorRef" : { "connectorName" : "org.identityconnectors.ldap.LdapConnector", "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", ... ---- diff --git a/openidm-doc/src/main/asciidoc/samples-guide/chap-groovy-samples.adoc b/openidm-doc/src/main/asciidoc/samples-guide/chap-groovy-samples.adoc index 942768a14..5bcd4c26c 100644 --- a/openidm-doc/src/main/asciidoc/samples-guide/chap-groovy-samples.adoc +++ b/openidm-doc/src/main/asciidoc/samples-guide/chap-groovy-samples.adoc @@ -603,7 +603,7 @@ The connector configuration file for this sample (`samples/scriptedrest2dj/conf/ "connectorHostRef": "#LOCAL", "connectorName": "org.forgerock.openicf.connectors.scriptedrest.ScriptedRESTConnector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, ... ---- @@ -813,7 +813,7 @@ $ curl \ "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "connectorName": "org.forgerock.openicf.connectors.scriptedrest.ScriptedRESTConnector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, "displayName": "Scripted REST Connector", "ok": true @@ -1040,7 +1040,7 @@ The connector configuration file for this sample (`samples/scriptedcrest2dj/conf "connectorHostRef": "#LOCAL", "connectorName": "org.forgerock.openicf.connectors.scriptedcrest.ScriptedCRESTConnector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, ... ---- @@ -1241,7 +1241,7 @@ $ curl \ { "ok": true, "connectorRef": { - "bundleVersion": "[1.4.0.0,2)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "connectorName": "org.forgerock.openicf.connectors.scriptedcrest.ScriptedCRESTConnector" }, diff --git a/openidm-doc/src/main/asciidoc/samples-guide/chap-kerberos-sample.adoc b/openidm-doc/src/main/asciidoc/samples-guide/chap-kerberos-sample.adoc index 8e0f1eee7..d0b6fab5d 100644 --- a/openidm-doc/src/main/asciidoc/samples-guide/chap-kerberos-sample.adoc +++ b/openidm-doc/src/main/asciidoc/samples-guide/chap-kerberos-sample.adoc @@ -160,7 +160,7 @@ $ curl \ "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.kerberos-connector", "connectorName": "org.forgerock.openicf.connectors.kerberos.KerberosConnector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, "displayName": "Kerberos Connector", "ok": true diff --git a/openidm-doc/src/main/asciidoc/samples-guide/chap-powershell-samples.adoc b/openidm-doc/src/main/asciidoc/samples-guide/chap-powershell-samples.adoc index 7575e1fd0..b29af8b63 100644 --- a/openidm-doc/src/main/asciidoc/samples-guide/chap-powershell-samples.adoc +++ b/openidm-doc/src/main/asciidoc/samples-guide/chap-powershell-samples.adoc @@ -190,7 +190,7 @@ PS C:\ curl ` { "ok": true, "connectorRef": { - "bundleVersion": "[1.4.3.0,2.0.0.0)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "MsPowerShell.Connector", "connectorName": "Org.ForgeRock.OpenICF.Connectors.MsPowerShell.MsPowerShellConnector" }, @@ -873,7 +873,7 @@ $ curl \ "connectorRef": { "bundleName": "MsPowerShell.Connector", "connectorName": "Org.ForgeRock.OpenICF.Connectors.MsPowerShell.MsPowerShellConnector", - "bundleVersion": "[1.4.3.0,2.0.0.0)" + "bundleVersion": "[2.0.0.0,3)" }, "displayName": "PowerShell Connector ", "ok": true diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java index cdd0eeb03..81acbd4e0 100644 --- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java +++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java @@ -613,7 +613,7 @@ String getSource(final String objectClass, final String... optionalId) { * { * "connectorName": "org.identityconnectors.ldap.LdapConnector", * "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", - * "bundleVersion": "[1.1.0.1,2)" + * "bundleVersion": "[2.0.0.0,3)" * } , * "ok" : true * }} @@ -632,7 +632,7 @@ String getSource(final String objectClass, final String... optionalId) { * { * "connectorName": "org.identityconnectors.ldap.LdapConnector", * "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", - * "bundleVersion": "[1.4.0.0,2.0.0.0)" + * "bundleVersion": "[2.0.0.0,3)" * }, * "error": "connector not available", * "ok": false diff --git a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-BusinessCSV.json b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-BusinessCSV.json index 43425d5eb..428fd31b2 100644 --- a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-BusinessCSV.json +++ b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-BusinessCSV.json @@ -2,7 +2,7 @@ "name" : "business", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector", "connectorHostRef" : "testServer" }, diff --git a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-errorBadNativeType.json b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-errorBadNativeType.json index a89c609f7..a4abc7de4 100644 --- a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-errorBadNativeType.json +++ b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-errorBadNativeType.json @@ -2,7 +2,7 @@ "name": "errorBadNativeType", "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.3.0,2)", + "bundleVersion": "[2.0.0.0,3)", "connectorName": "org.forgerock.openicf.connectors.groovy.ScriptedConnector" }, "objectTypes": { diff --git a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovy.json b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovy.json index c50418cbc..24fda268f 100644 --- a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovy.json +++ b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovy.json @@ -2,7 +2,7 @@ "name": "groovy", "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.3.0,2)", + "bundleVersion": "[2.0.0.0,3)", "connectorName": "org.forgerock.openicf.connectors.groovy.ScriptedConnector" }, "poolConfigOption": { diff --git a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovyremote.json b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovyremote.json index 032c615eb..5b656bc11 100644 --- a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovyremote.json +++ b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-groovyremote.json @@ -2,7 +2,7 @@ "name": "groovyremote", "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.3.0,2)", + "bundleVersion": "[2.0.0.0,3)", "connectorName": "org.forgerock.openicf.connectors.groovy.ScriptedConnector", "connectorHostRef": "testServer" }, diff --git a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-xml.json b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-xml.json index 631288718..3335f512f 100644 --- a/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-xml.json +++ b/openidm-provisioner-openicf/src/test/resources/config/provisioner.openicf-xml.json @@ -3,7 +3,7 @@ "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-ui/openidm-ui-admin/src/test/qunit/org/forgerock/openidm/ui/admin/scheduler/SchedulerDetailsViewTest.js b/openidm-ui/openidm-ui-admin/src/test/qunit/org/forgerock/openidm/ui/admin/scheduler/SchedulerDetailsViewTest.js index 78fe1146a..f48318889 100644 --- a/openidm-ui/openidm-ui-admin/src/test/qunit/org/forgerock/openidm/ui/admin/scheduler/SchedulerDetailsViewTest.js +++ b/openidm-ui/openidm-ui-admin/src/test/qunit/org/forgerock/openidm/ui/admin/scheduler/SchedulerDetailsViewTest.js @@ -52,7 +52,7 @@ define([ "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector", "connectorName": "org.identityconnectors.ldap.LdapConnector", - "bundleVersion": "[1.4.0.0,2.0.0.0)" + "bundleVersion": "[2.0.0.0,3)" }, "displayName": "LDAP Connector", "ok": true } diff --git a/openidm-zip/src/main/resources/samples/audit-sample/conf/provisioner.openicf-scriptedsql.json b/openidm-zip/src/main/resources/samples/audit-sample/conf/provisioner.openicf-scriptedsql.json index 16c4821dd..912227041 100644 --- a/openidm-zip/src/main/resources/samples/audit-sample/conf/provisioner.openicf-scriptedsql.json +++ b/openidm-zip/src/main/resources/samples/audit-sample/conf/provisioner.openicf-scriptedsql.json @@ -2,7 +2,7 @@ "name" : "auditdb", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.scriptedsql.ScriptedSQLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-engineering.json b/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-engineering.json index 6bb037657..682e351ad 100644 --- a/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-engineering.json +++ b/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-engineering.json @@ -2,7 +2,7 @@ "name" : "engineering", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-hr.json b/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-hr.json index 42263bcf7..0ffa02dff 100644 --- a/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-hr.json +++ b/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-hr.json @@ -2,7 +2,7 @@ "name" : "hr", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/powershell2AD/README b/openidm-zip/src/main/resources/samples/powershell2AD/README index eeb45a445..cf73b301c 100644 --- a/openidm-zip/src/main/resources/samples/powershell2AD/README +++ b/openidm-zip/src/main/resources/samples/powershell2AD/README @@ -88,7 +88,7 @@ Returns: "connectorRef": { "connectorName": "Org.ForgeRock.OpenICF.Connectors.MsPowerShell.MsPowerShellConnector", "bundleName": "MsPowerShell.Connector", - "bundleVersion" : "[1.4.3.0,2.0.0.0)" + "bundleVersion" : "[2.0.0.0,3)" }, "ok": true } diff --git a/openidm-zip/src/main/resources/samples/powershell2AzureAD/README.md b/openidm-zip/src/main/resources/samples/powershell2AzureAD/README.md index f9e32bdae..86adac0c1 100644 --- a/openidm-zip/src/main/resources/samples/powershell2AzureAD/README.md +++ b/openidm-zip/src/main/resources/samples/powershell2AzureAD/README.md @@ -143,7 +143,7 @@ This class runs through variations of the calls below and validates that the Pow "connectorRef" : { "bundleName" : "MsPowerShell.Connector", "connectorName" : "Org.ForgeRock.OpenICF.Connectors.MsPowerShell.MsPowerShellConnector", - "bundleVersion" : "[1.4.3.0,2.0.0.0)" + "bundleVersion" : "[2.0.0.0,3)" }, "displayName" : "PowerShell Connector ", "ok" : true diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ad.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ad.json index bb4db0184..fb6447e4e 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ad.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ad.json @@ -4,7 +4,7 @@ "connectorHostRef" : "dotnet", "connectorName" : "Org.IdentityConnectors.ActiveDirectory.ActiveDirectoryConnector", "bundleName" : "ActiveDirectory.Connector", - "bundleVersion" : "[1.4.0.0,1.5.0.0)" + "bundleVersion" : "[2.0.0.0,3)" }, "poolConfigOption" : { "maxObjects" : 10, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldap.json index 885c28fb8..d2a23095d 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldap.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldap.json @@ -4,7 +4,7 @@ "connectorHostRef" : "#LOCAL", "connectorName" : "org.identityconnectors.ldap.LdapConnector", "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2)" + "bundleVersion" : "[2.0.0.0,3)" }, "configurationProperties" : { "host" : "", diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldsldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldsldap.json index 8529a5f13..d4311e7f9 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldsldap.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldsldap.json @@ -4,7 +4,7 @@ "connectorHostRef" : "#LOCAL", "connectorName" : "org.identityconnectors.ldap.LdapConnector", "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2)" + "bundleVersion" : "[2.0.0.0,3)" }, "poolConfigOption" : { "maxObjects" : 10, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adpowershell.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adpowershell.json index c94dda18e..dd8487542 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adpowershell.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adpowershell.json @@ -4,7 +4,7 @@ "connectorHostRef" : "dotnet", "connectorName" : "Org.ForgeRock.OpenICF.Connectors.MsPowerShell.MsPowerShellConnector", "bundleName" : "MsPowerShell.Connector", - "bundleVersion" : "[1.4.3.0,2.0.0.0)" + "bundleVersion" : "[2.0.0.0,3)" }, "poolConfigOption" : { "maxObjects" : 10, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-azureadpowershell.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-azureadpowershell.json index 38ced8bbd..d413edcbd 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-azureadpowershell.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-azureadpowershell.json @@ -5,7 +5,7 @@ "connectorHostRef" : "dotnet", "connectorName" : "Org.ForgeRock.OpenICF.Connectors.MsPowerShell.MsPowerShellConnector", "bundleName" : "MsPowerShell.Connector", - "bundleVersion" : "[1.4.3.0,2.0.0.0)" + "bundleVersion" : "[2.0.0.0,3)" }, "poolConfigOption" : { "maxObjects" : 10, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-contractordb.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-contractordb.json index ed26b63f5..99275ec6c 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-contractordb.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-contractordb.json @@ -3,7 +3,7 @@ "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.databasetable-connector", - "bundleVersion" : "[1.1.0.2,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.databasetable.DatabaseTableConnector" }, "poolConfigOption" : diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-csv.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-csv.json index 0b360d536..6aaf7ad16 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-csv.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-csv.json @@ -2,7 +2,7 @@ "name" : "csv", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-kerberos.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-kerberos.json index 485094cb2..5ff639530 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-kerberos.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-kerberos.json @@ -6,7 +6,7 @@ "author" : "ForgeRock", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.kerberos-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.kerberos.KerberosConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap.json index 3fd517820..d4f9d4b8b 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap.json @@ -2,7 +2,7 @@ "name" : "ldap", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.ldap.LdapConnector" }, "configurationProperties" : { diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap2.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap2.json index ba993145c..5dee3457d 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap2.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap2.json @@ -2,7 +2,7 @@ "name" : "ldap2", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.ldap.LdapConnector" }, "configurationProperties" : { diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-opendjldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-opendjldap.json index dc4e191c1..6556de82d 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-opendjldap.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-opendjldap.json @@ -2,7 +2,7 @@ "name" : "OpenDJ", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.ldap.LdapConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-racfldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-racfldap.json index c72a31a15..eacf83dd0 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-racfldap.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-racfldap.json @@ -5,7 +5,7 @@ { "connectorHostRef" : "#LOCAL", "bundleName" : "org.openidentityplatform.openicf.connectors.mainframe.openicf-racf-connector", - "bundleVersion" : "[1.1.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.racf.RacfConnector" }, "producerBufferSize" : 100, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedazure.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedazure.json index cad395a2e..ff7acf475 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedazure.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedazure.json @@ -4,7 +4,7 @@ "connectorHostRef": "#LOCAL", "connectorName": "org.forgerock.openicf.connectors.groovy.ScriptedConnector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, "operationTimeout": { "CREATE": -1, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedcrest.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedcrest.json index 3b5087a87..c8129bdb1 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedcrest.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedcrest.json @@ -4,7 +4,7 @@ "connectorHostRef": "#LOCAL", "connectorName": "org.forgerock.openicf.connectors.scriptedcrest.ScriptedCRESTConnector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, "poolConfigOption": { "maxObjects": 10, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedrest.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedrest.json index c544bab16..0d4569c83 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedrest.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedrest.json @@ -4,7 +4,7 @@ "connectorHostRef": "#LOCAL", "connectorName": "org.forgerock.openicf.connectors.scriptedrest.ScriptedRESTConnector", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, "poolConfigOption": { "maxObjects": 10, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedsql.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedsql.json index 634e949d1..3efc7bd4e 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedsql.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedsql.json @@ -2,7 +2,7 @@ "name" : "scriptedsql", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.groovy-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.scriptedsql.ScriptedSQLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ssh.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ssh.json index a2ac3af3f..39e956d73 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ssh.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ssh.json @@ -4,7 +4,7 @@ "description" : "SSH connector for performing operations remotely via SSH", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.ssh-connector", - "bundleVersion" : "[1.4.0.0,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.ssh.SSHConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-xml.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-xml.json index a2dc8a355..b0a38491f 100644 --- a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-xml.json +++ b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-xml.json @@ -2,7 +2,7 @@ "name" : "xmlfile", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_AD.json b/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_AD.json index 5d1245914..10a4029cc 100644 --- a/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_AD.json +++ b/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_AD.json @@ -2,7 +2,7 @@ "name" : "ad", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_LDAP.json b/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_LDAP.json index ef246fabc..af5a45a9a 100644 --- a/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_LDAP.json +++ b/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_LDAP.json @@ -2,7 +2,7 @@ "name" : "ldap", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-zip/src/main/resources/samples/sample6/alternatives/provisioner.openicf-fakead.json b/openidm-zip/src/main/resources/samples/sample6/alternatives/provisioner.openicf-fakead.json index b8ebb1142..4bc553013 100644 --- a/openidm-zip/src/main/resources/samples/sample6/alternatives/provisioner.openicf-fakead.json +++ b/openidm-zip/src/main/resources/samples/sample6/alternatives/provisioner.openicf-fakead.json @@ -2,7 +2,7 @@ "name" : "ad", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2.0.0.0)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.ldap.LdapConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/sample7/conf/provisioner.openicf-scimxml.json b/openidm-zip/src/main/resources/samples/sample7/conf/provisioner.openicf-scimxml.json index 5202440b0..823d43040 100644 --- a/openidm-zip/src/main/resources/samples/sample7/conf/provisioner.openicf-scimxml.json +++ b/openidm-zip/src/main/resources/samples/sample7/conf/provisioner.openicf-scimxml.json @@ -2,7 +2,7 @@ "name" : "xmlfile", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, "producerBufferSize" : 100, diff --git a/openidm-zip/src/main/resources/samples/scriptedcrest2dj/README.md b/openidm-zip/src/main/resources/samples/scriptedcrest2dj/README.md index 70b085f82..ee714cbd6 100644 --- a/openidm-zip/src/main/resources/samples/scriptedcrest2dj/README.md +++ b/openidm-zip/src/main/resources/samples/scriptedcrest2dj/README.md @@ -131,7 +131,7 @@ OpenIDM Instructions { "ok": true, "connectorRef": { - "bundleVersion": "[1.4.0.0,2)", + "bundleVersion": "[2.0.0.0,3)", "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "connectorName": "org.forgerock.openicf.connectors.scriptedcrest.ScriptedCRESTConnector" }, diff --git a/openidm-zip/src/main/resources/samples/scriptedrest2dj/README.md b/openidm-zip/src/main/resources/samples/scriptedrest2dj/README.md index f5dc16231..c332c9912 100644 --- a/openidm-zip/src/main/resources/samples/scriptedrest2dj/README.md +++ b/openidm-zip/src/main/resources/samples/scriptedrest2dj/README.md @@ -121,7 +121,7 @@ OpenIDM Instructions "connectorRef": { "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector", "connectorName": "org.forgerock.openicf.connectors.scriptedrest.ScriptedRESTConnector", - "bundleVersion": "[1.4.0.0,2)" + "bundleVersion": "[2.0.0.0,3)" }, "displayName": "Scripted REST Connector", "ok": true diff --git a/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-BusinessCSV.json b/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-BusinessCSV.json index 79ab226bc..1c91138a0 100644 --- a/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-BusinessCSV.json +++ b/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-BusinessCSV.json @@ -2,7 +2,7 @@ "name" : "business", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-HRldap.json b/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-HRldap.json index 7e6136dd6..0544a3911 100644 --- a/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-HRldap.json +++ b/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-HRldap.json @@ -2,7 +2,7 @@ "name" : "HR", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector", - "bundleVersion" : "[1.4.0.0,2.0.0.0)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.identityconnectors.ldap.LdapConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-csv.json b/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-csv.json index fe87f608a..7f9964b7e 100644 --- a/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-csv.json +++ b/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-csv.json @@ -2,7 +2,7 @@ "name" : "rolesFile", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector", - "bundleVersion" : "[1.5.1.4,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector" }, "poolConfigOption" : { diff --git a/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-xml.json b/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-xml.json index fc4dc69d0..68a9997e2 100644 --- a/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-xml.json +++ b/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-xml.json @@ -2,7 +2,7 @@ "name" : "xmlfile", "connectorRef" : { "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector", - "bundleVersion" : "[1.1.0.3,2)", + "bundleVersion" : "[2.0.0.0,3)", "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector" }, "producerBufferSize" : 100, From 4deb41f4abf82c3d9229c5c0ec0256c7aa921e4f Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 4 Aug 2025 15:10:20 +0300 Subject: [PATCH 23/30] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83ff332b5..0d2a3b8b4 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This project is licensed under the [Common Development and Distribution License * [OpenIDM ZIP](https://github.com/OpenIdentityPlatform/OpenIDM/releases) * [OpenIDM Docker](https://hub.docker.com/r/openidentityplatform/openidm/) (All OS) -Java 1.8+ required +Java 11 or later required ## How-to build For windows use: From cfbbc50d0c0b9bf69d606307d4e4cafbde6bb5bc Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 5 Aug 2025 10:27:22 +0300 Subject: [PATCH 24/30] remove deprecated platforms for Docker Alpine image --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 327a6eef1..83fc907a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,7 +157,7 @@ jobs: file: ./Dockerfile-alpine build-args: | VERSION=${{ env.release_version }} - platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le ,linux/arm64/8 + platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83057e685..d756f7c19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -201,7 +201,7 @@ jobs: file: ./Dockerfile-alpine build-args: | VERSION=${{ github.event.inputs.releaseVersion }} - platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le ,linux/arm64/8 + platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From a8d10eba50304148b75a50a3f9185cf3295b950b Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 5 Aug 2025 14:30:35 +0300 Subject: [PATCH 25/30] fix Docker Alpine image build --- Dockerfile-alpine | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 4d03824a5..fd789a7d0 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -6,13 +6,13 @@ ENV USER="openidm" ENV OPENIDM_OPTS="-server -XX:+UseContainerSupport -Dlogback.configurationFile=conf/logging-config.groovy" ENV OPENIDM_PASSWORD="openidm-admin" -ARG VERSION=6.3.0 +ARG VERSION WORKDIR /opt #COPY openidm-zip/target/openidm-*.zip ./ -RUN apk add --update --no-cache --virtual builddeps curl unzip libc6-compat openjdk17-jre \ +RUN apk add --update --no-cache --virtual builddeps curl unzip libc6-compat openjdk17 \ && apk upgrade --update --no-cache \ && apk add bash \ && apk update \ From 6cc14fc2804038386ebd91f6ea43b093045a6ea4 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 6 Aug 2025 11:18:08 +0300 Subject: [PATCH 26/30] update asm version to 9.8 to deal with JDK 24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 512b92707..f447f0b6a 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ 4.0.2 1_2 4.27 - 9.6 + 9.8 1.8.6_1 1.7.14_2 From 33c2989abf843b9f696bc701e84e7e2d993bdd72 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 6 Aug 2025 15:01:48 +0300 Subject: [PATCH 27/30] fix documentation build --- openidm-doc/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/openidm-doc/pom.xml b/openidm-doc/pom.xml index f0efaf69d..5af67d7be 100644 --- a/openidm-doc/pom.xml +++ b/openidm-doc/pom.xml @@ -37,7 +37,6 @@ unix Linux - 1.8 From 2d03baaff809fbc4787df2ff3b54901d599d64b5 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 11 Aug 2025 11:55:15 +0300 Subject: [PATCH 28/30] documentation update --- .../asciidoc/getting-started/chap-basic-install.adoc | 2 +- .../src/main/asciidoc/install-guide/chap-install.adoc | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openidm-doc/src/main/asciidoc/getting-started/chap-basic-install.adoc b/openidm-doc/src/main/asciidoc/getting-started/chap-basic-install.adoc index 73139d94f..c74ae7ff3 100644 --- a/openidm-doc/src/main/asciidoc/getting-started/chap-basic-install.adoc +++ b/openidm-doc/src/main/asciidoc/getting-started/chap-basic-install.adoc @@ -67,7 +67,7 @@ This section covers what you need to have on your system before running OpenIDM: * Operating System: Windows or UNIX/Linux. -* Java: Java Runtime Environment (JRE) Standard Edition (Java SE) 8, or later. Alternatively, you can use the same version of the Java Development Kit (JDK). On Linux, you may also install the OpenJDK package native to your updated Linux distribution. +* Java: Java Runtime Environment (JRE) Standard Edition (Java SE) 11, or later. Alternatively, you can use the same version of the Java Development Kit (JDK). On Linux, you may also install the OpenJDK package native to your updated Linux distribution. * At least 250 MB of free disk space. diff --git a/openidm-doc/src/main/asciidoc/install-guide/chap-install.adoc b/openidm-doc/src/main/asciidoc/install-guide/chap-install.adoc index ab94364d1..a76b22259 100644 --- a/openidm-doc/src/main/asciidoc/install-guide/chap-install.adoc +++ b/openidm-doc/src/main/asciidoc/install-guide/chap-install.adoc @@ -51,7 +51,7 @@ On Windows systems, you must set the `JAVA_HOME` environment variable to point t . Under System Variables, click New. -. Enter the Variable name (`JAVA_HOME`) and set the Variable value to the JRE installation directory, for example `C:\Program Files\Java\jre8`. +. Enter the Variable name (`JAVA_HOME`) and set the Variable value to the JRE installation directory, for example `C:\Program Files\Java\jre11`. . Click OK. @@ -80,9 +80,10 @@ Follow these steps to install OpenIDM: [source, console] ---- $ java -version -openjdk version "1.8.0_362" -OpenJDK Runtime Environment (Temurin)(build 1.8.0_362-b09) -OpenJDK 64-Bit Server VM (Temurin)(build 25.362-b09, mixed mode) +openjdk version "11.0.25" 2024-10-15 +OpenJDK Runtime Environment Temurin-11.0.25+9 (build 11.0.25+9) +OpenJDK 64-Bit Server VM Temurin-11.0.25+9 (build 11.0.25+9, mixed mode) + ---- . Download software releases from the link:https://github.com/OpenIdentityPlatform/OpenIDM/releases[GitHub, window=\_blank]. From c83dbee499a48e58d8edf700465fd14d7086226c Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 12 Aug 2025 10:45:01 +0300 Subject: [PATCH 29/30] Set min Java version in the README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d2a3b8b4..92e5c3029 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This project is licensed under the [Common Development and Distribution License * [OpenIDM ZIP](https://github.com/OpenIdentityPlatform/OpenIDM/releases) * [OpenIDM Docker](https://hub.docker.com/r/openidentityplatform/openidm/) (All OS) -Java 11 or later required +Java 17 or later required ## How-to build For windows use: From bda293160cb2f2fa1b52e356e04d17dd393ba0e7 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Tue, 12 Aug 2025 16:11:51 +0300 Subject: [PATCH 30/30] Update SECURITY.md --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index c56e9aad0..44a380e85 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -15,4 +15,4 @@ currently being supported with security updates. ## Reporting a Vulnerability -Please create issue https://github.com/OpenIdentityPlatform/OpenIDM/issues/new?template=Bug_report.md \ No newline at end of file +Please draft [security advisory](https://github.com/OpenIdentityPlatform/OpenIDM/security/advisories/new)