Skip to content

Commit 33b76d7

Browse files
maximthomasmaximthomas
committed
Merge branch 'master' into update-jdk-11-test-merge-tmp-remove
2 parents 3d96d73 + 9d99e38 commit 33b76d7

File tree

8 files changed

+2475
-4174
lines changed

8 files changed

+2475
-4174
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
java: [ '11', '17', '21', '24' ]
13+
java: [ '11', '17', '21', '25' ]
1414
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
1515
fail-fast: false
1616
steps:

‎openam-ui/openam-ui-api/package-lock.json‎

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

‎openam-ui/openam-ui-api/package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
"start": "grunt"
88
},
99
"devDependencies": {
10-
"grunt": "^1.4.1",
10+
"grunt": "^1.6.1",
1111
"grunt-cli": "1.4.3",
1212
"grunt-contrib-copy": "1.0.0"
1313
},
1414
"dependencies": {
15-
"swagger-ui-dist": ">=3.24.0",
16-
"swagger-ui-themes": "3.0.0",
17-
"swagger-ui": ">=5.20.1"
15+
"swagger-ui-dist": ">=5.29.0"
1816
}
1917
}

‎openam-ui/openam-ui-api/src/main/resources/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
information: "Portions Copyrighted [year] [name of copyright owner]".
1414
1515
Copyright 2016 ForgeRock AS
16-
Portions copyright 2019 Open Identity Community
16+
Portions copyright 2019-2025 3A Systems LLC.
1717
-->
1818
<html>
1919
<head>
@@ -76,7 +76,7 @@
7676
};
7777

7878
const ui = SwaggerUIBundle({
79-
url: "https://petstore.swagger.io/v2/swagger.json",
79+
url: url,
8080
dom_id: '#swagger-ui',
8181
deepLinking: true,
8282
presets: [
@@ -86,7 +86,7 @@
8686
plugins: [
8787
SwaggerUIBundle.plugins.DownloadUrl
8888
],
89-
layout: "StandaloneLayout"
89+
layout: "BaseLayout"
9090
})
9191
// End Swagger UI call region
9292

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,16 @@ module.exports = function (grunt) {
8787
}
8888
},
8989
ignore: ["libs/"],
90-
presets: ["env", "react"],
91-
plugins: [
92-
["transform-es2015-classes", { "loose": true }],
93-
"transform-object-rest-spread"
94-
]
90+
presets: [
91+
["@babel/preset-env", { "targets": "> 0.2%, not dead, last 2 versions" }],
92+
"@babel/preset-react"],
93+
plugins: [["@babel/plugin-transform-classes", { "loose": true }]]
9594
},
9695
transpileJS: {
9796
files: [{
9897
expand: true,
9998
cwd: compositionDirectory,
100-
src: ["**/*.js"],
99+
src: ["**/*.js", "!libs/**/*.js"],
101100
dest: transpiledDirectory
102101
}]
103102
},
@@ -112,7 +111,7 @@ module.exports = function (grunt) {
112111
}
113112
}],
114113
options: {
115-
plugins: ["transform-es2015-modules-amd"]
114+
plugins: ["@babel/plugin-transform-modules-amd"]
116115
}
117116
}
118117
},
@@ -160,6 +159,14 @@ module.exports = function (grunt) {
160159
],
161160
dest: compiledDirectory
162161
}]
162+
},
163+
libraries: {
164+
files: [{
165+
expand: true,
166+
cwd: compositionDirectory,
167+
src: ["libs/**/*.js"],
168+
dest: transpiledDirectory
169+
}]
163170
}
164171
},
165172
eslint: {
@@ -370,6 +377,7 @@ module.exports = function (grunt) {
370377
"copy:compose",
371378
"eslint",
372379
"babel",
380+
"copy:libraries",
373381
"requirejs",
374382
"less",
375383
"replace",

‎openam-ui/openam-ui-ria/karma.conf.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module.exports = function (config) {
2323
babelPreprocessor: {
2424
options: {
2525
ignore: ["libs/"],
26-
presets: ["env"]
26+
presets: [["@babel/preset-env", { "targets": "> 0.2%, not dead, last 2 versions" }],]
2727
}
2828
},
2929
reporters: ["notify", "nyan"],

0 commit comments

Comments
 (0)