Merge remote-tracking branch 'origin/master' into GH-2240

docs/org.eclipse.n4js.design/chapters/02_eclipseSetup/eclipseSetup.adoc

@@ -98,7 +98,8 @@ In case of local changes of n4js-libs one way of including them is to use a loca
 The verdaccio is first populated by running maven, and then used when executing `npm install` in the directory `n4js-vscode-extension`.
 
 * Start docker
-* Run maven with: `mvn -DnoTests -DstartAndKeepVerdaccio clean verify`
+* Run maven with: `mvn -DnoTests clean verify`
+* Start and populate a local verdaccio server with: `./releng/utils/scripts/start-verdaccio.sh`
 * Change directory to `n4js-vscode-extension`
 * Remove `node_modules` folder and `package-lock.json` file
 * Install from local verdaccio with: `npm install --registry http://localhost:4873`

docs/org.eclipse.n4js.design/chapters/03_releng/releng.adoc

@@ -172,11 +172,10 @@ You may have to increase the memory for maven via `export MAVEN_OPTS="-Xmx2048m"
 Available optional maven profiles are:
 
 [horizontal]
-execute-basic-tests::           run basic tests (e.g. `org.eclipse.n4js.lang.tests`); active by default, use `-DdoNotExecuteBasicTests` to deactivate
-execute-ecmas-tests::           run ECMA test suite
+execute-basic-tests::           run basic tests (e.g. `org.eclipse.n4js.lang.tests`; also includes `org.eclipse.n4js.integration.tests`); active by default, use `-DdoNotExecuteBasicTests` to deactivate
+execute-ecma-tests::            run ECMA test suite
 execute-smoke-tests::           run generated tests using corrupted source code as input
 execute-accesscontrol-tests::   run generated tests for checking accessibility of class/interface members
-execute-jar-tests::             run tests using the headless jar (in bundle `org.eclipse.n4js.ide.tests.jar`, requires docker and verdaccio!)
 
 Available system properties:
 
@@ -187,7 +186,6 @@ noTesthelpers::          if defined (i.e. "-DnoTesthelpers"), omit projects in f
 noDocs::                 if defined (i.e. "-DnoDocs"), omit projects in folder "docs" from maven build
 doNotExecuteBasicTests:: if defined (i.e. "-DdoNotExecuteBasicTests"), deactivate profile "execute-basic-tests"
 languageVersion::        an optional version string to show in the Eclipse About dialog of IDE products (should be defined by publishing builds)
-startAndKeepVerdaccio::  if defined (i.e. "-DstartAndKeepVerdaccio"), enforce starting and suppress stopping of the test verdaccio (see <<sec:test-verdaccio>>)
 
 
 
@@ -203,19 +201,6 @@ The existence of `local-snapshot-deploy-folder` will trigger a profile enabling
 
 
 
-[[sec:test-verdaccio]]
-=== Test Verdaccio containing n4js-libs
-
-If profile `execute-jar-tests` is active, a local verdaccio instance is started and populated with
-freshly-compiled n4js-libs (the libraries located under top-level folder `/n4js-libs`) and is stopped before the
-end of the build. The verdaccio instance is started as a docker container called `n4js-test-verdaccio`.
-
-When giving `-DstartAndKeepVerdaccio` on the command line, such a test verdaccio will always be started/populated but
-never stopped, regardless of whether profile `execute-jar-tests` is active or not. This is useful to enforce
-starting of the test verdaccio (even without running integration tests) and then reusing it in subsequent builds.
-
-
-
 === Generation of Eclipse help for spec and design document
 
 The HTML pages for N4JSSpec and N4JSDesign documents are generated from the Asciidoc sources in the project `org.eclipse.n4js.spec` `org.eclipse.n4js.design` by Asciispec.