GUACAMOLE-1859: Merge updates to latest compatible Java and JavaScript dependencies.

This commit is contained in:
James Muehlner
2023-10-06 11:41:45 -07:00
committed by GitHub
53 changed files with 176 additions and 106 deletions

View File

@@ -1 +0,0 @@
org.apache.mina:mina-core:jar:2.2.1

View File

@@ -1,5 +1,5 @@
Apache MINA Apache MINA
Copyright 2007-2016 The Apache Software Foundation. Copyright 2007-2023 The Apache Software Foundation.
This product includes software developed at This product includes software developed at
The Apache Software Foundation (http://www.apache.org/). The Apache Software Foundation (http://www.apache.org/).

View File

@@ -1,7 +1,7 @@
Apache Mina (https://mina.apache.org/) Apache Mina (https://mina.apache.org/)
-------------------------------------- --------------------------------------
Version: 2.2.1 Version: 2.2.2
From: 'Apache Software Foundation' (https://www.apache.org/) From: 'Apache Software Foundation' (https://www.apache.org/)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.mina:mina-core:jar:2.2.2

View File

@@ -1 +0,0 @@
org.bouncycastle:bc-fips:jar:1.0.2.3

View File

@@ -1,12 +1,12 @@
Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc. Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org) (https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy
this software and associated documentation files (the "Software"), to deal in of this software and associated documentation files (the "Software"), to deal
the Software without restriction, including without limitation the rights to in the Software without restriction, including without limitation the rights
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
of the Software, and to permit persons to whom the Software is furnished to do copies of the Software, and to permit persons to whom the Software is
so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software. copies or substantial portions of the Software.

View File

@@ -1,8 +1,8 @@
BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java) BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java)
----------------------------------------------------------------------- -----------------------------------------------------------------------
Version: 1.0.2.3 Version: 1.0.2.4
From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
License(s): License(s):
MIT (bundled/bouncycastle-fips-1.0.2.3/LICENSE) MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE)

View File

@@ -0,0 +1 @@
org.bouncycastle:bc-fips:jar:1.0.2.4

View File

@@ -1,5 +0,0 @@
Apache Directory LDAP API
Copyright 2003-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

View File

@@ -1 +0,0 @@
org.apache.directory.api:api-all:jar:2.1.3

View File

@@ -0,0 +1,5 @@
Apache Directory LDAP API
Copyright 2003-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

View File

@@ -1,7 +1,7 @@
Apache Directory LDAP API (http://directory.apache.org) Apache Directory LDAP API (http://directory.apache.org)
------------------------------------------------------- -------------------------------------------------------
Version: 2.1.3 Version: 2.1.4
From: 'Apache Software Foundation' (https://www.apache.org/) From: 'Apache Software Foundation' (https://www.apache.org/)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.directory.api:api-all:jar:2.1.4

View File

@@ -1,7 +1,7 @@
Guava: Google Core Libraries for Java (https://github.com/google/guava) Guava: Google Core Libraries for Java (https://github.com/google/guava)
----------------------------------------------------------------------- -----------------------------------------------------------------------
Version: 32.1.1-jre Version: 32.1.2-jre
From: 'Google Inc.' (http://www.google.com/) From: 'Google Inc.' (http://www.google.com/)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -1,3 +1,3 @@
com.google.guava:failureaccess:jar:1.0.1 com.google.guava:failureaccess:jar:1.0.1
com.google.guava:guava:jar:32.1.1-jre com.google.guava:guava:jar:32.1.2-jre
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava

View File

@@ -1 +0,0 @@
jquery:3.6.4

View File

@@ -1,8 +1,8 @@
jQuery (http://jquery.com/) jQuery (http://jquery.com/)
--------------------------- ---------------------------
Version: 3.6.4 Version: 3.7.1
From: 'OpenJS Foundation' (https://openjsf.org/) From: 'OpenJS Foundation' (https://openjsf.org/)
License(s): License(s):
MIT (bundled/jquery-3.6.4/LICENSE.txt) MIT (bundled/jquery-3.7.1/LICENSE.txt)

View File

@@ -0,0 +1 @@
jquery:3.7.1

View File

@@ -1,5 +0,0 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.0

View File

@@ -1,7 +1,7 @@
Kotlin (https://kotlinlang.org/) Kotlin (https://kotlinlang.org/)
-------------------------------- --------------------------------
Version: 1.9.0 Version: 1.9.10
From: 'JetBrains s.r.o and respective authors and developers' From: 'JetBrains s.r.o and respective authors and developers'
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1,5 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.10

View File

@@ -1 +0,0 @@
com.keepersecurity.secrets-manager:core:jar:16.5.4

View File

@@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
(https://github.com/Keeper-Security/secrets-manager) (https://github.com/Keeper-Security/secrets-manager)
---------------------------------------------------- ----------------------------------------------------
Version: 16.5.4 Version: 16.6.2
From: 'Keeper Security' (https://www.keepersecurity.com/) From: 'Keeper Security' (https://www.keepersecurity.com/)
License(s): License(s):
MIT (bundled/ksm-sdk-16.5.4/LICENSE) MIT (bundled/ksm-sdk-16.6.2/LICENSE)

View File

@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.6.2

View File

@@ -1,8 +1,8 @@
Logback (http://logback.qos.ch/) Logback (http://logback.qos.ch/)
-------------------------------- --------------------------------
Version: 1.3.8 Version: 1.3.11
From: 'QOS.ch Sàrl' (http://qos.ch/) From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s): License(s):
EPL v1.0 (bundled/logback-1.3.8/LICENSE.txt) EPL v1.0 (bundled/logback-1.3.11/LICENSE.txt)

View File

@@ -0,0 +1,2 @@
ch.qos.logback:logback-classic:jar:1.3.11
ch.qos.logback:logback-core:jar:1.3.11

View File

@@ -1,2 +0,0 @@
ch.qos.logback:logback-classic:jar:1.3.8
ch.qos.logback:logback-core:jar:1.3.8

View File

@@ -1,2 +0,0 @@
org.slf4j:jul-to-slf4j:jar:2.0.7
org.slf4j:slf4j-api:jar:2.0.7

View File

@@ -1,8 +1,8 @@
Simple Logging Facade for Java (http://slf4j.org/) Simple Logging Facade for Java (http://slf4j.org/)
-------------------------------------------------- --------------------------------------------------
Version: 2.0.7 Version: 2.0.9
From: 'QOS.ch Sàrl' (http://qos.ch/) From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s): License(s):
MIT (bundled/slf4j-api-2.0.7/LICENSE.txt) MIT (bundled/slf4j-api-2.0.9/LICENSE.txt)

View File

@@ -0,0 +1,2 @@
org.slf4j:jul-to-slf4j:jar:2.0.9
org.slf4j:slf4j-api:jar:2.0.9

View File

@@ -1 +0,0 @@
webpack:4.46.0

View File

@@ -1,8 +1,8 @@
Webpack (https://webpack.js.org/) Webpack (https://webpack.js.org/)
--------------------------------- ---------------------------------
Version: 4.46.0 Version: 4.47.0
From: 'JS Foundation and other contributors' From: 'JS Foundation and other contributors'
License(s): License(s):
MIT (bundled/webpack-4.46.0/LICENSE) MIT (bundled/webpack-4.47.0/LICENSE)

View File

@@ -0,0 +1 @@
webpack:4.47.0

View File

@@ -1,2 +0,0 @@
com.google.zxing:core:jar:3.5.1
com.google.zxing:javase:jar:3.5.1

View File

@@ -1,8 +1,8 @@
ZXing Barcode Scanning Library (https://github.com/zxing/zxing/) ZXing Barcode Scanning Library (https://github.com/zxing/zxing/)
---------------------------------------------------------------- ----------------------------------------------------------------
Version: 3.5.1 Version: 3.5.2
From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.1/AUTHORS) From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.2/AUTHORS)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1,2 @@
com.google.zxing:core:jar:3.5.2
com.google.zxing:javase:jar:3.5.2

View File

@@ -51,7 +51,7 @@
<dependency> <dependency>
<groupId>org.apache.directory.api</groupId> <groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId> <artifactId>api-all</artifactId>
<version>2.1.3</version> <version>2.1.4</version>
<exclusions> <exclusions>
</exclusions> </exclusions>
</dependency> </dependency>

View File

@@ -162,12 +162,12 @@
<dependency> <dependency>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId> <artifactId>javase</artifactId>
<version>3.5.1</version> <version>3.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>3.5.1</version> <version>3.5.2</version>
</dependency> </dependency>
<!-- Guacamole depends on an implementation of JAX-WS --> <!-- Guacamole depends on an implementation of JAX-WS -->

View File

@@ -38,7 +38,7 @@
</parent> </parent>
<properties> <properties>
<kotlin.version>1.9.0</kotlin.version> <kotlin.version>1.9.10</kotlin.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -60,7 +60,7 @@
<dependency> <dependency>
<groupId>com.keepersecurity.secrets-manager</groupId> <groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>16.5.4</version> <version>16.6.2</version>
<!-- Correct version conflict (different versions across transitive <!-- Correct version conflict (different versions across transitive
dependencies) --> dependencies) -->
@@ -106,7 +106,7 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId> <artifactId>bc-fips</artifactId>
<version>1.0.2.3</version> <version>1.0.2.4</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -68,6 +68,13 @@
<configuration> <configuration>
<workingDirectory>src/main/frontend</workingDirectory> <workingDirectory>src/main/frontend</workingDirectory>
<installDirectory>${project.build.directory}</installDirectory> <installDirectory>${project.build.directory}</installDirectory>
<!-- Newer Node.js requires the following to avoid an "ERR_OSSL_EVP_UNSUPPORTED"
error when WebPack attempts to use its default hash (MD4) for content hashing -->
<environmentVariables>
<NODE_OPTIONS>--openssl-legacy-provider</NODE_OPTIONS>
</environmentVariables>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -76,7 +83,8 @@
<goal>install-node-and-npm</goal> <goal>install-node-and-npm</goal>
</goals> </goals>
<configuration> <configuration>
<nodeVersion>v14.16.0</nodeVersion> <nodeVersion>v18.18.0</nodeVersion>
<npmVersion>9.8.1</npmVersion>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

View File

@@ -12,10 +12,10 @@
"angular-translate": "^2.19.0", "angular-translate": "^2.19.0",
"angular-translate-interpolation-messageformat": "^2.19.0", "angular-translate-interpolation-messageformat": "^2.19.0",
"angular-translate-loader-static-files": "^2.19.0", "angular-translate-loader-static-files": "^2.19.0",
"blob-polyfill": "^7.0.20220408", "blob-polyfill": ">=7.0.20220408",
"datalist-polyfill": "^1.25.1", "datalist-polyfill": "^1.25.1",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"jquery": "^3.6.4", "jquery": "^3.7.1",
"jstz": "^2.1.1", "jstz": "^2.1.1",
"lodash": "^4.17.21" "lodash": "^4.17.21"
}, },
@@ -30,7 +30,7 @@
"google-closure-compiler": "20221004.0.0", "google-closure-compiler": "20221004.0.0",
"html-webpack-plugin": "^4.5.2", "html-webpack-plugin": "^4.5.2",
"mini-css-extract-plugin": "^1.6.2", "mini-css-extract-plugin": "^1.6.2",
"webpack": "^4.46.0", "webpack": "^4.47.0",
"webpack-cli": "^4.10.0" "webpack-cli": "^4.10.0"
} }
}, },
@@ -2255,9 +2255,9 @@
} }
}, },
"node_modules/css-minimizer-webpack-plugin/node_modules/semver": { "node_modules/css-minimizer-webpack-plugin/node_modules/semver": {
"version": "6.3.0", "version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true, "dev": true,
"bin": { "bin": {
"semver": "bin/semver.js" "semver": "bin/semver.js"
@@ -4642,9 +4642,9 @@
} }
}, },
"node_modules/jquery": { "node_modules/jquery": {
"version": "3.6.4", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
}, },
"node_modules/js-yaml": { "node_modules/js-yaml": {
"version": "3.14.1", "version": "3.14.1",
@@ -4809,9 +4809,9 @@
} }
}, },
"node_modules/make-dir/node_modules/semver": { "node_modules/make-dir/node_modules/semver": {
"version": "5.7.1", "version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"bin": { "bin": {
"semver": "bin/semver" "semver": "bin/semver"
} }
@@ -5803,9 +5803,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.4.21", "version": "8.4.31",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
"integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -5815,10 +5815,14 @@
{ {
"type": "tidelift", "type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss" "url": "https://tidelift.com/funding/github/npm/postcss"
},
{
"type": "github",
"url": "https://github.com/sponsors/ai"
} }
], ],
"dependencies": { "dependencies": {
"nanoid": "^3.3.4", "nanoid": "^3.3.6",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"source-map-js": "^1.0.2" "source-map-js": "^1.0.2"
}, },
@@ -7442,9 +7446,9 @@
} }
}, },
"node_modules/semver": { "node_modules/semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
@@ -8910,9 +8914,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "4.46.0", "version": "4.47.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
"dependencies": { "dependencies": {
"@webassemblyjs/ast": "1.9.0", "@webassemblyjs/ast": "1.9.0",
"@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0",
@@ -10930,9 +10934,9 @@
} }
}, },
"semver": { "semver": {
"version": "6.3.0", "version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true "dev": true
}, },
"serialize-javascript": { "serialize-javascript": {
@@ -12731,9 +12735,9 @@
} }
}, },
"jquery": { "jquery": {
"version": "3.6.4", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
}, },
"js-yaml": { "js-yaml": {
"version": "3.14.1", "version": "3.14.1",
@@ -12868,9 +12872,9 @@
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "5.7.1", "version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
} }
} }
}, },
@@ -13661,12 +13665,12 @@
"integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==" "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
}, },
"postcss": { "postcss": {
"version": "8.4.21", "version": "8.4.31",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
"integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"nanoid": "^3.3.4", "nanoid": "^3.3.6",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"source-map-js": "^1.0.2" "source-map-js": "^1.0.2"
} }
@@ -14976,9 +14980,9 @@
} }
}, },
"semver": { "semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true, "dev": true,
"requires": { "requires": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
@@ -16179,9 +16183,9 @@
} }
}, },
"webpack": { "webpack": {
"version": "4.46.0", "version": "4.47.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
"requires": { "requires": {
"@webassemblyjs/ast": "1.9.0", "@webassemblyjs/ast": "1.9.0",
"@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0",

View File

@@ -14,7 +14,7 @@
"blob-polyfill": ">=7.0.20220408", "blob-polyfill": ">=7.0.20220408",
"datalist-polyfill": "^1.25.1", "datalist-polyfill": "^1.25.1",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"jquery": "^3.6.4", "jquery": "^3.7.1",
"jstz": "^2.1.1", "jstz": "^2.1.1",
"lodash": "^4.17.21" "lodash": "^4.17.21"
}, },
@@ -29,7 +29,7 @@
"google-closure-compiler": "20221004.0.0", "google-closure-compiler": "20221004.0.0",
"html-webpack-plugin": "^4.5.2", "html-webpack-plugin": "^4.5.2",
"mini-css-extract-plugin": "^1.6.2", "mini-css-extract-plugin": "^1.6.2",
"webpack": "^4.46.0", "webpack": "^4.47.0",
"webpack-cli": "^4.10.0" "webpack-cli": "^4.10.0"
} }
} }

View File

@@ -91,6 +91,13 @@ class DependencyListPlugin {
*/ */
const logger = compiler.getInfrastructureLogger(PLUGIN_NAME); const logger = compiler.getInfrastructureLogger(PLUGIN_NAME);
/**
* The directory receiving the dependency list file.
*
* @type {string}
*/
const outputPath = this.options.path || compiler.options.output.path;
/** /**
* The full path to the output file that should contain the list of * The full path to the output file that should contain the list of
* discovered NPM module dependencies. * discovered NPM module dependencies.
@@ -98,7 +105,7 @@ class DependencyListPlugin {
* @type {string} * @type {string}
*/ */
const outputFile = path.join( const outputFile = path.join(
this.options.path || compiler.options.output.path, outputPath,
this.options.filename || 'npm-dependencies.txt' this.options.filename || 'npm-dependencies.txt'
); );
@@ -132,6 +139,10 @@ class DependencyListPlugin {
}); });
// Create output path if it doesn't yet exist
if (!fs.existsSync(outputPath))
fs.mkdirSync(outputPath, { recursive: true, mode: 0o755 });
// Write all discovered NPM packages to configured output file // Write all discovered NPM packages to configured output file
const sortedCoords = Object.keys(moduleCoords).sort(); const sortedCoords = Object.keys(moduleCoords).sort();
fs.writeFileSync(outputFile, sortedCoords.join('\n') + '\n'); fs.writeFileSync(outputFile, sortedCoords.join('\n') + '\n');

47
guacamole/util/run-npm.sh Executable file
View File

@@ -0,0 +1,47 @@
#!/bin/sh
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
#
# run-npm.sh - Convenience script for automatically running the version of NPM
# used by the "guacamole" build. All command-line options given to this script
# are passed directly to NPM. The Guacamole build must have run at least once,
# even unsuccessfully, for copies of Node.js and NPM to have been downloaded.
#
##
## The directory containing this script.
##
UTIL_DIR="`dirname "$0"`"
##
## The directory containing the "guacamole" project.
##
PROJECT_DIR="$UTIL_DIR/.."
##
## The directory containing copies of Node.js and NPM that were downloaded by
## the "guacamole" project build process.
##
NODE_DIR="$PROJECT_DIR/target/node"
# Invoke NPM with provided arguments, using the Node.js and NPM versions
# downloaded by the "guacamole" project build
exec "$NODE_DIR/node" "$NODE_DIR/node_modules/npm/bin/npm-cli.js" "$@"

10
pom.xml
View File

@@ -36,16 +36,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Dependency versions --> <!-- Dependency versions -->
<guava.version>32.1.1-jre</guava.version> <guava.version>32.1.2-jre</guava.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>
<hk2.version>2.6.1</hk2.version> <hk2.version>2.6.1</hk2.version>
<jackson.version>2.15.2</jackson.version> <jackson.version>2.15.2</jackson.version>
<jackson-databind.version>2.15.2</jackson-databind.version> <jackson-databind.version>2.15.2</jackson-databind.version>
<jersey.version>2.40</jersey.version> <jersey.version>2.40</jersey.version>
<junit.version>5.9.3</junit.version> <junit.version>5.10.0</junit.version>
<junit4.version>4.13.2</junit4.version> <junit4.version>4.13.2</junit4.version>
<logback.version>1.3.8</logback.version> <logback.version>1.3.11</logback.version>
<slf4j.version>2.0.7</slf4j.version> <slf4j.version>2.0.9</slf4j.version>
<!-- The directory that should receive all generated dependency lists <!-- The directory that should receive all generated dependency lists
(for LICENSE generation) --> (for LICENSE generation) -->
@@ -512,7 +512,7 @@
</ignoreVersion> </ignoreVersion>
<ignoreVersion> <ignoreVersion>
<type>regex</type> <type>regex</type>
<version>.+-(alpha|beta)\b.*?</version> <version>.+-(alpha|Alpha|beta|Beta)[0-9]*\b.*?</version>
</ignoreVersion> </ignoreVersion>
</ignoreVersions> </ignoreVersions>
<rules> <rules>