Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java 21 upgrades #1005

Merged
merged 23 commits into from
Mar 13, 2025
+687 −386
Merged

Java 21 upgrades #1005

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f9aae76
WIP j21 upgrade
malmgrens4 Jan 30, 2025
9a423bf
Merge branch 'master' of github.com:codice/ddf-ui into ddf-ui-21-upgrade
alexabird Feb 19, 2025
5ca87f7
Prepare for next DDF release
alexabird Feb 17, 2025
d679dec
Compile with j17
alexabird Feb 19, 2025
8fff86c
Update DDF version
alexabird Feb 19, 2025
4c7fb39
Remove require-capability
alexabird Feb 19, 2025
2300be1
Merge branch 'master' of github.com:codice/ddf-ui into ddf-ui-21-upgrade
alexabird Feb 20, 2025
41a9f08
Attempt to specify context
alexabird Feb 21, 2025
dbe4733
upgrade osgi to 7.0.0
glenhein Feb 28, 2025
8759558
Update maven-assembly-plugin version for windows build
derekwilhelm Mar 5, 2025
6dd8abb
Merge branch 'master' of github.com:codice/ddf-ui into ddf-ui-21-upgrade
alexabird Mar 5, 2025
be7ae71
Match jetty.version
alexabird Mar 5, 2025
50b31cf
Use latest ace
alexabird Mar 6, 2025
9df98e9
Update pax-web version
alexabird Mar 7, 2025
dcde66a
servlet context helpers/ route updates
malmgrens4 Mar 7, 2025
968195e
audit endpoint fix
malmgrens4 Mar 7, 2025
7a1b516
boolean fix and camel proxy change(?)
malmgrens4 Mar 8, 2025
8e23726
Merge branch 'master' of github.com:codice/ddf-ui into ddf-ui-21-upgrade
alexabird Mar 8, 2025
43e65be
Fix GSON Instant serialization for EndpointUtil
derekwilhelm Mar 11, 2025
2a297fb
Merge branch 'master' of github.com:codice/ddf-ui into ddf-ui-21-upgrade
alexabird Mar 13, 2025
e55be63
Upgrade to j21
alexabird Mar 13, 2025
2f01d5a
Cleanup
alexabird Mar 13, 2025
5834bd8
Uncomment bundle
alexabird Mar 13, 2025
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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Use latest ace
@alexabird
alexabird committed Mar 6, 2025
commit 50b31cfa7aa201f02836e3c3622a7a25f105d0f1
2 changes: 1 addition & 1 deletion ui-frontend/package.json
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
"node": "20.x.x"
},
"devDependencies": {
"@connexta/ace": "git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575",
"@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
"mkdirp": "3.0.1",
"rimraf": "6.0.1"
},
2 changes: 1 addition & 1 deletion ui-frontend/packages/admin/package.json
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
"@types/react": "16.9.34",
"@types/react-dom": "16.9.7",
"@types/styled-components": "5.1.0",
"@connexta/ace": "git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575",
"@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
"npm": "10.9.2"
},
"dependencies": {
51 changes: 44 additions & 7 deletions ui-frontend/packages/admin/yarn.lock
View file
Original file line number Diff line number Diff line change
@@ -1039,7 +1039,20 @@
"@babel/parser" "^7.25.9"
"@babel/types" "^7.25.9"

"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3", "@babel/traverse@^7.25.3", "@babel/traverse@^7.25.9", "@babel/traverse@^7.26.5", "@babel/traverse@^7.4.5":
"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3":
version "7.26.5"
resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz"
integrity sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==
dependencies:
"@babel/code-frame" "^7.26.2"
"@babel/generator" "^7.26.5"
"@babel/parser" "^7.26.5"
"@babel/template" "^7.25.9"
"@babel/types" "^7.26.5"
debug "^4.3.1"
globals "^11.1.0"

"@babel/traverse@^7.25.3", "@babel/traverse@^7.25.9", "@babel/traverse@^7.26.5", "@babel/traverse@^7.4.5":
version "7.26.5"
resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz"
integrity sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==
@@ -1060,10 +1073,9 @@
"@babel/helper-string-parser" "^7.25.9"
"@babel/helper-validator-identifier" "^7.25.9"

"@connexta/ace@git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575":
"@connexta/ace@git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f":
version "1.0.0"
resolved "git+ssh://[email protected]/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575"
integrity sha512-RdP5xKaUjVGQZG1M09gPjYndwCzusO+UM36jtQ/yDxVK9xunjAlQ9IphqnZccqD6qsL/4MbGa+ZlVrK8bFf/Gw==
resolved "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f"
dependencies:
"@babel/core" "7.26.0"
"@babel/preset-env" "7.26.0"
@@ -9365,7 +9377,16 @@ stream-http@^3.2.0:
readable-stream "^3.6.0"
xtend "^4.0.2"

"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9429,7 +9450,14 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10408,7 +10436,16 @@ workerpool@^6.5.1:
resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz"
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
2 changes: 1 addition & 1 deletion ui-frontend/packages/catalog-ui-search/package.json
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
},
"peerDependencies": {},
"devDependencies": {
"@connexta/ace": "git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575",
"@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
"@testing-library/jest-dom": "6.6.3",
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.0.1",
38 changes: 30 additions & 8 deletions ui-frontend/packages/catalog-ui-search/yarn.lock
View file
Original file line number Diff line number Diff line change
@@ -906,9 +906,9 @@
dependencies:
commander "^2.15.1"

"@connexta/ace@git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575":
"@connexta/ace@git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f":
version "1.0.0"
resolved "git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575"
resolved "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f"
dependencies:
"@babel/core" "7.26.0"
"@babel/preset-env" "7.26.0"
@@ -12347,8 +12347,16 @@ string-split-by@^1.0.0:
dependencies:
parenthesis "^3.1.5"

"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
name string-width-cjs
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12385,8 +12393,14 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
name strip-ansi-cjs
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -13546,8 +13560,16 @@ world-calendars@^1.0.3:
dependencies:
object-assign "^4.1.0"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
name wrap-ansi-cjs
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
4 changes: 2 additions & 2 deletions ui-frontend/yarn.lock
View file
Original file line number Diff line number Diff line change
@@ -851,9 +851,9 @@
"@babel/helper-string-parser" "^7.25.9"
"@babel/helper-validator-identifier" "^7.25.9"

"@connexta/ace@git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575":
"@connexta/ace@git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f":
version "1.0.0"
resolved "git+https://github.com/connexta/ace.git#37a0052298d788aff5836551a4d578a758ea3575"
resolved "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f"
dependencies:
"@babel/core" "7.26.0"
"@babel/preset-env" "7.26.0"