Merge branch 'main' into sync-chart-changes-14.1.1

vmware-tanzu · Nov 12, 2023 · e16b315 · e16b315
2 parents f7dd92a + 7b0cdc5
commit e16b315
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 41 deletions.
diff --git a/cmd/oci-catalog/Cargo.lock b/cmd/oci-catalog/Cargo.lock
diff --git a/cmd/oci-catalog/Cargo.toml b/cmd/oci-catalog/Cargo.toml
@@ -15,7 +15,7 @@ prost = "0.12"
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.33", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.34", features = ["macros", "rt-multi-thread"] }
 tokio-stream = "0.1"
 tonic = "0.10"
 tonic-health = "0.10"

diff --git a/cmd/pinniped-proxy/Cargo.lock b/cmd/pinniped-proxy/Cargo.lock
diff --git a/dashboard/package.json b/dashboard/package.json
@@ -33,7 +33,7 @@
     "@cds/city": "^1.1.0",
     "@cds/core": "^6.5.0",
     "@cds/react": "^6.5.0",
-    "@clr/ui": "^15.12.4",
+    "@clr/ui": "^15.12.5",
     "@paciolan/remote-component": "^2.13.0",
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.10.7",
@@ -85,15 +85,15 @@
     "@testing-library/user-event": "^14.5.1",
     "@types/enzyme": "^3.10.15",
     "@types/jest": "^29.5.7",
-    "@types/jsonwebtoken": "^9.0.4",
+    "@types/jsonwebtoken": "^9.0.5",
     "@types/lodash": "^4.14.200",
     "@types/qs": "^6.9.9",
     "@types/react": "^17.0.62",
     "@types/react-copy-to-clipboard": "^5.0.6",
     "@types/react-dom": "^17.0.20",
     "@types/react-helmet": "^6.1.8",
     "@types/react-router-dom": "^5.3.3",
-    "@types/react-router-hash-link": "^2.4.8",
+    "@types/react-router-hash-link": "^2.4.9",
     "@types/react-transition-group": "^4.4.8",
     "@types/redux-mock-store": "^1.0.5",
     "@types/swagger-ui-react": "^4.18.2",

diff --git a/dashboard/yarn.lock b/dashboard/yarn.lock
@@ -1313,10 +1313,10 @@
     "@cds/city" "^1.1.0"
     modern-normalize "^1.1.0"
 
-"@clr/ui@^15.12.4":
-  version "15.12.4"
-  resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-15.12.4.tgz#5a0b72d9e4298501640292ef9efe4c628013e755"
-  integrity sha512-uGfJeO1gnIYT9WdrmT0w1qiNWsNU47YtMpxlFHZ7/LFO6Zd2kIClWMWpTwDvYgPsh0v4YNriRpy/VOMtjPaMyQ==
+"@clr/ui@^15.12.5":
+  version "15.12.5"
+  resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-15.12.5.tgz#8d6243db7cb4fd2731233242f1d25aa6fea7942e"
+  integrity sha512-Gw6xiNzz5/fE52r9RN1ZpbpDHApOXlosA+TBoTI4a2h6Bo2ll7QDP6lM7vynsRE4W4JMOtpfRqPfCsejl0v8Xg==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
@@ -2971,10 +2971,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/jsonwebtoken@^9.0.4":
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.4.tgz#8b74bbe87bde81a3469d4b32a80609bec62c23ec"
-  integrity sha512-8UYapdmR0QlxgvJmyE8lP7guxD0UGVMfknsdtCFZh4ovShdBl3iOI4zdvqBHrB/IS+xUj3PSx73Qkey1fhWz+g==
+"@types/jsonwebtoken@^9.0.5":
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.5.tgz#0bd9b841c9e6c5a937c17656e2368f65da025588"
+  integrity sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==
   dependencies:
     "@types/node" "*"
 
@@ -3097,10 +3097,10 @@
     "@types/react" "*"
     "@types/react-router" "*"
 
-"@types/react-router-hash-link@^2.4.8":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@types/react-router-hash-link/-/react-router-hash-link-2.4.8.tgz#524ed5a71a5857febfaf788182ab321d2c81b5e1"
-  integrity sha512-6j0W3/l9MAZd3JPFv1uMEp0yNJN7DX7l9iKWR6hb8eI70pV93LwYkp2yevioSXof3DiPD2pFPuregsVvNQLMXQ==
+"@types/react-router-hash-link@^2.4.9":
+  version "2.4.9"
+  resolved "https://registry.yarnpkg.com/@types/react-router-hash-link/-/react-router-hash-link-2.4.9.tgz#b9f069fb5faeba2477426b3932205d080f72ba99"
+  integrity sha512-zl/VMj+lfJZhvjOAQXIlBVPNKSK+/fRG8AUHhlP9++LhlA2ziLeTmbRxIMJI3PCiCTS+W/FosEoDRoNOGH0OzA==
   dependencies:
     "@types/history" "^4.7.11"
     "@types/react" "*"

diff --git a/integration/package.json b/integration/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@playwright/test": "^1.39.0",
-    "axios": "^1.6.0"
+    "axios": "^1.6.1"
   },
   "devDependencies": {
     "prettier": "^3.0.3"

diff --git a/integration/yarn.lock b/integration/yarn.lock
@@ -14,10 +14,10 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-axios@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
-  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
+axios@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.1.tgz#76550d644bf0a2d469a01f9244db6753208397d7"
+  integrity sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"