From 7c79e6a4e1362287c89ae228b5a8cb8d3df0aa46 Mon Sep 17 00:00:00 2001
From: Viktor Sadovnikov <viktor@jv-ration.com>
Date: Mon, 18 Apr 2016 11:42:43 +0200
Subject: [PATCH 1/6] testing bad example for SonarQube

---
 .../com/containersol/minimesos/docker/DockerClientFactory.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java b/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java
index b2a588c1..a14eb699 100644
--- a/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java
+++ b/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java
@@ -12,6 +12,8 @@ public class DockerClientFactory {
 
     private static DockerClient dockerClient;
 
+    private final static String bad_example = "bad example";
+
     public static DockerClient build() {
         if (dockerClient == null) {
             DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder();

From 9f1d30e732365305f2dd293bee3579e063e70700 Mon Sep 17 00:00:00 2001
From: Viktor Sadovnikov <viktor@jv-ration.com>
Date: Mon, 18 Apr 2016 14:54:55 +0200
Subject: [PATCH 2/6] testing bad example for SonarQube

---
 .../com/containersol/minimesos/docker/DockerClientFactory.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java b/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java
index a14eb699..b2a588c1 100644
--- a/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java
+++ b/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java
@@ -12,8 +12,6 @@ public class DockerClientFactory {
 
     private static DockerClient dockerClient;
 
-    private final static String bad_example = "bad example";
-
     public static DockerClient build() {
         if (dockerClient == null) {
             DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder();

From 4b6a46dbc6fb7200d2f69352c67faa793235eb17 Mon Sep 17 00:00:00 2001
From: Viktor Sadovnikov <viktor@jv-ration.com>
Date: Mon, 18 Apr 2016 16:15:21 +0200
Subject: [PATCH 3/6] running regular SonarQube scan on this branch (later on
 master)

---
 travis.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/travis.sh b/travis.sh
index 747e5b47..4064f066 100755
--- a/travis.sh
+++ b/travis.sh
@@ -10,4 +10,10 @@ if [ ! -z "$TRAVIS_PULL_REQUEST" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; t
     GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.analysis.mode=preview -Dsonar.host.url=$SQ_URL -Dsonar.github.oauth=$GH_TOKEN -Dsonar.github.repository=$TRAVIS_REPO_SLUG -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST"
 fi
 
+if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "build/removal-of-jenkins" ]; then
+    echo "Building $TRAVIS_BRANCH branch. Will execute SonarQube scan"
+    GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.host.url=$SQ_URL -Dsonar.jdbc.url=$SQ_JDBC_URL -Dsonar.jdbc.driverClassName=org.postgresql.Driver -Dsonar.jdbc.user=$SQ_JDBC_USER -Dsonar.jdbc.password=$SQ_JDBC_PASSWORD"
+fi
+
 ./gradlew --info --stacktrace clean build $GH_SONARQ_PARAMS
+

From 491ca1fb28eacc19385d234a0ecc24f2be6a01e7 Mon Sep 17 00:00:00 2001
From: Viktor Sadovnikov <viktor@jv-ration.com>
Date: Mon, 18 Apr 2016 16:27:26 +0200
Subject: [PATCH 4/6] running regular SonarQube scan on master

---
 travis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis.sh b/travis.sh
index 4064f066..7e6e47e1 100755
--- a/travis.sh
+++ b/travis.sh
@@ -10,7 +10,7 @@ if [ ! -z "$TRAVIS_PULL_REQUEST" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; t
     GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.analysis.mode=preview -Dsonar.host.url=$SQ_URL -Dsonar.github.oauth=$GH_TOKEN -Dsonar.github.repository=$TRAVIS_REPO_SLUG -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST"
 fi
 
-if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "build/removal-of-jenkins" ]; then
+if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then
     echo "Building $TRAVIS_BRANCH branch. Will execute SonarQube scan"
     GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.host.url=$SQ_URL -Dsonar.jdbc.url=$SQ_JDBC_URL -Dsonar.jdbc.driverClassName=org.postgresql.Driver -Dsonar.jdbc.user=$SQ_JDBC_USER -Dsonar.jdbc.password=$SQ_JDBC_PASSWORD"
 fi

From 62502c2387c6560c8a709a0a675ce26c424e1010 Mon Sep 17 00:00:00 2001
From: Viktor Sadovnikov <viktor@jv-ration.com>
Date: Wed, 20 Apr 2016 10:10:44 +0200
Subject: [PATCH 5/6] comment in travis.sh

---
 travis.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/travis.sh b/travis.sh
index 7e6e47e1..73ac9d6c 100755
--- a/travis.sh
+++ b/travis.sh
@@ -10,6 +10,7 @@ if [ ! -z "$TRAVIS_PULL_REQUEST" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; t
     GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.analysis.mode=preview -Dsonar.host.url=$SQ_URL -Dsonar.github.oauth=$GH_TOKEN -Dsonar.github.repository=$TRAVIS_REPO_SLUG -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST"
 fi
 
+# Update SonarQube data on push builds on master branch
 if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then
     echo "Building $TRAVIS_BRANCH branch. Will execute SonarQube scan"
     GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.host.url=$SQ_URL -Dsonar.jdbc.url=$SQ_JDBC_URL -Dsonar.jdbc.driverClassName=org.postgresql.Driver -Dsonar.jdbc.user=$SQ_JDBC_USER -Dsonar.jdbc.password=$SQ_JDBC_PASSWORD"

From a47cc798f5cf42571ad55aad5d3ee52869736bda Mon Sep 17 00:00:00 2001
From: Viktor Sadovnikov <viktor@jv-ration.com>
Date: Wed, 20 Apr 2016 10:41:59 +0200
Subject: [PATCH 6/6] run SonarQube only when encrypted variables are available

---
 travis.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis.sh b/travis.sh
index 73ac9d6c..07d7f278 100755
--- a/travis.sh
+++ b/travis.sh
@@ -5,13 +5,13 @@ GH_SONARQ_PARAMS=""
 
 # When run on Travis CI, env var TRAVIS_PULL_REQUEST either contains PR number (for PR builds) or "false" (for push builds).
 # Locally this env var is not set. Test: if variable is not empty and is not equal "false"
-if [ ! -z "$TRAVIS_PULL_REQUEST" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
+if [ ! -z "$TRAVIS_PULL_REQUEST" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ] && [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then
     echo "PR build. Will execute SonarQube preview scan"
     GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.analysis.mode=preview -Dsonar.host.url=$SQ_URL -Dsonar.github.oauth=$GH_TOKEN -Dsonar.github.repository=$TRAVIS_REPO_SLUG -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST"
 fi
 
 # Update SonarQube data on push builds on master branch
-if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then
+if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then
     echo "Building $TRAVIS_BRANCH branch. Will execute SonarQube scan"
     GH_SONARQ_PARAMS="jacocoTestReport sonarqube -Dsonar.host.url=$SQ_URL -Dsonar.jdbc.url=$SQ_JDBC_URL -Dsonar.jdbc.driverClassName=org.postgresql.Driver -Dsonar.jdbc.user=$SQ_JDBC_USER -Dsonar.jdbc.password=$SQ_JDBC_PASSWORD"
 fi