Merge remote-tracking branch 'origin/devel' into chore-deps-update

.gitattributes

@@ -27,6 +27,7 @@
 *.pdf   binary
 *.jar   binary
 *.dll   binary
+*.sqlitedb    binary
 
 
 # public/assets/**/* binary

README.md

@@ -1,43 +1,35 @@
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" align="right" width="250"/>
-
 # Cloudbeaver Community
+
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" width="250"/>
+
 Cloud Database Manager - Community Edition.  
-Cloudbeaver is a web server which provides rich web interface. Server itself is a Java application, web part is written on TypeScript and React.  
+CloudBeaver is a web server which provides rich web interface. Server itself is a Java application, web part is written on TypeScript and React.  
 It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
 See out [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.  
 
-## Build cloudbeaver
+## Build CloudBeaver
 
-Cloudbeaver is multi-platform server side application.
+CloudBeaver is the multi-platform server side application.
 It can run on Linux, Windows and MacOS X.
 
-### Prerequisites
-
-* Java 8, 9, 10, 11 or 12 (AdopOpenJDK is recommended).
-* Apache Maven
-* Node.js
-* Yarn
+[Detailed instructions](https://github.com/dbeaver/cloudbeaver/wiki/Build-and-deploy)
 
 ### Build and deploy
 
+After all required packages are installed:
+
 ```sh
 git clone https://github.com/dbeaver/cloudbeaver.git
 cd cloudbeaver/deploy
 ./build.sh
-```
-
-Final artifacts can be found in deploy/cloudbeaver.
-
-### Running server
-```sh
 cd cloudbeaver
 ./run-server.sh
 ```
 By default server listens port `8978` (you can change it in conf/cloudbeaver.conf). So just navigate to http://localhost:8978.
-You can configure nginx, Apache or any other web server in front of it.
+You can configure nginx, Apache or any other web servers in front of it.
 
 ## Test server
 
-You can see live demo of Cloudbeaver here:
+You can see live demo of CloudBeaver here:
 [TBD]
 

deploy/build.sh

@@ -38,9 +38,8 @@ echo "Build static content"
 
 cd ../webapp
 
-npm i lerna
-npx lerna bootstrap
-npx lerna run build --scope @dbeaver/dbeaver -- -- --pluginsList=../../../../products/default/plugins-list.js
+lerna bootstrap
+lerna run build --scope @dbeaver/dbeaver -- -- --pluginsList=../../../../products/default/plugins-list.js
 
 cd ../deploy
 

samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json

@@ -10,7 +10,7 @@
 			"navigator-hide-folders": false,
 			"read-only": false,
 			"configuration": {
-				"database": "${project.path}/db/Chinook.db",
+				"database": "${project.path}/db/Chinook.sqlitedb",
 				"type": "dev",
 				"auth-model": "native"
 			}

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CloudbeaverPlatform.java

@@ -149,9 +149,6 @@ public class CloudbeaverPlatform extends BasePlatformImpl {
         this.qmLogWriter = new QMLogFileWriter();
         this.queryManager.registerMetaListener(qmLogWriter);
 
-        // Init default network settings
-        installProxySelector();
-
         this.certificateStorage = new DefaultCertificateStorage(
             new File(WebPlatformActivator.getInstance().getStateLocation().toFile(), "security"));