Skip to content

Commit 81c9a59

Browse files
authored
No need to use Repox for public dependencies
1 parent 599edc0 commit 81c9a59

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ gradle_its_template: &GRADLE_ITS_TEMPLATE
8585
- ./gradlew "${GRADLE_TASK}" "-P${ITS_PROJECT}"
8686
"-Dsonar.runtimeVersion=${SQ_VERSION}"
8787
"-DbuildNumber=$BUILD_NUMBER"
88-
-Pqa --info --console plain --no-daemon --build-cache
88+
--info --console plain --no-daemon --build-cache
8989
<<: *CLEANUP_GRADLE_CACHE_SCRIPT
9090

9191
only_if_sonarsource_qa_template: &ONLY_IF_SONARSOURCE_QA
@@ -206,15 +206,15 @@ qa_ruling_kotlin_compiler_task:
206206
- ./gradlew :its:ruling:test --tests "org.sonarsource.slang.SlangRulingTest.test_kotlin_compiler" -Pruling
207207
"-Dsonar.runtimeVersion=${SQ_VERSION}"
208208
"-DbuildNumber=$BUILD_NUMBER"
209-
-Pqa --info --console plain --no-daemon --build-cache
209+
--info --console plain --no-daemon --build-cache
210210
<<: *CLEANUP_GRADLE_CACHE_SCRIPT
211211

212212
build_win_task:
213213
<<: *QA_TASK_FILTER
214214
<<: *WINDOWS_16_CPU_32G
215215
<<: *SETUP_GRADLE_CACHE
216216
build_script:
217-
- ./gradlew build -Pqa --info --console plain --no-daemon --build-cache
217+
- ./gradlew build --info --console plain --no-daemon --build-cache
218218
on_failure:
219219
error_log_artifacts:
220220
path: "hs_err_pid*.log"

build.gradle.kts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,7 @@ allprojects {
8686
}
8787

8888
repositories {
89-
mavenLocal()
90-
val repository = if (project.hasProperty("qa")) "sonarsource-qa" else "sonarsource"
91-
maven {
92-
url = uri("https://repox.jfrog.io/repox/${repository}")
93-
94-
// The environment variables ARTIFACTORY_PRIVATE_USERNAME and ARTIFACTORY_PRIVATE_PASSWORD are used in QA
95-
// On local box, please add artifactoryUsername and artifactoryPassword to ~/.gradle/gradle.properties
96-
val artifactoryUsername = System.getenv("ARTIFACTORY_PRIVATE_USERNAME") ?: project.findProperty("artifactoryUsername") ?: ""
97-
val artifactoryPassword = System.getenv("ARTIFACTORY_PRIVATE_PASSWORD") ?: project.findProperty("artifactoryPassword") ?: ""
98-
99-
if (artifactoryUsername is String && artifactoryUsername.isNotEmpty() && artifactoryPassword is String && artifactoryPassword.isNotEmpty()) {
100-
credentials {
101-
username = artifactoryUsername
102-
password = artifactoryPassword
103-
}
104-
}
105-
}
89+
mavenCentral()
10690
}
10791
}
10892

settings.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pluginManagement {
22
repositories {
3-
maven(url = "https://repox.jfrog.io/repox/plugins.gradle.org/")
43
gradlePluginPortal()
54
}
65

0 commit comments

Comments
 (0)