This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-manager.git
The following commit(s) were added to refs/heads/master by this push:
new c04fa81 build: upgrade deps for building on modern machine (#513)
c04fa81 is described below
commit c04fa814c95e21f287d052d79abaa70f4d15aecf
Author: tison <[email protected]>
AuthorDate: Tue Apr 18 23:17:12 2023 +0800
build: upgrade deps for building on modern machine (#513)
Signed-off-by: tison <[email protected]>
Co-authored-by: Nicolò Boschi <[email protected]>
---
CONTRIBUTING.md | 2 +-
README.md | 22 +++++++++++-----------
distribution/LICENSE.bin.txt | 10 +++++-----
distribution/NOTICE.bin.txt | 4 ++--
front-end/build.gradle | 4 ++--
front-end/integration-test/nightwatch.json | 2 +-
front-end/package.json | 20 ++++++++++----------
7 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d33036..367c46a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ If you have not installed Java and Node, follow the
instructions below.
| Dependency | Installation guide |
| ---------- | --------------------------------- |
| Java 8 | https://openjdk.java.net/install/ |
-| Node 10.15 | https://nodejs.org/en/ |
+| Node 18 | https://nodejs.org/en/ |
### Fork pulsar-manager repository
diff --git a/README.md b/README.md
index d696244..4cbaa9a 100644
--- a/README.md
+++ b/README.md
@@ -131,8 +131,8 @@ bkvm address => http://localhost:7750/bkvm
#### Prerequisites
* Java JDK 1.8
-* Node 10.15.3 or later
-* Npm 6.4.1 or later
+* Node.js 16 or later
+* npm 8 later
* Pulsar 2.4.0 or later
#### Build instructions
@@ -144,7 +144,7 @@ bkvm address => http://localhost:7750/bkvm
```
2. Build and start the backend.
-
+
```
cd pulsar-manager
./gradlew build -x test
@@ -171,8 +171,8 @@ After running these steps, the Pulsar Manager is running
locally at http://127.0
If you are deploying Pulsar Manager 0.1.0 using the released container,
you can log in the Pulsar Manager UI using the following credentials.
- * Account: `pulsar`
- * Password: `pulsar`
+ * Account: `pulsar`
+ * Password: `pulsar`
If you are deploying Pulsar Manager using the latest code, you can create
a super-user using the following command. Then you can use the super user
credentials to log in the Pulsar Manager UI.
@@ -189,7 +189,7 @@ After running these steps, the Pulsar Manager is running
locally at http://127.0
* `backend-service`: The IP address or domain name of the backend service.
* `password`: The password should be more than or equal to 6 digits.
-2. Create an environment.
+2. Create an environment.
An environment represents a Pulsar instance or a group of clusters you
want to manage. A Pulsar Manager is capable of managing multiple environments.
@@ -228,12 +228,12 @@ Use the default account (`pulsar`) and the default
password (`pulsar`) to log in
### Configure environment
-The puslar-manager supports multiple environment configurations and can manage
multiple environments conveniently.
+The pulsar-manager supports multiple environment configurations and can manage
multiple environments conveniently.
Here, the service URL represents the service IP address of the broker. If you
run Pulsar manager in the standalone mode, it should be set to
"http://127.0.0.1:8080";.
-You can easily find it in the client.conf file of your pulsar-manager.
+You can easily find it in the client.conf file of your pulsar-manager.
-And the bookie URL represents the service IP address of the bookkeeper. If you
run Pulsar manager in the standalone mode, it should be set to
"http://127.0.0.1:6650";.
+And the bookie URL represents the service IP address of the bookkeeper. If you
run Pulsar manager in the standalone mode, it should be set to
"http://127.0.0.1:6650";.
@@ -286,7 +286,7 @@ Because the code for connecting the casdoor has been added
in Pulsar-manager, we
#### Step1. Deploy Casdoor
-Firstly, the Casdoor should be deployed.
+Firstly, the Casdoor should be deployed.
You can refer to the Casdoor official documentation for the
[Casdoor](https://casdoor.org/docs/overview)
@@ -298,7 +298,7 @@ After a successful deployment, you need to ensure:
Then you can quickly implement a casdoor based login page in your app with the
following steps.
-#### step2. Configure Casdoor
+#### step2. Configure Casdoor
Configure casdoor can refer to
[casdoor](https://door.casdoor.com/login)(Configure casdoor's browser better
not use one browser with your develop browser).
diff --git a/distribution/LICENSE.bin.txt b/distribution/LICENSE.bin.txt
index c48b9a1..1b4e744 100644
--- a/distribution/LICENSE.bin.txt
+++ b/distribution/LICENSE.bin.txt
@@ -224,7 +224,7 @@ The Apache Software License, Version 2.0
- io.jsonwebtoken-jjwt-jackson-0.10.5.jar
* Guava
- com.google.guava-guava-21.0.jar
-* Gson
+* Gson
- com.google.code.gson-gson-2.8.2.jar
* Pulsar
- org.apache.pulsar-pulsar-common-2.4.1.jar
@@ -238,7 +238,7 @@ The Apache Software License, Version 2.0
* xlsx
- [email protected]
* node-chromediver
- - [email protected]
+ - [email protected]
* request
- [email protected]
@@ -340,7 +340,7 @@ MIT License
* hash-sum
- [email protected] -- licenses/LICENSE-hash-sum.txt
* html-webpack-plugin
- - [email protected] -- licenses/LICENSE-html-webpack-plugin.txt
+ - [email protected] -- licenses/LICENSE-html-webpack-plugin.txt
* husky
- [email protected] -- licenses/LICENSE-husky.txt
* lint-staged
@@ -352,7 +352,7 @@ MIT License
* node-notifier
- [email protected] -- licenses/LICENSE-node-notifier.txt
* node-sass
- - [email protected] -- licenses/LICENSE-node-sass.txt
+ - [email protected] -- licenses/LICENSE-node-sass.txt
* optimize-css-assets-webpack-plugin
- [email protected] --
licenses/LICENSE-optimize-css-assets-webpack-plugin.txt
* ora
@@ -370,7 +370,7 @@ MIT License
* sass-loader
- [email protected] -- licenses/LICENSE-sass-loader.txt
* script-ext-html-webpack-plugin
- - [email protected] --
licenses/LICENSE-script-ext-html-webpack-plugin.txt
+ - [email protected] --
licenses/LICENSE-script-ext-html-webpack-plugin.txt
* script-loader
- [email protected] -- licenses/LICENSE-script-loader.txt
* serve-static
diff --git a/distribution/NOTICE.bin.txt b/distribution/NOTICE.bin.txt
index e984d87..18a570a 100644
--- a/distribution/NOTICE.bin.txt
+++ b/distribution/NOTICE.bin.txt
@@ -1,5 +1,5 @@
Apache Pulsar
-Copyright 2017-2019 The Apache Software Foundation
+Copyright 2017-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -10,4 +10,4 @@ Guava
Copyright (C) 2010 The Guava Authors
GSon
-Copyright 2008 Google Inc.
\ No newline at end of file
+Copyright 2008 Google Inc.
diff --git a/front-end/build.gradle b/front-end/build.gradle
index 81c6526..363df63 100644
--- a/front-end/build.gradle
+++ b/front-end/build.gradle
@@ -18,8 +18,8 @@ plugins {
}
node {
- version = '10.14.1'
- npmVersion = '6.4.1'
+ version = '16.19.1'
+ npmVersion = '8.19.4'
download = true
}
diff --git a/front-end/integration-test/nightwatch.json
b/front-end/integration-test/nightwatch.json
index 5218d91..2fbe320 100644
--- a/front-end/integration-test/nightwatch.json
+++ b/front-end/integration-test/nightwatch.json
@@ -15,4 +15,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/front-end/package.json b/front-end/package.json
index de57bcb..1375ea2 100644
--- a/front-end/package.json
+++ b/front-end/package.json
@@ -2,8 +2,8 @@
"name": "pulsar-manager",
"version": "0.3.0",
"description": "A tool for managing Apache Pulsar.",
- "author": "<[email protected]>",
- "license": "Apache License 2.0",
+ "author": "<[email protected]>",
+ "license": "Apache-2.0",
"scripts": {
"dev": "cross-env BABEL_ENV=development webpack-dev-server --inline
--progress --config build/webpack.dev.conf.js",
"build:prod": "cross-env NODE_ENV=production env_config=prod node
build/build.js",
@@ -36,7 +36,7 @@
"dependencies": {
"@vue/composition-api": "^1.7.1",
"axios": "0.18.1",
- "casdoor-vue-sdk": "^1.3.0",
+ "casdoor-vue-sdk": "^1.5.1",
"clipboard": "1.7.1",
"codemirror": "5.39.2",
"connect": "3.6.6",
@@ -51,7 +51,7 @@
"nprogress": "0.2.0",
"showdown": "1.8.6",
"sortablejs": "1.7.0",
- "vue": "2.5.17",
+ "vue": "2.6.0",
"vue-i18n": "7.3.2",
"vue-router": "3.0.1",
"vuedraggable": "^2.16.0",
@@ -71,7 +71,7 @@
"babel-preset-env": "1.7.0",
"babel-preset-stage-2": "6.24.1",
"chalk": "2.4.1",
- "chromedriver": "^2.46.0",
+ "chromedriver": "112.0.0",
"copy-webpack-plugin": "4.5.2",
"cross-env": "5.2.0",
"css-loader": "1.0.0",
@@ -82,13 +82,13 @@
"file-loader": "1.1.11",
"friendly-errors-webpack-plugin": "1.7.0",
"hash-sum": "1.0.2",
- "html-webpack-plugin": "4.0.0-alpha",
+ "html-webpack-plugin": "4.0.0",
"husky": "0.14.3",
"lint-staged": "7.2.2",
"mini-css-extract-plugin": "0.4.1",
"nightwatch": "^1.0.19",
"node-notifier": "5.2.1",
- "node-sass": "^4.7.2",
+ "node-sass": "8.0.0",
"optimize-css-assets-webpack-plugin": "5.0.0",
"ora": "3.0.0",
"path-to-regexp": "2.4.0",
@@ -109,7 +109,7 @@
"url-loader": "1.0.1",
"vue-loader": "15.3.0",
"vue-style-loader": "4.1.2",
- "vue-template-compiler": "2.5.17",
+ "vue-template-compiler": "2.6.0",
"webpack": "4.16.5",
"webpack-cli": "3.1.0",
"webpack-dev-server": "3.2.1",
@@ -117,8 +117,8 @@
"script-ext-html-webpack-plugin": "^2.1.5"
},
"engines": {
- "node": ">=12.0.0 <=12.22.10",
- "npm": ">=6.14.16"
+ "node": ">=16",
+ "npm": ">=8"
},
"browserslist": [
"> 1%",
