Skip to content

Commit

Permalink
SONARIAC-1732 Fix failing build task on public sonar-iac (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
petertrr authored and sonartech committed Oct 17, 2024
1 parent 23c3822 commit 2d9bd97
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 35 deletions.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sonar-orchestrator = "5.0.0.2065"
junit = "5.11.0"
assertj = "3.26.3"
mockito = "5.13.0"
sonar-lint = "10.7.1.79146"
sonar-lint = "10.6.0.79033"
sslr = "1.24.0.633"
archunit = "1.3.0"
snakeyaml = "2.8"
Expand Down
34 changes: 0 additions & 34 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,6 @@ pluginManagement {
repositories {
mavenCentral()
gradlePluginPortal()
maven {
name = "artifactory"
url = uri("https://repox.jfrog.io/repox/sonarsource")
val artifactoryUsername =
providers.environmentVariable("ARTIFACTORY_PRIVATE_USERNAME")
.orElse(providers.gradleProperty("artifactoryUsername"))
val artifactoryPassword =
providers.environmentVariable("ARTIFACTORY_PRIVATE_PASSWORD")
.orElse(providers.gradleProperty("artifactoryPassword"))

if (artifactoryUsername.isPresent && artifactoryPassword.isPresent) {
authentication {
credentials {
username = artifactoryUsername.get()
password = artifactoryPassword.get()
}
}
}
}
}
}

Expand Down Expand Up @@ -62,21 +43,6 @@ gradle.allprojects {
dependencyResolutionManagement {
repositories {
mavenCentral()
maven {
url = uri("https://repox.jfrog.io/repox/sonarsource")
authentication {
credentials {
val artifactoryUsername =
System.getenv("ARTIFACTORY_PRIVATE_USERNAME")
?: providers.gradleProperty("artifactoryUsername").getOrElse("")
val artifactoryPassword =
System.getenv("ARTIFACTORY_PRIVATE_PASSWORD")
?: providers.gradleProperty("artifactoryPassword").getOrElse("")
username = artifactoryUsername
password = artifactoryPassword
}
}
}
}
}

Expand Down

0 comments on commit 2d9bd97

Please sign in to comment.