[incubator-tamaya] branch master updated: TAMAYA-277: Try to reapply changes after merge errors

[pottlinger]

This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya.git


The following commit(s) were added to refs/heads/master by this push:
     new 047dfac  TAMAYA-277: Try to reapply changes after merge errors
047dfac is described below

commit 047dface4b3639746322322e50476551f2a0e763
Author: Hugo Hirsch <git...@hugo-hirsch.de>
AuthorDate: Wed May 15 20:05:35 2019 +0200

    TAMAYA-277: Try to reapply changes after merge errors
---
 .travis.yml | 37 ++++++++++++++++++++++++++-----------
 README.md   |  6 +++++-
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 245df5f..0a66eb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,30 @@
 language: java
-jdk:
-  - openjdk8
-  - openjdk9
-  - openjdk10
-  - openjdk11
+dist: trusty
+sudo: required
 
-#before_script:
-#  - pip install --user codecov
+addons:
+  sonarcloud:
+    organization: "apache"
 
-#after_success:
-#  - codecov
+jobs:
+    include:
+        - name: "Java 8"
+          jdk: openjdk8
+          script: mvn clean install
+          after_success: mvn sonar:sonar -Dsonar.organization=apache 
-Dsonar.projectKey=apache_incubator-tamaya
 
-#addons:
-#  srcclr: true 
+        - name: "Java 9"
+          jdk: openjdk9
+          script: mvn clean install
+
+        - name: "Java 10"
+          jdk: openjdk10
+          script: mvn clean install
+
+        - name: "Java 11"
+          jdk: openjdk11
+          script: mvn clean install
+
+        - name: "Java 12"
+          jdk: openjdk12
+          script: mvn clean install
diff --git a/README.md b/README.md
index 6802567..804d178 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,12 @@ $ export MAVEN_OPTS="-Xmx512m -XX:PermGenSpace=200m"
 $ mvn
 ```
 
-### Travis / CI
+### Travis / CI / badges
 
 Apart from integration into ASF CI there's a travis build:
 
 [![Build 
Status](https://travis-ci.org/apache/incubator-tamaya.svg?branch=master)](https://travis-ci.org/apache/incubator-tamaya/branches)
+
+Sonarcloud integration:
+
+[![Quality Gate 
Status](https://sonarcloud.io/api/project_badges/measure?project=apache_incubator-tamaya&metric=alert_status)](https://sonarcloud.io/dashboard?id=apache_incubator-tamaya)