Skip to content

Commit c341cf2

Browse files
committed
Appveyor: remove useless download of travis-utils
1 parent 733175b commit c341cf2

3 files changed

Lines changed: 12 additions & 32 deletions

File tree

appveyor.ps1

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,6 @@ function FetchAndUnzip
3131
[System.IO.Compression.ZipFile]::ExtractToDirectory($tmp, $Out)
3232
}
3333

34-
function InstallAppveyorTools
35-
{
36-
$travisUtilsVersion = "21"
37-
$localPath = "$env:USERPROFILE\.local"
38-
$travisUtilsPath = "$localPath\travis-utils-$travisUtilsVersion"
39-
if (Test-Path $travisUtilsPath)
40-
{
41-
echo "Reusing the Travis Utils version $travisUtilsVersion already downloaded under $travisUtilsPath"
42-
}
43-
else
44-
{
45-
$url = "https://github.com/SonarSource/travis-utils/archive/v$travisUtilsVersion.zip"
46-
echo "Downloading Travis Utils version $travisUtilsVersion from $url into $localPath"
47-
FetchAndUnzip $url $localPath
48-
}
49-
50-
$mavenLocalRepository = "$env:USERPROFILE\.m2\repository"
51-
if (-not(Test-Path $mavenLocalRepository))
52-
{
53-
mkdir $mavenLocalRepository | Out-Null
54-
}
55-
echo "Installating Travis Utils closed source Maven projects into $mavenLocalRepository"
56-
Copy-Item "$travisUtilsPath\m2repo\*" $mavenLocalRepository -Force -Recurse
57-
58-
$env:ORCHESTRATOR_CONFIG_URL = ""
59-
$env:TRAVIS = "ORCH-332"
60-
}
61-
6234
function Build
6335
{
6436
param ([string]$Project, [string]$Sha1)
@@ -117,16 +89,12 @@ switch ($env:RUN)
11789
{
11890
"ci"
11991
{
120-
InstallAppveyorTools
121-
12292
mvn verify "--batch-mode" "-B" "-e" "-V"
12393
CheckLastExitCode
12494
}
12595

12696
{($_ -eq "plugin") -or ($_ -eq "ruling")}
12797
{
128-
InstallAppveyorTools
129-
13098
if ($env:SQ_VERSION -eq "DEV")
13199
{
132100
BuildSnapshot "SonarSource/sonarqube"

its/plugin/tests/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
<artifactId>sonar-orchestrator</artifactId>
2929
<version>${orchestrator.version}</version>
3030
<scope>test</scope>
31+
<exclusions>
32+
<exclusion>
33+
<groupId>com.oracle</groupId>
34+
<artifactId>ojdbc6</artifactId>
35+
</exclusion>
36+
</exclusions>
3137
</dependency>
3238
<dependency>
3339
<groupId>org.codehaus.sonar</groupId>

its/ruling/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<artifactId>sonar-orchestrator</artifactId>
3030
<version>${orchestrator.version}</version>
3131
<scope>test</scope>
32+
<exclusions>
33+
<exclusion>
34+
<groupId>com.oracle</groupId>
35+
<artifactId>ojdbc6</artifactId>
36+
</exclusion>
37+
</exclusions>
3238
</dependency>
3339
<dependency>
3440
<groupId>junit</groupId>

0 commit comments

Comments
 (0)