diff --git a/legal/THIRDPARTYREADME.txt b/legal/THIRDPARTYREADME.txt index 055d9b4617..0e7cd729f1 100644 --- a/legal/THIRDPARTYREADME.txt +++ b/legal/THIRDPARTYREADME.txt @@ -1323,8 +1323,8 @@ Copyright: Copyright (C) 2011-2014 by Yehuda Katz Version: i18next-1.7.3-min.js Copyright: Copyright (c)2014 Jan Mühlemann (jamuhl). -Version: jquery-2.1.1-min.js -Copyright: (c) 2005, 2014 jQuery Foundation, Inc. +Version: jquery-3.7.1-min.js +Copyright: (c) 2005, 2023 jQuery Foundation, Inc. Version: jquery.ba-dotimeout-1.0-min.js Copyright: Copyright (c) 2010 "Cowboy" Ben Alman diff --git a/openidm-ui/openidm-ui-admin/src/license/THIRD-PARTY.properties b/openidm-ui/openidm-ui-admin/src/license/THIRD-PARTY.properties index c563f84c02..0e33e7c8ec 100644 --- a/openidm-ui/openidm-ui-admin/src/license/THIRD-PARTY.properties +++ b/openidm-ui/openidm-ui-admin/src/license/THIRD-PARTY.properties @@ -27,7 +27,7 @@ org.forgerock.commons.ui.libs--font-awesome--4.5.0=MIT org.forgerock.commons.ui.libs--form2js--2.0-769718a=MIT org.forgerock.commons.ui.libs--handlebars--4.0.5=MIT org.forgerock.commons.ui.libs--i18next--1.7.3=MIT -org.forgerock.commons.ui.libs--jquery--2.1.1=MIT +org.forgerock.commons.ui.libs--jquery--3.7.1=MIT org.forgerock.commons.ui.libs--jquery-cron--f831f2=MIT org.forgerock.commons.ui.libs--js2form--2.0-769718a=MIT org.forgerock.commons.ui.libs--jsoneditor--0.7.9=MIT diff --git a/openidm-ui/openidm-ui-admin/src/main/js/main.js b/openidm-ui/openidm-ui-admin/src/main/js/main.js index d5132a075e..7144187176 100644 --- a/openidm-ui/openidm-ui-admin/src/main/js/main.js +++ b/openidm-ui/openidm-ui-admin/src/main/js/main.js @@ -39,7 +39,7 @@ require.config({ js2form: "libs/js2form-2.0-769718a", form2js: "libs/form2js-2.0-769718a", spin: "libs/spin-2.0.1-min", - jquery: "libs/jquery-2.1.1-min", + jquery: "libs/jquery-3.7.1-min", cron: "libs/jquery-cron-f831f2", xdate: "libs/xdate-0.8-min", doTimeout: "libs/jquery.ba-dotimeout-1.0-min", diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/util/Scheduler.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/util/Scheduler.js index 9f5205b8b3..9bcb16cbe3 100644 --- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/util/Scheduler.js +++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/util/Scheduler.js @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2025 3A Systems LLC. */ define([ @@ -283,7 +284,7 @@ define([ cronPeriod = cronDiv.find(".cron-period").find("select").find("option:selected").text(); - cronDiv.find(".cron-block").filter(function() { return $(this).css("display") === "inline"; }).each(function () { + cronDiv.find(".cron-block").filter(function() { return $(this).css("display") !== "none"; }).each(function () { $(this).find("select").find("option:not(:selected)").remove(); //$(this).find("select").remove(); readableTextArray.push($(this).text()); @@ -305,4 +306,4 @@ define([ }; return schedulerInstance; -}); +}); \ No newline at end of file diff --git a/openidm-ui/openidm-ui-enduser/src/license/THIRD-PARTY.properties b/openidm-ui/openidm-ui-enduser/src/license/THIRD-PARTY.properties index 0656c11234..685f809197 100644 --- a/openidm-ui/openidm-ui-enduser/src/license/THIRD-PARTY.properties +++ b/openidm-ui/openidm-ui-enduser/src/license/THIRD-PARTY.properties @@ -27,7 +27,7 @@ org.forgerock.commons.ui.libs--font-awesome--4.5.0=MIT org.forgerock.commons.ui.libs--form2js--2.0-769718a=MIT org.forgerock.commons.ui.libs--handlebars--4.0.5=MIT org.forgerock.commons.ui.libs--i18next--1.7.3=MIT -org.forgerock.commons.ui.libs--jquery--2.1.1=MIT +org.forgerock.commons.ui.libs--jquery--3.7.1=MIT org.forgerock.commons.ui.libs--jquery-ui--1.11.1=MIT org.forgerock.commons.ui.libs--js2form--2.0-769718a=MIT org.forgerock.commons.ui.libs--jsoneditor--0.7.9=MIT diff --git a/openidm-ui/openidm-ui-enduser/src/main/js/main.js b/openidm-ui/openidm-ui-enduser/src/main/js/main.js index 9e11522bf3..9fdfa7dd5c 100644 --- a/openidm-ui/openidm-ui-enduser/src/main/js/main.js +++ b/openidm-ui/openidm-ui-enduser/src/main/js/main.js @@ -38,7 +38,7 @@ require.config({ js2form: "libs/js2form-2.0-769718a", form2js: "libs/form2js-2.0-769718a", spin: "libs/spin-2.0.1-min", - jquery: "libs/jquery-2.1.1-min", + jquery: "libs/jquery-3.7.1-min", xdate: "libs/xdate-0.8-min", doTimeout: "libs/jquery.ba-dotimeout-1.0-min", handlebars: "libs/handlebars-4.0.5", diff --git a/openidm-ui/pom.xml b/openidm-ui/pom.xml index 4487612e24..1a3a909320 100644 --- a/openidm-ui/pom.xml +++ b/openidm-ui/pom.xml @@ -608,7 +608,7 @@ org.openidentityplatform.commons.ui.libs jquery - 2.1.1 + 3.7.1 js min https://cdnjs.cloudflare.com/ajax/libs/jquery/{version}/{artifactId}.{classifier}.{packaging} diff --git a/openidm-zip/src/license/THIRD-PARTY.properties b/openidm-zip/src/license/THIRD-PARTY.properties index 81401bb252..fa482adab4 100644 --- a/openidm-zip/src/license/THIRD-PARTY.properties +++ b/openidm-zip/src/license/THIRD-PARTY.properties @@ -8,7 +8,7 @@ org.forgerock.commons.ui.libs--CodeMirror--4.10=MIT org.forgerock.commons.ui.libs--backbone--1.1.2=MIT org.forgerock.commons.ui.libs--form2js--2.0=MIT org.forgerock.commons.ui.libs--i18next--1.7.3=MIT -org.forgerock.commons.ui.libs--jquery--2.1.1=MIT +org.forgerock.commons.ui.libs--jquery--3.7.1=MIT org.forgerock.commons.ui.libs--jquery-cron--r2427=MIT org.forgerock.commons.ui.libs--jquery-gentleSelect--0.1.3.1=MIT org.forgerock.commons.ui.libs--jquery-ui--1.11.1=MIT diff --git a/pom.xml b/pom.xml index 50f87ab914..121dd5919d 100644 --- a/pom.xml +++ b/pom.xml @@ -425,7 +425,7 @@ org.openidentityplatform openicf - 1.7.3 + 1.7.4-SNAPSHOT pom import