Merge pull request #29 from Bernardo-MG/merge_master

Merge master

.gitignore

@@ -58,4 +58,3 @@ Desktop.ini
 ._*
 .Spotlight-V100
 .Trashes
-/target/

.travis.yml

@@ -4,25 +4,32 @@ jdk:
   - oraclejdk7
   - openjdk7
 env:
+  # Deployments are disabled by default
   - DEPLOY=false DEPLOY_DOCS=false
-# Setting the JDK which will do the deployment
 matrix:
   exclude:
     - jdk: oraclejdk7
     - jdk: oraclejdk8
   include:
+    # Code artifacts deployed with JDK7
     - jdk: oraclejdk7
       env: DEPLOY=true DEPLOY_DOCS=false PULL_REQUEST=$TRAVIS_PULL_REQUEST SCM_BRANCH=$TRAVIS_BRANCH
+    # Documentation deployed with JDK8
     - jdk: oraclejdk8
       env: DEPLOY=false DEPLOY_DOCS=true PULL_REQUEST=$TRAVIS_PULL_REQUEST SCM_BRANCH=$TRAVIS_BRANCH
 
 before_install:
+  # Scripts are set as executable
   - chmod +x ./.scripts/create-maven-settings.sh
   - chmod +x ./.scripts/deploy.sh
   - chmod +x ./.scripts/deploy-site.sh
+  # Creates Maven settings
   - ./.scripts/create-maven-settings.sh
 script:
+  # Unit and integration tests are run
   - mvn clean verify
 after_success:
+  # Documentation deployment script
   - ./.scripts/deploy-site.sh
+  # Code artifacts deployment script
   - ./.scripts/deploy.sh