Skip to content

Commit 4c98ce2

Browse files
authored
CVE-2019-11358 CVE-2020-11023 Update jQuery to 3.7.1 (#878)
1 parent ea2bad2 commit 4c98ce2

File tree

33 files changed

+193
-138
lines changed

33 files changed

+193
-138
lines changed

legal/THIRDPARTYREADME.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -854,8 +854,8 @@ Copyright: Copyright (c)2014 Jan Mühlemann (jamuhl).
854854
Version: jquery-1.11.1-min.js
855855
Copyright: Copyright (c) 2005, 2014 jQuery Foundation, Inc.
856856

857-
Version: jquery-2.1.1-min.js
858-
Copyright: Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
857+
Version: jquery-3.7.1-min.js
858+
Copyright: Copyright 2005, 2023 jQuery Foundation, Inc. and other contributors
859859

860860
Version: bootstrap-clockpicker-0.0.7-min.js
861861
Copyright: Copyright 2014 Wang Shenwei.

openam-server-only/src/license/THIRD-PARTY.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ org.forgerock.commons.ui.libs--font-awesome--4.5.0=MIT
5656
org.forgerock.commons.ui.libs--form2js--2.0-769718a=MIT
5757
org.forgerock.commons.ui.libs--handlebars--4.0.5=MIT
5858
org.forgerock.commons.ui.libs--i18next--1.7.3=MIT
59-
org.forgerock.commons.ui.libs--jquery--2.1.1=MIT
59+
org.forgerock.commons.ui.libs--jquery--3.7.1=MIT
6060
org.forgerock.commons.ui.libs--jquery-nestingSortable--0.9.12=BSD
6161
org.forgerock.commons.ui.libs--jquery.placeholder--2.0.8=MIT
6262
org.forgerock.commons.ui.libs--js2form--2.0-769718a=MIT

openam-server-only/src/main/webapp/js/jquery.js

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openam-ui/openam-ui-ria/Gruntfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2015-2016 ForgeRock AS.
15+
* Portions copyright 2025 3A Systems LLC.
1516
*/
1617

1718
/* global module, require, process */

openam-ui/openam-ui-ria/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"prejsdoc": "npm run clean:jsdoc -s",
99
"jsdoc": "jsdoc --configure config/jsdoc/configuration.json",
1010
"start": "grunt",
11-
"build:production": "cross-env NODE_ENV=production grunt prod",
11+
"build:production": "cross-env NODE_ENV=production grunt prod --verbose",
1212
"test": "grunt karma:dev",
1313
"predeps": "npm run clean:deps -s",
1414
"deps": "ncu -u && mvn clean install",

openam-ui/openam-ui-ria/src/main/js/config/ThemeConfiguration.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2015-2016 ForgeRock AS.
15+
* Portions copyright 2025 3A Systems LLC.
1516
*/
1617

1718
define({

openam-ui/openam-ui-ria/src/main/js/main-authorize.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
* with the fields enclosed by brackets [] replaced by
2121
* your own identifying information:
2222
* "Portions Copyrighted [year] [name of copyright owner]"
23+
*
24+
* Portions Copyrighted 2025 3A Systems LLC.
2325
*/
2426

2527
require.config({
@@ -34,7 +36,7 @@ require.config({
3436
paths: {
3537
"handlebars": "libs/handlebars-4.7.7",
3638
"i18next": "libs/i18next-1.7.3-min",
37-
"jquery": "libs/jquery-2.1.1-min",
39+
"jquery": "libs/jquery-3.7.1-min",
3840
"lodash": "libs/lodash-3.10.1-min",
3941
"redux": "libs/redux-3.5.2-min",
4042
"text": "libs/text-2.0.15"

openam-ui/openam-ui-ria/src/main/js/main-device.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2015-2016 ForgeRock AS.
15+
* Portions copyright 2025 3A Systems LLC.
1516
*/
1617

1718
require.config({
@@ -26,7 +27,7 @@ require.config({
2627
paths: {
2728
"handlebars": "libs/handlebars-4.7.7",
2829
"i18next": "libs/i18next-1.7.3-min",
29-
"jquery": "libs/jquery-2.1.1-min",
30+
"jquery": "libs/jquery-3.7.1-min",
3031
"lodash": "libs/lodash-3.10.1-min",
3132
"redux": "libs/redux-3.5.2-min",
3233
"text": "libs/text-2.0.15"

openam-ui/openam-ui-ria/src/main/js/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Portions copyright 2011-2016 ForgeRock AS.
15+
* Portions copyright 2025 3A Systems LLC.
1516
*/
1617

1718
require.config({
@@ -55,7 +56,7 @@ require.config({
5556
"form2js" : "libs/form2js-2.0-769718a",
5657
"handlebars" : "libs/handlebars-4.7.7",
5758
"i18next" : "libs/i18next-1.7.3-min",
58-
"jquery" : "libs/jquery-2.1.1-min",
59+
"jquery" : "libs/jquery-3.7.1-min",
5960
"js2form" : "libs/js2form-2.0-769718a",
6061
"jsonEditor" : "libs/jsoneditor-0.7.23-custom",
6162
"lodash" : "libs/lodash-3.10.1-min",

openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditEnvironmentView.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Portions copyright 2014-2016 ForgeRock AS.
15+
* Portions copyright 2025 3A Systems LLC.
1516
*/
1617

1718
define([
@@ -61,7 +62,7 @@ define([
6162

6263
this.data.conditions = _.sortBy(this.data.conditions, "i18nKey");
6364

64-
UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
65+
return UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
6566
self.$el.append(tpl);
6667
self.setElement(`#environment_${itemID}`);
6768

0 commit comments

Comments
 (0)