From ae038e155d03502e1dcd154408f29a057f089456 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Wed, 4 Mar 2020 10:53:12 +0100
Subject: BUILD-759 Move Jenkins + Travis QA to Cirrus CI

---
 it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'it/src')

diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
index 086cba9..f03e757 100644
--- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
+++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
@@ -68,13 +68,16 @@ public abstract class ScannerTestCase {
       if (StringUtils.isNotBlank(scannerVersion)) {
         LOG.info("Use provided Scanner version: " + scannerVersion);
         artifactVersion = Version.create(scannerVersion);
+      } else if (StringUtils.isNotBlank(System.getenv("PROJECT_VERSION"))) {
+        scannerVersion = System.getenv("PROJECT_VERSION");
+        LOG.info("Use Scanner version from environment: " + scannerVersion);
+        artifactVersion = Version.create(scannerVersion);
       } else {
         try (FileInputStream fis = new FileInputStream(
           new File("../target/maven-archiver/pom.properties"))) {
           Properties props = new Properties();
           props.load(fis);
           artifactVersion = Version.create(props.getProperty("version"));
-          return artifactVersion;
         } catch (IOException e) {
           throw new IllegalStateException(e);
         }
-- 
cgit v1.2.3