Skip to content

Commit 4ba2871

Browse files
ehartmannehartmann
authored
Merge pull request #55 from SonarSource/feature/eh/SCANNERAPI-178/increase_timeout_jar_downloads
SCANNERAPI-178 Increase timeout for downloading bootstrap jar
2 parents 8af240f + 493842d commit 4ba2871

108 files changed

Lines changed: 1299 additions & 366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
SQ_VERSION:
55
- DEV
6-
- LTS
6+
- LATEST_RELEASE[6.7]
77
- LATEST_RELEASE
88

99
JAVA_VERSION:

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ Icon?
2828
Thumbs.db
2929
# Folder config file
3030
Desktop.ini
31+
32+
# Scanner work
33+
.scannerwork

‎api/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
<artifactId>mockito-core</artifactId>
4848
<scope>test</scope>
4949
</dependency>
50+
<dependency>
51+
<groupId>org.mockito</groupId>
52+
<artifactId>mockito-inline</artifactId>
53+
<scope>test</scope>
54+
</dependency>
5055
<dependency>
5156
<groupId>org.assertj</groupId>
5257
<artifactId>assertj-core</artifactId>

‎api/src/main/java/org/sonarsource/scanner/api/Dirs.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SonarQube Scanner API
3-
* Copyright (C) 2011-2017 SonarSource SA
3+
* Copyright (C) 2011-2018 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
66
* This program is free software; you can redistribute it and/or

‎api/src/main/java/org/sonarsource/scanner/api/EmbeddedScanner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SonarQube Scanner API
3-
* Copyright (C) 2011-2017 SonarSource SA
3+
* Copyright (C) 2011-2018 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
66
* This program is free software; you can redistribute it and/or

‎api/src/main/java/org/sonarsource/scanner/api/LogOutput.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SonarQube Scanner API
3-
* Copyright (C) 2011-2017 SonarSource SA
3+
* Copyright (C) 2011-2018 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
66
* This program is free software; you can redistribute it and/or

‎api/src/main/java/org/sonarsource/scanner/api/LoggerAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SonarQube Scanner API
3-
* Copyright (C) 2011-2017 SonarSource SA
3+
* Copyright (C) 2011-2018 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
66
* This program is free software; you can redistribute it and/or

‎api/src/main/java/org/sonarsource/scanner/api/ScanProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SonarQube Scanner API
3-
* Copyright (C) 2011-2017 SonarSource SA
3+
* Copyright (C) 2011-2018 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
66
* This program is free software; you can redistribute it and/or

‎api/src/main/java/org/sonarsource/scanner/api/ScannerProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SonarQube Scanner API
3-
* Copyright (C) 2011-2017 SonarSource SA
3+
* Copyright (C) 2011-2018 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
66
* This program is free software; you can redistribute it and/or

‎api/src/main/java/org/sonarsource/scanner/api/StdOutLogOutput.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SonarQube Scanner API
3-
* Copyright (C) 2011-2017 SonarSource SA
3+
* Copyright (C) 2011-2018 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
66
* This program is free software; you can redistribute it and/or

0 commit comments

Comments
 (0)