You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2024/06/11 18:21:41 UTC
(guacamole-client) branch main updated (60f53e9f8 -> 284353da4)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from 60f53e9f8 GUACAMOLE-1374: Merge updated base Docker image for building on ARM/
add 94988d944 GUACAMOLE-1956: Upgrade to latest compatible NPM dependencies.
add 429d96888 GUACAMOLE-1956: Update maven dependencies to latest compatible versions.
add 62820f12a GUACAMOLE-1956: Merge updates to latest compatible dependency versions.
new 284353da4 Merge changes from patch branch back to main.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
doc/guacamole-example/pom.xml | 2 +-
.../apache-commons-1.16.1/dep-coordinates.txt | 1 -
.../NOTICE | 0
.../README | 2 +-
.../apache-commons-1.17.0/dep-coordinates.txt | 1 +
.../bouncycastle-fips-1.0.2.4/dep-coordinates.txt | 1 -
.../LICENSE | 0
.../README | 4 +-
.../bouncycastle-fips-1.0.2.5/dep-coordinates.txt | 1 +
.../NOTICE | 0
.../README | 2 +-
.../dep-coordinates.txt | 1 +
.../dep-coordinates.txt | 2 -
.../NOTICE.txt | 0
.../README | 2 +-
.../dep-coordinates.txt | 2 +
doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt | 1 -
.../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/LICENSE | 0
.../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/README | 4 +-
doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt | 1 +
doc/licenses/mybatis-3.5.15/dep-coordinates.txt | 1 -
.../{mybatis-3.5.15 => mybatis-3.5.16}/NOTICE | 0
.../{mybatis-3.5.15 => mybatis-3.5.16}/README | 2 +-
doc/licenses/mybatis-3.5.16/dep-coordinates.txt | 1 +
.../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
.../modules/guacamole-auth-sso-cas/pom.xml | 2 +-
.../modules/guacamole-auth-sso-saml/pom.xml | 4 +-
extensions/guacamole-auth-totp/pom.xml | 2 +-
.../modules/guacamole-vault-ksm/pom.xml | 4 +-
guacamole/src/main/frontend/package-lock.json | 78 +++++++++++-----------
guacamole/src/main/frontend/package.json | 2 +-
31 files changed, 63 insertions(+), 62 deletions(-)
delete mode 100644 doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
rename doc/licenses/{apache-commons-1.16.1 => apache-commons-1.17.0}/NOTICE (100%)
rename doc/licenses/{apache-commons-1.16.1 => apache-commons-1.17.0}/README (92%)
create mode 100644 doc/licenses/apache-commons-1.17.0/dep-coordinates.txt
delete mode 100644 doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt
rename doc/licenses/{bouncycastle-fips-1.0.2.4 => bouncycastle-fips-1.0.2.5}/LICENSE (100%)
rename doc/licenses/{bouncycastle-fips-1.0.2.4 => bouncycastle-fips-1.0.2.5}/README (75%)
create mode 100644 doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt
copy doc/licenses/{jakarta-validation-api-2.0.2 => jakarta-validation-api-2.1.3}/NOTICE (100%)
copy doc/licenses/{jakarta-validation-api-2.0.2 => jakarta-validation-api-2.1.3}/README (91%)
create mode 100644 doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
delete mode 100644 doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt
rename doc/licenses/{kotlinx-serialization-1.6.0 => kotlinx-serialization-1.6.3}/NOTICE.txt (100%)
rename doc/licenses/{kotlinx-serialization-1.6.0 => kotlinx-serialization-1.6.3}/README (92%)
create mode 100644 doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt
delete mode 100644 doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
rename doc/licenses/{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/LICENSE (100%)
rename doc/licenses/{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/README (77%)
create mode 100644 doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt
delete mode 100644 doc/licenses/mybatis-3.5.15/dep-coordinates.txt
rename doc/licenses/{mybatis-3.5.15 => mybatis-3.5.16}/NOTICE (100%)
rename doc/licenses/{mybatis-3.5.15 => mybatis-3.5.16}/README (89%)
create mode 100644 doc/licenses/mybatis-3.5.16/dep-coordinates.txt
(guacamole-client) 01/01: Merge changes from patch branch back to main.
Posted by mj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 284353da48112bf8e226cf6be97a882b79cd07a3
Merge: 60f53e9f8 62820f12a
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Tue Jun 11 11:19:52 2024 -0700
Merge changes from patch branch back to main.
doc/guacamole-example/pom.xml | 2 +-
.../apache-commons-1.16.1/dep-coordinates.txt | 1 -
.../NOTICE | 0
.../README | 2 +-
.../apache-commons-1.17.0/dep-coordinates.txt | 1 +
.../bouncycastle-fips-1.0.2.4/dep-coordinates.txt | 1 -
.../LICENSE | 0
.../README | 4 +-
.../bouncycastle-fips-1.0.2.5/dep-coordinates.txt | 1 +
doc/licenses/jakarta-validation-api-2.1.3/NOTICE | 11 +++
doc/licenses/jakarta-validation-api-2.1.3/README | 8 +++
.../dep-coordinates.txt | 1 +
.../dep-coordinates.txt | 2 -
.../NOTICE.txt | 0
.../README | 2 +-
.../dep-coordinates.txt | 2 +
doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt | 1 -
.../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/LICENSE | 0
.../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/README | 4 +-
doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt | 1 +
doc/licenses/mybatis-3.5.15/dep-coordinates.txt | 1 -
.../{mybatis-3.5.15 => mybatis-3.5.16}/NOTICE | 0
.../{mybatis-3.5.15 => mybatis-3.5.16}/README | 2 +-
doc/licenses/mybatis-3.5.16/dep-coordinates.txt | 1 +
.../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
.../modules/guacamole-auth-sso-cas/pom.xml | 2 +-
.../modules/guacamole-auth-sso-saml/pom.xml | 4 +-
extensions/guacamole-auth-totp/pom.xml | 2 +-
.../modules/guacamole-vault-ksm/pom.xml | 4 +-
guacamole/src/main/frontend/package-lock.json | 78 +++++++++++-----------
guacamole/src/main/frontend/package.json | 2 +-
31 files changed, 81 insertions(+), 61 deletions(-)
diff --cc guacamole/src/main/frontend/package-lock.json
index 2b1a5c587,af59b869b..1afa2825a
--- a/guacamole/src/main/frontend/package-lock.json
+++ b/guacamole/src/main/frontend/package-lock.json
@@@ -5770,141 -2626,151 +5770,141 @@@
"dev": true,
"dependencies": {
"array-union": "^1.0.1",
- "glob": "^7.0.3",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "dir-glob": "^2.0.0",
+ "glob": "^7.1.2",
+ "ignore": "^3.3.5",
+ "pify": "^3.0.0",
+ "slash": "^1.0.0"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">=4"
}
},
- "node_modules/del/node_modules/globby/node_modules/pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+ "node_modules/globby/node_modules/pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
"dev": true,
"engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/des.js": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
- "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
- "dependencies": {
- "inherits": "^2.0.1",
- "minimalistic-assert": "^1.0.0"
- }
- },
- "node_modules/diffie-hellman": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
- "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
- "dependencies": {
- "bn.js": "^4.1.0",
- "miller-rabin": "^4.0.0",
- "randombytes": "^2.0.0"
+ "node": ">=4"
}
},
- "node_modules/diffie-hellman/node_modules/bn.js": {
- "version": "4.12.0",
- "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
- "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
- },
- "node_modules/dir-glob": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
- "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+ "node_modules/google-closure-compiler": {
- "version": "20221004.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20221004.0.0.tgz",
- "integrity": "sha512-OKENLrZFF2o3FZ/E4zdTc9NeuAUh1fdwbQxT0sibI19aR62sgNUBo2mLU6sc4Gcm0cQ2gwfB7qX1xnapOIkbaA==",
++ "version": "20240317.0.0",
++ "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20240317.0.0.tgz",
++ "integrity": "sha512-PlC5aU2vwsypKbxyFNXOW4psDZfhDoOr2dCwuo8VcgQji+HVIgRi2lviO66x2SfTi0ilm3kI6rq/RSdOMFczcQ==",
"dev": true,
"dependencies": {
- "path-type": "^3.0.0"
+ "chalk": "4.x",
- "google-closure-compiler-java": "^20221004.0.0",
++ "google-closure-compiler-java": "^20240317.0.0",
+ "minimist": "1.x",
+ "vinyl": "2.x",
+ "vinyl-sourcemaps-apply": "^0.2.0"
+ },
+ "bin": {
+ "google-closure-compiler": "cli.js"
},
"engines": {
- "node": ">=4"
+ "node": ">=10"
+ },
+ "optionalDependencies": {
- "google-closure-compiler-linux": "^20221004.0.0",
- "google-closure-compiler-osx": "^20221004.0.0",
- "google-closure-compiler-windows": "^20221004.0.0"
++ "google-closure-compiler-linux": "^20240317.0.0",
++ "google-closure-compiler-osx": "^20240317.0.0",
++ "google-closure-compiler-windows": "^20240317.0.0"
}
},
- "node_modules/dom-converter": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
- "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
- "dev": true,
- "dependencies": {
- "utila": "~0.4"
- }
+ "node_modules/google-closure-compiler-java": {
- "version": "20221004.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20221004.0.0.tgz",
- "integrity": "sha512-CygLEB40HxtK0VtP6klv2Xm08w4HQNYX/DTgLV7CP74r8LiQMUByRFleaG/Hv5xQG1JzPNiW0GOAiAubDSdr5A==",
++ "version": "20240317.0.0",
++ "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20240317.0.0.tgz",
++ "integrity": "sha512-oWURPChjcCrVfiQOuVtpSoUJVvtOYo41JGEQ2qtArsTGmk/DpWh40vS6hitwKRM/0YzJX/jYUuyt9ibuXXJKmg==",
+ "dev": true
},
- "node_modules/dom-serializer": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
- "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+ "node_modules/google-closure-compiler-linux": {
- "version": "20221004.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20221004.0.0.tgz",
- "integrity": "sha512-B6sca3Lmw3cYXdFzdU0iQpk8L9VEo1ecC1aM7Gl9lgWhIicqqEZebsgnUe5TQ3uHBfQoKjV9fdFG8mt8X/oqSQ==",
++ "version": "20240317.0.0",
++ "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20240317.0.0.tgz",
++ "integrity": "sha512-dYLtcbbJdbbBS0lTy9SzySdVv/aGkpyTekQiW4ADhT/i1p1b4r0wQTKj6kpVVmFvbZ6t9tW/jbXc9EXXNUahZw==",
+ "cpu": [
+ "x32",
+ "x64"
+ ],
"dev": true,
- "dependencies": {
- "domelementtype": "^2.0.1",
- "domhandler": "^4.2.0",
- "entities": "^2.0.0"
- },
- "funding": {
- "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
- }
+ "optional": true,
+ "os": [
+ "linux"
+ ]
},
- "node_modules/domain-browser": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
- "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
- "engines": {
- "node": ">=0.4",
- "npm": ">=1.2"
- }
+ "node_modules/google-closure-compiler-osx": {
- "version": "20221004.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20221004.0.0.tgz",
- "integrity": "sha512-z5V7BvaMauPga8DMTt9u6RGcjBdLAuv4gL2Ebw5NIQRTAHVkEVzCd3kiMX7CVCGhmWdS/1r3jZcCg4BswGia6w==",
++ "version": "20240317.0.0",
++ "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20240317.0.0.tgz",
++ "integrity": "sha512-0mABwjD4HP11rikFd8JRIb9OgPqn9h3o3wS0otufMfmbwS7zRpnnoJkunifhORl3VoR1gFm6vcTC9YziTEFdOw==",
+ "cpu": [
+ "x32",
+ "x64",
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
},
- "node_modules/domelementtype": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
- "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+ "node_modules/google-closure-compiler-windows": {
- "version": "20221004.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20221004.0.0.tgz",
- "integrity": "sha512-JSAWilVa7d65QJYKUr+DmklwKmjkAce6BMD6smqJfdL2dv5OSJ2ydGy73euoBJ4Tka8iQPoaOP+BjLrhIuvqKg==",
++ "version": "20240317.0.0",
++ "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20240317.0.0.tgz",
++ "integrity": "sha512-fTueVFzNOWURFlXZmrFkAB7yA+jzpA2TeDOYeBEFwVlVGHwi8PV3Q9vCIWlbkE8wLpukKEg5wfRHYrLwVPINCA==",
+ "cpu": [
+ "x32",
+ "x64"
+ ],
"dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/fb55"
- }
+ "optional": true,
+ "os": [
+ "win32"
]
},
- "node_modules/domhandler": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
- "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+ "node_modules/gopd": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
"dev": true,
"dependencies": {
- "domelementtype": "^2.2.0"
- },
- "engines": {
- "node": ">= 4"
+ "get-intrinsic": "^1.1.3"
},
"funding": {
- "url": "https://github.com/fb55/domhandler?sponsor=1"
+ "url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/domutils": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
- "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+ "node_modules/graceful-fs": {
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+ },
+ "node_modules/has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
"dev": true,
"dependencies": {
- "dom-serializer": "^1.0.1",
- "domelementtype": "^2.2.0",
- "domhandler": "^4.2.0"
+ "function-bind": "^1.1.1"
},
- "funding": {
- "url": "https://github.com/fb55/domutils?sponsor=1"
+ "engines": {
+ "node": ">= 0.4.0"
}
},
- "node_modules/dot-case": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
- "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+ "node_modules/has-bigints": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+ "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
"dev": true,
- "dependencies": {
- "no-case": "^3.0.4",
- "tslib": "^2.0.3"
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/dot-prop": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
- "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+ "node_modules/has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
- "dependencies": {
- "is-obj": "^2.0.0"
- },
"engines": {
"node": ">=8"
}