diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..1c3c485d97
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,16 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:8-jdk
+    steps:
+      - checkout
+      - run: ci/./generate-documentation.sh
+# TODO: deploy on surge
+# TODO: notification with URLs
+      - slack/notify:
+          color: '#42e2f4'
+          message: This is a custom message notification
+          webhook: webhook
+orbs:
+  slack: circleci/slack@3.2.0
\ No newline at end of file
diff --git a/.externalToolBuilders/asciidoctor.launch b/.externalToolBuilders/asciidoctor.launch
index 57fb8f3242..44a1f8be7a 100644
--- a/.externalToolBuilders/asciidoctor.launch
+++ b/.externalToolBuilders/asciidoctor.launch
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/ogham/pom.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/docs&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/ogham/src/docs&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ogham/mvnw}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dmaven.site.skip&#10;post-site&#10;-N"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="post-site&#10;-N&#10;-Dmaven.site.skip&#10;-Dsass.skip=true"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/ogham}"/>
 </launchConfiguration>
diff --git a/.externalToolBuilders/compile sass.launch b/.externalToolBuilders/compile sass.launch
index 09167ca136..b5eb54bf6b 100644
--- a/.externalToolBuilders/compile sass.launch	
+++ b/.externalToolBuilders/compile sass.launch	
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/ogham/src/site/scss&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ogham/mvnw}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="auto,"/>
diff --git a/.externalToolBuilders/site [target].launch b/.externalToolBuilders/site [target][no-report].launch
similarity index 67%
rename from .externalToolBuilders/site [target].launch
rename to .externalToolBuilders/site [target][no-report].launch
index 217252139f..b5324402ff 100644
--- a/.externalToolBuilders/site [target].launch	
+++ b/.externalToolBuilders/site [target][no-report].launch	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/ogham/pom.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/docs&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/site/asciidoc&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/site/resources&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/site/site.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/ogham/pom.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/site/asciidoc&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/site/resources&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/site/site.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ogham/mvnw}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="clean post-site -N&#10;-DgenerateProjectInfo=false&#10;-DgenerateReports=false&#10;-DgenerateSitemap=false&#10;-Dmaven.javadoc.skip=true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="post-site -N&#10;-DgenerateProjectInfo=false&#10;-DgenerateReports=false&#10;-DgenerateSitemap=false&#10;-Dmaven.javadoc.skip=true&#10;-Dmpir.skip=true&#10;-Dasciidoctor.skip=true&#10;-Dsass.skip=true"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/ogham}"/>
 </launchConfiguration>
diff --git a/.travis.yml b/.travis.yml
index e4c46cc5c4..b3756854ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,5 @@
 language: java
 dist: trusty
-jdk:
-  - oraclejdk9
-  - openjdk9
-  - oraclejdk8
-  - openjdk8
-  - openjdk10
-  - oraclejdk11
-  - openjdk11
-  #- oraclejdk12
-  - openjdk12
 sudo: required
 addons:
   apt:
@@ -17,83 +7,251 @@ addons:
       - graphviz
   sonarcloud:
     organization: aurelien-baudet-github
-    branches:
-      - master
-      - refactoring/.*
-      - features/.*
-      - test/.*
 branches:
   except:
   - gh-.*
-    
+
+
 before_install:
-  - echo "MAVEN_OPTS='-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m'" > ~/.mavenrc # see https://github.com/travis-ci/travis-ci/issues/4613
   - set -o pipefail
-  # detect current Java version in order to execute classpath tests only for this version
-  - |
-    java_version=$(java -version 2>&1 | grep -i version | cut -d'"' -f2)
-    major=$(echo $java_version | cut -d'.' -f1)
-    [ "1" = "$major" ] \
-      && echo "$java_version" | cut -d'.' -f2 > "$HOME/java-version.info" \
-      || echo "$java_version" | cut -d'.' -f1 > "$HOME/java-version.info"
-  - JAVA_RELEASE_VERSION=$(cat "$HOME/java-version.info")
-  # start spring initializr for Ogham in background
-  - |
-    touch "$HOME/spring-initializr.log"
-    spring-initializr/./mvnw clean spring-boot:run -f spring-initializr > "$HOME/spring-initializr.log" &
-    echo "$!" > "$HOME/spring-initializr.pid"
-    tail -f "$HOME/spring-initializr.log" &
-  - grep -q 'Started SpringInitializrApplication' <(tail -f "$HOME/spring-initializr.log")
-  - cat "$HOME/spring-initializr.log"
-  - |
-    [ "$JAVA_RELEASE_VERSION" != "8" ] && exit 0
-    touch "$HOME/spring-initializr-older-versions.log"
-    spring-initializr/./mvnw clean spring-boot:run -f spring-initializr -Dspring-boot.version=1.5.21.RELEASE -Dspring-initializr.version=0.4.0.RELEASE -Drun.jvmArguments="-Dspring.profiles.active=older-versions" > "$HOME/spring-initializr-older-versions.log" &
-    echo "$!" > "$HOME/spring-initializr-older-versions.pid"
-    tail -f "$HOME/spring-initializr-older-versions.log" &
-  - grep -q 'Started SpringInitializrApplication' <(tail -f "$HOME/spring-initializr-older-versions.log")
-  - cat "$HOME/spring-initializr-older-versions.log"
-  # generate projects used to test the classpath on the current Ogham version
-  - OGHAM_VERSION=$(./mvnw -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
-  # TODO: it seems that parallel execution sometimes fails on Travis (seems to be spring-initializr that fails, why ?)
-  - ./mvnw spring-boot:run -pl :ogham-test-classpath -Dspring-boot.run.arguments="$HOME/classpath-tests" -Dspring-boot.run.jvmArguments="-Drunner.parallel=false -Dogham-version=$OGHAM_VERSION -Dspring.initializer.url=http://localhost:8050/starter.zip"
-  - |
-    [ "$JAVA_RELEASE_VERSION" != "8" ] && exit 0
-    ./mvnw spring-boot:run -pl :ogham-test-classpath -Dspring-boot.run.arguments="$HOME/classpath-tests" -Dspring-boot.run.jvmArguments="-Drunner.parallel=false -Dogham-version=$OGHAM_VERSION -Dspring.profiles.active=older-versions -Dspring.initializer.url=http://localhost:8052/starter.zip"
-  - ls -l "$HOME"
-  - ls -l "$HOME/classpath-tests"
-  # stop spring initializr
-  - kill `cat "$HOME/spring-initializr.pid"` || echo ""
-  - kill `cat "$HOME/spring-initializr-older-versions.pid"` || echo ""
-  - TEST_FOLDER=$(echo "JAVA_$JAVA_RELEASE_VERSION")
-  - echo $TEST_FOLDER
-  - ls -l "$HOME/classpath-tests/$TEST_FOLDER"
-script:
-  - ./mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -Dskip.integration.tests=true -Dskip.unit.tests=true -B -q
-  - ./mvnw test verify -Dmaven.test.redirectTestOutputToFile=true -fae -B -q
-  - ./mvnw javadoc:javadoc -fae -B | grep -Ei '(error|warn)'
-  # execute generated classpath tests for the right java version
-  - $HOME/classpath-tests/$TEST_FOLDER/./mvnw test -T 2.5C -f "$HOME/classpath-tests/$TEST_FOLDER/pom.xml" -Dmaven.test.redirectTestOutputToFile=true -fae -q -B #| grep -Ei '(error|exception|Tests run:)'
-after_success:
-  - ./mvnw sonar:sonar -B | grep -Ei '(warn|error|ANALYSIS SUCCESSFUL)'
-  - ./mvnw deploy --settings .travis-settings.xml -DskipTests=true -B | grep -Ei '(Uploading|Downloading|Uploaded|Downloaded)'
-# TODO: after error -> grab logs and send it
-after_failure:
-  - cat "$HOME/spring-initializr.log"
-  - cat "$HOME/spring-initializr-older-versions.log"
+
+jobs:
+  include:
+    - stage: "Build"
+      jdk: oraclejdk8
+      script:
+        - ci/./build.sh
+    - stage: "Build"
+      jdk: openjdk8
+      script:
+        - ci/./build.sh
+    - stage: "Build"
+      jdk: oraclejdk9
+      script:
+        - ci/./build.sh
+    - stage: "Build"
+      jdk: openjdk9
+      script:
+        - ci/./build.sh
+    - stage: "Build"
+      jdk: openjdk10
+      script:
+        - ci/./build.sh
+    - stage: "Build"
+      jdk: oraclejdk11
+      script:
+        - ci/./build.sh
+    - stage: "Build"
+      jdk: openjdk11
+      script:
+        - ci/./build.sh
+    - stage: "Build"
+      jdk: openjdk12
+      script:
+        - ci/./build.sh
+    
+    - stage: test
+      name: "Unit Tests (oraclejdk8)"
+      jdk: oraclejdk8
+      script: ci/./run-unit-tests.sh
+    - stage: test
+      name: "Unit Tests (openjdk8)"
+      jdk: openjdk8
+      script: ci/./run-unit-tests.sh
+    - stage: test
+      name: "Unit Tests (oraclejdk9)"
+      jdk: oraclejdk9
+      script: ci/./run-unit-tests.sh
+    - stage: test
+      name: "Unit Tests (openjdk9)"
+      jdk: openjdk9
+      script: ci/./run-unit-tests.sh
+    - stage: test
+      name: "Unit Tests (openjdk10)"
+      jdk: openjdk10
+      script: ci/./run-unit-tests.sh
+    - stage: test
+      name: "Unit Tests (oraclejdk11)"
+      jdk: oraclejdk11
+      script: ci/./run-unit-tests.sh
+    - stage: test
+      name: "Unit Tests (openjdk11)"
+      jdk: openjdk11
+      script: ci/./run-unit-tests.sh
+    - stage: test
+      name: "Unit Tests (openjdk12)"
+      jdk: openjdk12
+      script: ci/./run-unit-tests.sh
+
+    - stage: test
+      name: "Integration Tests (oraclejdk8)"
+      jdk: oraclejdk8
+      script: ci/./run-integration-tests.sh
+    - stage: test
+      name: "Integration Tests (openjdk8)"
+      jdk: openjdk8
+      script: ci/./run-integration-tests.sh
+    - stage: test
+      name: "Integration Tests (oraclejdk9)"
+      jdk: oraclejdk9
+      script: ci/./run-integration-tests.sh
+    - stage: test
+      name: "Integration Tests (openjdk9)"
+      jdk: openjdk9
+      script: ci/./run-integration-tests.sh
+    - stage: test
+      name: "Integration Tests (openjdk10)"
+      jdk: openjdk10
+      script: ci/./run-integration-tests.sh
+    - stage: test
+      name: "Integration Tests (oraclejdk11)"
+      jdk: oraclejdk11
+      script: ci/./run-integration-tests.sh
+    - stage: test
+      name: "Integration Tests (openjdk11)"
+      jdk: openjdk11
+      script: ci/./run-integration-tests.sh
+    - stage: test
+      name: "Integration Tests (openjdk12)"
+      jdk: openjdk12
+      script: ci/./run-integration-tests.sh
+
+    - stage: test
+      name: "Classpath Tests (oraclejdk8)"
+      jdk: oraclejdk8
+      script:
+        - TEST_FOLDER=JAVA_8 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_8 INITIALIZER_NAME=spring-initializr-older-versions INITIALIZER_PORT=8052 INITIALIZER_ARGS='-Dspring-boot.version=1.5.21.RELEASE -Dspring-initializr.version=0.4.0.RELEASE -Drun.jvmArguments="-Dspring.profiles.active=older-versions"' GENERATION_ARGS="-Dspring.profiles.active=older-versions" ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_8 ci/./run-classpath-tests.sh
+    - stage: test
+      name: "Classpath Tests (openjdk8)"
+      jdk: openjdk8
+      script:
+        - TEST_FOLDER=JAVA_8 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_8 INITIALIZER_NAME=spring-initializr-older-versions INITIALIZER_PORT=8052 INITIALIZER_ARGS='-Dspring-boot.version=1.5.21.RELEASE -Dspring-initializr.version=0.4.0.RELEASE -Drun.jvmArguments="-Dspring.profiles.active=older-versions"' GENERATION_ARGS="-Dspring.profiles.active=older-versions" ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_8 ci/./run-classpath-tests.sh
+    - stage: test
+      name: "Classpath Tests (oraclejdk9)"
+      jdk: oraclejdk9
+      script: 
+        - TEST_FOLDER=JAVA_9 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_9 ci/./run-classpath-tests.sh
+    - stage: test
+      name: "Classpath Tests (openjdk9)"
+      jdk: openjdk9
+      script: 
+        - TEST_FOLDER=JAVA_9 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_9 ci/./run-classpath-tests.sh
+    - stage: test
+      name: "Classpath Tests (openjdk10)"
+      jdk: openjdk10
+      script: 
+        - TEST_FOLDER=JAVA_10 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_10 ci/./run-classpath-tests.sh
+    - stage: test
+      name: "Classpath Tests (oraclejdk11)"
+      jdk: oraclejdk11
+      script:
+        - TEST_FOLDER=JAVA_11 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_11 ci/./run-classpath-tests.sh
+    - stage: test
+      name: "Classpath Tests (openjdk11)"
+      jdk: openjdk11
+      script:
+        - TEST_FOLDER=JAVA_11 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_11 ci/./run-classpath-tests.sh
+    - stage: test
+      name: "Classpath Tests (openjdk12)"
+      jdk: openjdk12
+      script: 
+        - TEST_FOLDER=JAVA_12 INITIALIZER_NAME=spring-initializr INITIALIZER_PORT=8050 ci/./generate-classpath-tests.sh
+        - TEST_FOLDER=JAVA_12 ci/./run-classpath-tests.sh
+
+    - stage: "Analyze"
+      jdk: oraclejdk8
+      script:
+        - ci/./analyze.sh
+    
+    - stage: "Javadoc"
+      jdk: oraclejdk8
+      script:
+        - ci/./generate-javadoc.sh
+    - stage: "Javadoc"
+      jdk: openjdk8
+      script:
+        - ci/./generate-javadoc.sh
+    - stage: "Javadoc"
+      jdk: oraclejdk9
+      script:
+        - ci/./generate-javadoc.sh
+    - stage: "Javadoc"
+      jdk: openjdk9
+      script:
+        - ci/./generate-javadoc.sh
+    - stage: "Javadoc"
+      jdk: openjdk10
+      script:
+        - ci/./generate-javadoc.sh
+    - stage: "Javadoc"
+      jdk: oraclejdk11
+      script:
+        - ci/./generate-javadoc.sh
+    - stage: "Javadoc"
+      jdk: openjdk11
+      script:
+        - ci/./generate-javadoc.sh
+    - stage: "Javadoc"
+      jdk: openjdk12
+      script:
+        - ci/./generate-javadoc.sh
+
+#    - stage: "Documentation"
+#      jdk: oraclejdk8
+#      script:
+#        - travis_wait 30 ci/./generate-documentation.sh
+#      deploy:
+#        skip_cleanup: true
+#        provider: surge
+#        project: target/surge
+#        domain: ogham-documentation.surge.sh
+#        on:
+#          all_branches: true
+      
+    - stage: "Deploy"
+      jdk: oraclejdk8
+      script: 
+        - ./mvnw clean install deploy --settings .travis-settings.xml -DskipTests=true -B | grep -Ei '(Uploading|Downloading|Uploaded|Downloaded)'
+#      
+      
+stages:
+  - "Build"
+  - test
+  - "Javadoc"
+  - "Analyze"
+  - "Documentation"
+  - "Deploy"
+
 notifications:
   slack:
     rooms:
       - secure: NdaSwFJ16HC93H1iimYB07/0rGwQfVCto2/XLrVJNeMcvdRsHbuhBnKwwUkNCTLeLLtB1DVmoNeCBdo2pmtAvoyTnl9OXhG3GWjoB++Al+/66x/TzC1g891y59JI/F7btVqZRKMi5URdcXt7VqSTUyu3Qjf6rxxeRMfiCgg4eLP2ABWQTvNpi7AgV9ArkVqat5Fo1p98iuxpUL0kByXmyuoN15f0azVm0Mhwv2LtMyHAf5Lq1gKOt7TfKccMEJaZXPZMfFWkXblZUWggx6EYXB2ylXJ7e45UeunsroqPYuXJtepwOjcT00NSm7tR+wDaVZl3hXDfexwb35wP+g/tcIiQYTWgQQvr5b6Z0tUX3WgZt7aBMH9gaJPRolC7FXwukXkdBwjvyDLsra147M2pm7fc5zj73TV0gaEdqDewd+UgFA12Vm1gwC0eWH/HVhOZ0HGOQdYmtYkZJ67KTwes9B+SKDkrSF4Nq7T3svOWvGxzDCaw4CCOBY5U1xRc3VVOo/xtFa8dAKfxpo0IFy/qaHS4vIb2BDHJ0LU7+WarcjcmADxJXvhvOvvByS5k0sqkUXF4uB+QpxQqQEGNMzLC2iMog0UnBIIEZEe6pvrzchoQIpKyom4GvnAi+Xco8aJaMgrLZY9JwmlLP8r1YFyMawH4kmJ8XpPZ5+fIN2HSkD4=
     template:
-      - "[%{result}] %{branch}"
+      - "*[%{result}]* %{branch}"
       - "Build: <%{build_url}|#%{build_number}> (%{duration})"
       - "Commit: <%{compare_url}|%{commit}> by %{author}"
       - "%{commit_message}"
+      - ""
+      - "---"
+      - ""
+      - "Documentation and reports:"
+      - " * <http://ogham-documentation.surge.sh/%{branch}/index.html|Generated site>"
+      - " * <http://ogham-documentation.surge.sh/%{branch}/jacoco-aggregate/index.html|JaCoCo>"
+      - " * <https://codecov.io/gh/groupe-sii/ogham/branch/%{branch}|Codecov>"
+      - " * <http://ogham-documentation.surge.sh/%{branch}/pit-reports/index.html|Mutation testing>"
 
 cache:
   directories:
-#    - $HOME/classpath-tests
     - $HOME/.m2
 before_cache:
-  - rm -rf $HOME/.m2/repository/fr/sii
\ No newline at end of file
+  - rm -rf $HOME/.m2/repository/fr/sii
+  
\ No newline at end of file
diff --git a/ci/analyze.sh b/ci/analyze.sh
new file mode 100755
index 0000000000..19b4c65438
--- /dev/null
+++ b/ci/analyze.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Sonar
+./mvnw clean install sonar:sonar -Dmaven.test.redirectTestOutputToFile=true -B | grep -Ei '(warn|error|ANALYSIS SUCCESSFUL)'
+
+# Codecov
+bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
new file mode 100755
index 0000000000..7d16bc3c45
--- /dev/null
+++ b/ci/build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -Dskip.integration.tests=true -Dskip.unit.tests=true -B -q
diff --git a/ci/detect-java-release.sh b/ci/detect-java-release.sh
new file mode 100755
index 0000000000..ece2fef34a
--- /dev/null
+++ b/ci/detect-java-release.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+java_version=$(java -version 2>&1 | grep -i version | cut -d'"' -f2)
+major=$(echo $java_version | cut -d'.' -f1)
+[ "1" = "$major" ] \
+  && echo "$java_version" | cut -d'.' -f2 > "$HOME/java-version.info" \
+  || echo "$java_version" | cut -d'.' -f1 > "$HOME/java-version.info"
+JAVA_RELEASE_VERSION=$(cat "$HOME/java-version.info")
\ No newline at end of file
diff --git a/ci/generate-classpath-tests.sh b/ci/generate-classpath-tests.sh
new file mode 100755
index 0000000000..e7f6bf1f10
--- /dev/null
+++ b/ci/generate-classpath-tests.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+
+# start Spring Initializr
+touch "$HOME/$INITIALIZER_NAME.log"
+spring-initializr/./mvnw clean spring-boot:run -f spring-initializr > "$HOME/$INITIALIZER_NAME.log" &
+echo "$!" > "$HOME/$INITIALIZER_NAME.pid"
+# tail -f "$HOME/$INITIALIZER_NAME.log" &
+(tail -f "$HOME/$INITIALIZER_NAME.log" &) | grep -q 'Started SpringInitializrApplication'
+
+# Generate projects
+OGHAM_VERSION=$(./mvnw -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
+./mvnw spring-boot:run -pl :ogham-test-classpath -Dspring-boot.run.arguments="$HOME/classpath-tests" -Dspring-boot.run.jvmArguments="-Drunner.parallel=false -Dogham-version=$OGHAM_VERSION -Dspring.initializer.url=http://localhost:$INITIALIZER_PORT/starter.zip $GENERATION_ARGS"
+
+ls -l "$HOME"
+ls -l "$HOME/classpath-tests"
+ls -l "$HOME/classpath-tests/$TEST_FOLDER"
+
+kill `cat "$HOME/$INITIALIZER_NAME.pid"` || echo ""
+
diff --git a/ci/generate-documentation.sh b/ci/generate-documentation.sh
new file mode 100755
index 0000000000..cd47660a89
--- /dev/null
+++ b/ci/generate-documentation.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# build pitest fix report aggregation fix
+git clone --branch fix/report-aggregation https://github.com/aurelien-baudet/pitest.git $HOME/pitest
+mvn clean install -DskipTests -f $HOME/pitest -q -B > $HOME/pitest-build.log
+
+# ./mvnw clean install post-site -Dmaven.test.redirectTestOutputToFile=true -B | grep -Ei '(error|warn|fail|success|Total time)'
+# TODO: Travis CI stops the job after 50 minutes -> mutation-testing is disabled => find a way to run mutation testing
+# touch $HOME/mvn.log
+# ./mvnw clean install post-site -Pmutation-testing -Dmaven.test.redirectTestOutputToFile=true -B -Dorg.slf4j.simpleLogger.logFile=$HOME/mvn.log > $HOME/pitest.log 2>&1 &
+# (tail -f $HOME/mvn.log | grep -Ei '(error|warn|fail|success|Total time)' &)
+# (tail -f $HOME/mvn.log &) | grep -q '[INFO] Finished at:'
+
+./mvnw clean install post-site -Pmutation-testing -Dmaven.test.redirectTestOutputToFile=true -B
+
+# copy generated site and reports to a specific folder for deployment
+mkdir -p target/surge/$TRAVIS_BRANCH
+cp -r target/site/* target/surge/$TRAVIS_BRANCH
diff --git a/ci/generate-javadoc.sh b/ci/generate-javadoc.sh
new file mode 100755
index 0000000000..f5e3cd4962
--- /dev/null
+++ b/ci/generate-javadoc.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./mvnw clean install javadoc:javadoc -Dmaven.test.redirectTestOutputToFile=true -fae -B | grep -Ei '(error|warn)'
diff --git a/ci/run-classpath-tests.sh b/ci/run-classpath-tests.sh
new file mode 100755
index 0000000000..c20a5e9ab7
--- /dev/null
+++ b/ci/run-classpath-tests.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+$HOME/classpath-tests/$TEST_FOLDER/./mvnw test -T 2.5C -f "$HOME/classpath-tests/$TEST_FOLDER/pom.xml" -Dmaven.test.redirectTestOutputToFile=true -fae -q -B #| grep -Ei '(error|exception|Tests run:)'
\ No newline at end of file
diff --git a/ci/run-integration-tests.sh b/ci/run-integration-tests.sh
new file mode 100755
index 0000000000..80c8dc7a94
--- /dev/null
+++ b/ci/run-integration-tests.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./mvnw verify -Dmaven.test.redirectTestOutputToFile=true -fae -B -q
\ No newline at end of file
diff --git a/ci/run-unit-tests.sh b/ci/run-unit-tests.sh
new file mode 100755
index 0000000000..f4d96754e7
--- /dev/null
+++ b/ci/run-unit-tests.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./mvnw test -Dmaven.test.redirectTestOutputToFile=true -fae -B -q
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 383e1d50ff..b6d2a1f5d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,17 +73,20 @@
 		<skip.integration.tests>false</skip.integration.tests>
 		<skip.unit.tests>false</skip.unit.tests>
 
+		<!-- Mutation testing -->
+		<pit.report.path>${project.basedir}/../target/site/pit-reports</pit.report.path>
+
 		<!-- Code coverage -->
 		<jacoco.it.execution.data.file>${project.basedir}/../target/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
 		<jacoco.ut.execution.data.file>${project.basedir}/../target/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
 		<jacoco.all.execution.data.file>${project.basedir}/../target/coverage-reports/jacoco-all.exec</jacoco.all.execution.data.file>
 		<jacoco.report.path>${project.basedir}/../target/site/jacoco-aggregate</jacoco.report.path>
-		
+
 		<!-- Sonar properties -->
 		<sonar.junit.reportPaths>${project.build.directory}/surefire-reports,${project.build.directory}/failsafe-reports</sonar.junit.reportPaths>
-		<sonar.jacoco.reportPaths>${jacoco.ut.execution.data.file},${jacoco.it.execution.data.file}</sonar.jacoco.reportPaths>
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+		<sonar.coverage.jacoco.xmlReportPaths>${jacoco.report.path}/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 
 		<!-- URL -->
 		<github.url>https://github.com/groupe-sii/ogham</github.url>
@@ -100,6 +103,8 @@
 		<site.staging.dir>${project.build.outputDirectory}/staging</site.staging.dir>
 		<site.output.dir>${site.staging.dir}/v${docProjectVersion}</site.output.dir>
 		<doc-theme>cerulean</doc-theme>
+		<asciidoctor.skip>${maven.site.skip}</asciidoctor.skip>
+		<sass.skip>${maven.site.skip}</sass.skip>
 
 		<!-- Plugins -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -109,6 +114,9 @@
 		<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
+		<!-- Plugins - mutation testing -->
+		<pitest-maven.version>1.4.9-SNAPSHOT</pitest-maven.version>
+		<pitmp-maven-plugin.version>1.3.7</pitmp-maven-plugin.version>
 		<!-- Plugins - documentation -->
 		<maven-site-plugin.version>3.7</maven-site-plugin.version>
 		<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
@@ -583,6 +591,12 @@
 							<propertyName>surefireArgLine</propertyName>
 						</configuration>
 					</execution>
+					<execution>
+						<id>generate-xml-report</id>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
 					<execution>
 						<id>pre-integration-test</id>
 						<goals>
@@ -592,6 +606,12 @@
 							<propertyName>failsafeArgLine</propertyName>
 						</configuration>
 					</execution>
+					<execution>
+						<id>generate-xml-integration-report</id>
+						<goals>
+							<goal>report-integration</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 			<!-- Used for unit tests -->
@@ -709,6 +729,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
+							<skip>${asciidoctor.skip}</skip>
 							<resources>
 								<resource>
 									<directory>src/docs/resources</directory>
@@ -724,6 +745,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
+							<skip>${asciidoctor.skip}</skip>
 							<resources>
 								<resource>
 									<directory>target/generated-docs</directory>
@@ -807,6 +829,7 @@
 							<goal>unpack</goal>
 						</goals>
 						<configuration>
+							<skip>${maven.site.skip}</skip>
 							<artifactItems>
 								<artifactItem>
 									<groupId>io.github.devacfr.maven.skins</groupId>
@@ -875,6 +898,7 @@
 							<goal>run</goal>
 						</goals>
 						<configuration>
+							<skip>${maven.site.skip}</skip>
 							<target>
 								<copy todir="target/generated-scss/asciidoctor">
 									<fileset dir="target/unpacked/gems">
@@ -915,6 +939,7 @@
 					</execution>
 				</executions>
 				<configuration>
+					<skip>${sass.skip}</skip>
 					<!-- Add resources in order to import files like it was in same source 
 						folder -->
 					<resources>
@@ -1100,6 +1125,41 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
+				<!-- Mutation testing -->
+				<plugin>
+					<groupId>eu.stamp-project</groupId>
+					<artifactId>pitmp-maven-plugin</artifactId>
+					<version>${pitmp-maven-plugin.version}</version>
+					<executions>
+						<execution>
+							<id>run-mutation-testing</id>
+							<phase>site</phase>
+							<goals>
+								<goal>run</goal>
+							</goals>
+							<configuration>
+								<mutationEngine>descartes</mutationEngine>
+								<skippedModules>
+									<param>ogham-spring-boot-autoconfigure</param>
+									<param>ogham-spring-boot-starter-all</param>
+									<param>ogham-spring-boot-starter-email</param>
+									<param>ogham-spring-boot-starter-sms</param>
+									<param>ogham-spring-boot-common-autoconfigure</param>
+								</skippedModules>
+								<outputFormats>
+									<outputFormat>HTML</outputFormat>
+									<outputFormat>XML</outputFormat>
+								</outputFormats>
+								<exportLineCoverage>true</exportLineCoverage>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.pitest</groupId>
+					<artifactId>pitest-maven</artifactId>
+					<version>${pitest-maven.version}</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
@@ -1140,6 +1200,34 @@
 							<report>report-integration</report>
 						</reports>
 					</reportSet>
+					<reportSet>
+						<reports>
+							<report>report-aggregate</report>
+						</reports>
+						<inherited>false</inherited>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<!-- Project info -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>summary</report>
+							<report>licenses</report>
+							<report>modules</report>
+							<report>team</report>
+							<report>scm</report>
+							<report>issue-management</report>
+							<report>dependencies</report>
+							<report>dependency-info</report>
+							<report>dependency-convergence</report>
+							<report>dependency-management</report>
+							<report>plugins</report>
+						</reports>
+					</reportSet>
 				</reportSets>
 			</plugin>
 		</plugins>
@@ -1220,6 +1308,91 @@
 				<maven.compiler.release>8</maven.compiler.release>
 			</properties>
 		</profile>
+		<profile>
+			<id>mutation-testing</id>
+			<build>
+				<plugins>
+					<!-- Run mutation testing -->
+					<plugin>
+						<groupId>eu.stamp-project</groupId>
+						<artifactId>pitmp-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+			<!-- Add Maven report -->
+			<reporting>
+				<plugins>
+					<!-- <plugin> -->
+					<!-- <groupId>org.pitest</groupId> -->
+					<!-- <artifactId>pitest-maven</artifactId> -->
+					<!-- <version>${pitest-maven.version}</version> -->
+					<!-- <inherited>false</inherited> -->
+					<!-- <reportSets> -->
+					<!-- <reportSet> -->
+					<!-- <reports> -->
+					<!-- <report>report-aggregate-module</report> -->
+					<!-- </reports> -->
+					<!-- </reportSet> -->
+					<!-- </reportSets> -->
+					<!-- </plugin> -->
+				</plugins>
+			</reporting>
+		</profile>
+		<profile>
+			<id>mutation-testing-only</id>
+			<properties>
+				<skip.integration.tests>true</skip.integration.tests>
+				<skip.unit.tests>true</skip.unit.tests>
+				<sass.skip>true</sass.skip>
+				<asciidoctor.skip>true</asciidoctor.skip>
+				<generateProjectInfo>false</generateProjectInfo>
+				<generateReports>false</generateReports>
+				<generateSitemap>false</generateSitemap>
+				<maven.javadoc.skip>true</maven.javadoc.skip>
+				<mpir.skip>true</mpir.skip>
+			</properties>
+			<build>
+				<plugins>
+					<!-- Run mutation testing -->
+					<plugin>
+						<groupId>eu.stamp-project</groupId>
+						<artifactId>pitmp-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+			<!-- Add Maven report -->
+			<reporting>
+				<plugins>
+					<!-- <plugin> -->
+					<!-- <groupId>org.pitest</groupId> -->
+					<!-- <artifactId>pitest-maven</artifactId> -->
+					<!-- <version>${pitest-maven.version}</version> -->
+					<!-- <inherited>false</inherited> -->
+					<!-- <reportSets> -->
+					<!-- <reportSet> -->
+					<!-- <reports> -->
+					<!-- <report>report-aggregate-module</report> -->
+					<!-- </reports> -->
+					<!-- </reportSet> -->
+					<!-- </reportSets> -->
+					<!-- </plugin> -->
+				</plugins>
+			</reporting>
+		</profile>
+		<profile>
+			<id>mutation-testing-aggregate-report-only</id>
+			<properties>
+				<skip.integration.tests>true</skip.integration.tests>
+				<skip.unit.tests>true</skip.unit.tests>
+				<sass.skip>true</sass.skip>
+				<asciidoctor.skip>true</asciidoctor.skip>
+				<generateProjectInfo>false</generateProjectInfo>
+				<generateReports>false</generateReports>
+				<generateSitemap>false</generateSitemap>
+				<maven.javadoc.skip>true</maven.javadoc.skip>
+				<mpir.skip>true</mpir.skip>
+			</properties>
+		</profile>
 	</profiles>
 
 	<licenses>
diff --git a/reporting/pom.xml b/reporting/pom.xml
index 86ecb4a2e1..9fb613c4dd 100644
--- a/reporting/pom.xml
+++ b/reporting/pom.xml
@@ -171,19 +171,14 @@
 					</execution>
 					<execution>
 						<id>report</id>
-						<phase>site</phase>
+						<phase>verify</phase>
 						<goals>
 							<goal>report-aggregate</goal>
 						</goals>
 						<configuration>
 							<excludes>
-<!-- 								<exclude>ogham-test-classpath/**</exclude> -->
-<!-- 								<exclude>**ogham-test-classpath/**</exclude> -->
 								<exclude>fr/sii/ogham/test/classpath/**</exclude>
-<!-- 								<exclude>**fr/sii/ogham/test/classpath/**</exclude> -->
 								<exclude>*mvnwrapper-for-projects/**</exclude>
-<!-- 								<exclude>fr.sii.ogham.test.classpath.**</exclude> -->
-<!-- 								<exclude>**fr.sii.ogham.test.classpath.**</exclude> -->
 							</excludes>
 							<outputDirectory>${jacoco.report.path}</outputDirectory>
 						</configuration>
@@ -191,5 +186,63 @@
 				</executions>
 			</plugin>
 		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.pitest</groupId>
+					<artifactId>pitest-maven</artifactId>
+					<executions>
+						<execution>
+							<id>merge-pitest-reports</id>
+							<phase>site</phase>
+							<goals>
+								<goal>report-aggregate</goal>
+							</goals>
+							<configuration>
+								<reportsDirectory>${pit.report.path}</reportsDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>mutation-testing</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.pitest</groupId>
+						<artifactId>pitest-maven</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>mutation-testing-only</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.pitest</groupId>
+						<artifactId>pitest-maven</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>mutation-testing-aggregate-report-only</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.pitest</groupId>
+						<artifactId>pitest-maven</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 </project>
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 1dae1a5d65..38de8aaf93 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -44,7 +44,7 @@
 				<column>Main</column>
 				<column>Download|Contribute</column>
 				<column>Documentation</column>
-				<column>reports</column>
+				<column>Reports|Maven Reports</column>
 			</bottomNav>
 			<bottomDescription>
 				<![CDATA[
@@ -192,7 +192,6 @@
 			<item name="Features" href="features.html" />
 			<item name="Roadmap" href="roadmap.html" />
 			<item name="Release notes" href="release-notes.html" />
-			<item name="Sonar Analysis" href="https://sonarcloud.io/organizations/aurelien-baudet-github/projects" />
 		</menu>
 		<menu name="Download" inherit="bottom">
 			<item name="Download" href="user-manual.html#install" />
@@ -203,6 +202,10 @@
 			<item name="Issues" href="${this.github.url}/issues" />
 			<item name="Fork on GitHub" href="${this.github.url}" />
 		</menu>
-		<menu name="Maven reports" ref="reports" inherit="bottom" />
+		<menu name="Reports" inherit="bottom">
+			<item name="Sonar Analysis" href="https://sonarcloud.io/organizations/aurelien-baudet-github/projects" />
+			<item name="Codecov" href="https://codecov.io/gh/groupe-sii/ogham" />
+		</menu>
+		<menu name="Maven Reports" ref="reports" inherit="bottom" />
 	</body>
 </project>
\ No newline at end of file