Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion legal/THIRDPARTYREADME.txt
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ Copyright: Copyright (c) 2009 Kazuhiko Arase
Version: qunit-1.15.0.js
Copyright: Copyright 2012-2014 The Dojo Foundation

Version: requirejs-2.1.14-min.js
Version: requirejs-2.3.7-min.js
Copyright: Copyright (c) 2010-2014, The Dojo Foundation

Version: spin-2.0.1-min.js
Expand Down
2 changes: 1 addition & 1 deletion openam-oauth2/src/main/resources/templates/CodeThanks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
done: true
};
</script>
<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs-2.3.7-min.js"></script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
baseUrl : "${baseUrl?js_string}/XUI"
};
</script>
<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs-2.3.7-min.js"></script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@
}
};
</script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.3.7-min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion openam-oauth2/src/main/resources/templates/page/error.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
}
</#if>
</script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.3.7-min.js"></script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
}
};
</script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.3.7-min.js"></script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
}
};
</script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
<script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.3.7-min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion openam-server-only/src/license/THIRD-PARTY.properties
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ org.forgerock.commons.ui.libs--qrcode--1.4.4=MIT
org.forgerock.commons.ui.libs--react--15.2.1=BSD
org.forgerock.commons.ui.libs--react-bootstrap--0.30.1=MIT
org.forgerock.commons.ui.libs--react-dom--15.2.1=BSD
org.forgerock.commons.ui.libs--requirejs--2.1.14=MIT
org.forgerock.commons.ui.libs--requirejs--2.3.7=MIT
org.forgerock.commons.ui.libs--selectize--0.12.1=Apache 2.0
org.forgerock.commons.ui.libs--selectize-non-standalone--0.12.1=Apache 2.0
org.forgerock.commons.ui.libs--spin--2.0.1=MIT
Expand Down
2 changes: 1 addition & 1 deletion openam-ui/openam-ui-ria/src/main/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
deps : ['main']
};
</script>
<script src="libs/requirejs-2.1.14-min.js"></script>
<script src="libs/requirejs-2.3.7-min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion openam-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
<artifactItem>
<groupId>org.openidentityplatform.commons.ui.libs</groupId>
<artifactId>requirejs</artifactId>
<version>2.1.14</version>
<version>2.3.7</version>
<classifier>min</classifier>
<packaging>js</packaging>
<downloadUrl>https://cdnjs.cloudflare.com/ajax/libs/require.js/{version}/require.{classifier}.{packaging}</downloadUrl>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<maven.compiler.source>8</maven.compiler.source>
<!-- Supress checkstyle errors on legacy com.iplanet and com.sun.identity packages -->
<checkstyleUnitTestSuppressionsLocation>checkstyle/suppressions.xml</checkstyleUnitTestSuppressionsLocation>
<opendj.version>4.10.1</opendj.version>
<opendj.version>4.10.2-SNAPSHOT</opendj.version>
<javadoc-utils.version>1.0.0</javadoc-utils.version>
<ant.contrib.version>1.0b3</ant.contrib.version>
<guice.version>3.0</guice.version>
Expand Down
Loading