From dc49e49bd6a3c04a11a2dc87126ba1fde2d0f121 Mon Sep 17 00:00:00 2001
From: Jacek Gebal <jgebal@users.noreply.github.com>
Date: Tue, 17 Jul 2018 00:57:42 +0100
Subject: [PATCH 1/3] Fixed issue with sonar scanner failing on PRs from other
 repositories.

---
 .travis/run_sonar_scanner.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
index d05b5806e..b3a051df8 100755
--- a/.travis/run_sonar_scanner.sh
+++ b/.travis/run_sonar_scanner.sh
@@ -30,9 +30,10 @@ else
 fi   
 
 
-#Are we running on develop branch ?
+#Are we running on utPLSQL repo and not an external PR?
 echo "Check if we running from develop or on branch"
-if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then
+if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ] && \
+    [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then
     
     echo "" >> sonar-project.properties
     if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 

From 2470ee26d041295f5f332cfce2cc2d7391ab57c3 Mon Sep 17 00:00:00 2001
From: lwasylow <lwasylow@gmail.com>
Date: Tue, 17 Jul 2018 22:29:54 +0100
Subject: [PATCH 2/3] Update sonar PR external

---
 .travis/run_sonar_scanner.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
index b3a051df8..09038bd5f 100755
--- a/.travis/run_sonar_scanner.sh
+++ b/.travis/run_sonar_scanner.sh
@@ -32,20 +32,21 @@ fi
 
 #Are we running on utPLSQL repo and not an external PR?
 echo "Check if we running from develop or on branch"
-if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ] && \
-    [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then
+if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then
     
     echo "" >> sonar-project.properties
     if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 
         echo "Updating sonar properties to include branch ${BRANCH}"
         add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" 
         add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${MAIN_DEV_BRANCH}" 
-     else
+     elif [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]
        echo "Updating sonar properties to include pull request ${BRANCH}"
        add_sonar_property "${PR_SONAR_TOKEN_PROPERTY}" "${GITHUB_TRAVISCI_TOKEN}"
        add_sonar_property "${PR_SONAR_BRANCH_PROPERTY}" "${BRANCH}"
        add_sonar_property "${PR_KEY_PROPERTY}" "${PR}"
        add_sonar_property "${PR_SONAR_BASE_PROPERTY}" "${PR_BRANCH}"
+     else
+       echo "PR from external source no changes to properties."
      fi    
 else
     echo "No need to update sonar we building on release or develop"

From d6aeef8e00dc5f471391b5d78cb5987d1bd532ff Mon Sep 17 00:00:00 2001
From: lwasylow <lwasylow@gmail.com>
Date: Wed, 18 Jul 2018 06:46:41 +0100
Subject: [PATCH 3/3] Update if statment

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

diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
index 09038bd5f..5cad42e29 100755
--- a/.travis/run_sonar_scanner.sh
+++ b/.travis/run_sonar_scanner.sh
@@ -39,7 +39,7 @@ if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(releas
         echo "Updating sonar properties to include branch ${BRANCH}"
         add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" 
         add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${MAIN_DEV_BRANCH}" 
-     elif [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]
+     elif [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then
        echo "Updating sonar properties to include pull request ${BRANCH}"
        add_sonar_property "${PR_SONAR_TOKEN_PROPERTY}" "${GITHUB_TRAVISCI_TOKEN}"
        add_sonar_property "${PR_SONAR_BRANCH_PROPERTY}" "${BRANCH}"