Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop

Procfile

@@ -1 +0,0 @@
-web: java $JAVA_OPTS -Dspring.profiles.active=heroku -jar wise-webapp/target/dependency/jetty-runner.jar --port $PORT wise-webapp/target/*.war

README.md

@@ -1,6 +1,7 @@
-# Project Information
+# Overview
 
-The goal of this project is to provide a high quality product that can be deployed by educational and academic institutions, private and public companies and anyone who needs to have a mindmapping application. WiseMapping is based on the same code source supporting WiseMapping.com. More info: www.wisemapping.org
+WiseMapping is a free web based *mind map* product. The goal of this project is to provide a high quality product that can be deployed by enterprises, educational and academic institutions. 
+WiseMapping is based on the same code product supporting http://www.wisemapping.com. 
 
 ## Compiling and Running
 
@@ -8,19 +9,18 @@ The goal of this project is to provide a high quality product that can be deploy
 
 The following products must be installed:
 
-    * Java 11 to 16 
+    * Java 11 or higher
     * Maven 3.x or higher ([http://maven.apache.org/])
 
 ### Compiling
 
 WiseMapping uses Maven as packaging and project management. It's composed of 5 maven sub-modules:
 
-    * wise-react: React font-end fetcher
+    * wise-ui:  React font-end fetcher
     * wise-webapp: J2EE web application 
 
 The full compilation of the project can be performed executing within <project-dir>:
 
-`export MAVEN_OPTS="--illegal-access=permit"`
 `mvn clean install`
 
 Once this command is executed, the file <project-dir>/wise-webapp/target/wisemapping*.war will be generated.
@@ -46,21 +46,7 @@ In order to reduce the life-cycle to develop UI backend testing, you can do the
 
 ### Compiling and running with docker-compose
 
-Check out the [docker section](./docker/README.md)
+Check out the [docker section](./docker/README.
-
-
-## Running the JS only version
-
-Start by creating the .zip file.
-
-`mvn assembly:assembly -Dmaven.test.skip=true`
-
-To test the javascript frontend, install a simple http-server.
-
-`npm install -g http-server`
-
-Now open a browser using the URL http://localhost:8080/wise-editor/src/main/webapp/
-
 ## Troubleshooting
 
 <details>
@@ -95,8 +81,6 @@ Now open a browser using the URL http://localhost:8080/wise-editor/src/main/weba
 ### Past Individual Contributors
 
    * Ignacio Manzano
-   * Nicolas Damonte
-   * Claudio Barril <claudiobarril@gmail.com>
    
 ## License
 

bitbucket-pipelines2.yml

@@ -1,38 +0,0 @@
-#  Template maven-build
-
-#  This template allows you to test and build your Java project with Maven.
-#  The workflow allows running tests, code checkstyle and security scans on the default branch.
-
-# Prerequisites: pom.xml and appropriate project structure should exist in the repository.
-
-image: maven:3.6.3
-
-pipelines:
-  default:
-    - parallel:
-      - step:
-        name: Build and Test
-        caches:
-          - maven
-          - node
-        script:
-          - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh | bash
-          - . $HOME/.nvm/nvm.sh && nvm install node
-          - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2 || true
-          - export PATH=$HOME/.yarn/bin:$PATH
-          # Workaround for jaxb plugin bug on java 11 or higher.
-          - export MAVEN_OPTS="--illegal-access=permit"
-          - yarn --version
-          - mvn -B verify --file pom.xml install
-          after-script:
-            # Collect checkstyle results, if any, and convert to Bitbucket Code Insights.
-            - pipe: atlassian/checkstyle-report:0.2.0
-        - step:
-          name: Security Scan
-          script:
-            # Run a security scan for sensitive data.
-            # See more security tools at https://bitbucket.org/product/features/pipelines/integrations?&category=security
-            - pipe: atlassian/git-secrets-scan:0.4.3
-        - step:
-           runs-on: self.hosted
-           script: echo hello

phantomjsdriver.log

@@ -1,14 +0,0 @@
-[INFO  - 2015-11-02T11:53:26.059Z] GhostDriver - Main - running on port 23859
-[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - _decorateNewWindow - page.settings: {"XSSAuditingEnabled":false,"javascriptCanCloseWindows":true,"javascriptCanOpenWindows":true,"javascriptEnabled":true,"loadImages":true,"localToRemoteUrlAccessEnabled":false,"userAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34","webSecurityEnabled":true}
-[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - page.customHeaders:  - {}
-[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - CONSTRUCTOR - Desired Capabilities: {"phantomjs.binary.path":"/Users/pveiga/repo/wisemapping/mindplot/target/phantomjs-maven-plugin/phantomjs-1.9.2-macosx/bin/phantomjs","javascriptEnabled":true}
-[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - CONSTRUCTOR - Negotiated Capabilities: {"browserName":"phantomjs","version":"1.9.2","driverName":"ghostdriver","driverVersion":"1.0.4","platform":"mac-unknown-32bit","javascriptEnabled":true,"takesScreenshot":true,"handlesAlerts":false,"databaseEnabled":false,"locationContextEnabled":false,"applicationCacheEnabled":false,"browserConnectionEnabled":false,"cssSelectorsEnabled":true,"webStorageEnabled":false,"rotatable":false,"acceptSslCerts":false,"nativeEvents":true,"proxy":{"proxyType":"direct"}}
-[INFO  - 2015-11-02T11:53:26.556Z] SessionManagerReqHand - _postNewSessionCommand - New Session Created: 53aba090-8158-11e5-b4b7-df7d699a4283
-[INFO  - 2015-11-02T11:53:30.454Z] ShutdownReqHand - _handle - About to shutdown
-[INFO  - 2015-11-02T11:56:02.272Z] GhostDriver - Main - running on port 47468
-[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - _decorateNewWindow - page.settings: {"XSSAuditingEnabled":false,"javascriptCanCloseWindows":true,"javascriptCanOpenWindows":true,"javascriptEnabled":true,"loadImages":true,"localToRemoteUrlAccessEnabled":false,"userAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34","webSecurityEnabled":true}
-[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - page.customHeaders:  - {}
-[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - CONSTRUCTOR - Desired Capabilities: {"phantomjs.binary.path":"/Users/pveiga/repo/wisemapping/mindplot/target/phantomjs-maven-plugin/phantomjs-1.9.2-macosx/bin/phantomjs","javascriptEnabled":true}
-[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - CONSTRUCTOR - Negotiated Capabilities: {"browserName":"phantomjs","version":"1.9.2","driverName":"ghostdriver","driverVersion":"1.0.4","platform":"mac-unknown-32bit","javascriptEnabled":true,"takesScreenshot":true,"handlesAlerts":false,"databaseEnabled":false,"locationContextEnabled":false,"applicationCacheEnabled":false,"browserConnectionEnabled":false,"cssSelectorsEnabled":true,"webStorageEnabled":false,"rotatable":false,"acceptSslCerts":false,"nativeEvents":true,"proxy":{"proxyType":"direct"}}
-[INFO  - 2015-11-02T11:56:02.546Z] SessionManagerReqHand - _postNewSessionCommand - New Session Created: b0a5cff0-8158-11e5-b537-631f7ef82703
-[INFO  - 2015-11-02T11:56:04.055Z] ShutdownReqHand - _handle - About to shutdown

setup.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export MAVEN_OPTS="-XX:MaxPermSize=128M"

yarn.lock

@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-