Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention

plugins {
base
id("org.sonarqube") version "7.2.3.7755"
id("org.sonarqube") version "7.3.0.8198"
id("com.jfrog.artifactory") version "6.0.4"
}

Expand Down
35 changes: 18 additions & 17 deletions buildSrc/gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.github.jk1:gradle-license-report:3.1.1=buildScriptClasspath,compileClasspath,runtimeClasspath
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:2.0.21=kotlinCompilerPluginClasspathMain
com.github.jk1:gradle-license-report:3.1.2=buildScriptClasspath,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:2.0.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
org.jetbrains.kotlin:kotlin-build-common:2.0.21=kotlinBuildToolsApiClasspath
org.jetbrains.kotlin:kotlin-build-tools-api:2.0.21=kotlinBuildToolsApiClasspath
org.jetbrains.kotlin:kotlin-build-tools-impl:2.0.21=kotlinBuildToolsApiClasspath
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-compiler-runner:2.0.21=kotlinBuildToolsApiClasspath
org.jetbrains.kotlin:kotlin-daemon-client:2.0.21=kotlinBuildToolsApiClasspath
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-reflect:2.0.21=compileClasspath
org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:2.0.21=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-script-runtime:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-common:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-jvm:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-stdlib:2.0.21=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
empty=kotlinScriptDefExtensions
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.0.21=kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-reflect:2.0.21=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:2.0.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
org.jetbrains.kotlin:kotlin-script-runtime:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-scripting-common:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
org.jetbrains.kotlin:kotlin-scripting-jvm:2.0.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
org.jetbrains.kotlin:kotlin-stdlib:2.0.21=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains:annotations:13.0=compileClasspath,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,apiDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
8 changes: 4 additions & 4 deletions e2e/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ plugins {
id("java")
}

val orchestratorVersion = "6.1.0.3962"
val orchestratorVersion = "6.2.0.4392"

dependencies {
testImplementation("org.assertj:assertj-core:3.27.7")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.sonarsource.orchestrator:sonar-orchestrator-junit5:$orchestratorVersion")
testImplementation("org.sonarsource.orchestrator:sonar-orchestrator:$orchestratorVersion")
testImplementation("org.junit.platform:junit-platform-suite-api:6.0.3")
testImplementation("org.junit.platform:junit-platform-suite-api:6.1.0")
testImplementation("org.sonarsource.sonarqube:sonar-ws:10.7.0.96327")

testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntimeOnly("org.junit.platform:junit-platform-suite-engine:6.0.3")
testRuntimeOnly("org.junit.platform:junit-platform-suite-engine:6.1.0")


// Force specific versions of transitive dependencies
constraints {
implementation("ch.qos.logback:logback-classic:1.5.32") {
implementation("ch.qos.logback:logback-classic:1.5.33") {
because("CVE-2023-6378 - Deserialization of Untrusted Data")
}
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2") {
Expand Down
60 changes: 30 additions & 30 deletions e2e/gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
ch.qos.logback:logback-classic:1.5.32=testCompileClasspath,testRuntimeClasspath
ch.qos.logback:logback-core:1.5.32=testCompileClasspath,testRuntimeClasspath
ch.qos.logback:logback-classic:1.5.33=testCompileClasspath,testRuntimeClasspath
ch.qos.logback:logback-core:1.5.33=testCompileClasspath,testRuntimeClasspath
com.eclipsesource.minimal-json:minimal-json:0.9.5=testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.21=testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.21.2=testCompileClasspath,testRuntimeClasspath
Expand All @@ -15,50 +15,50 @@ com.google.code.findbugs:jsr305:3.0.2=testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.11.0=testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.27.0=testCompileClasspath,testRuntimeClasspath
com.google.protobuf:protobuf-java:3.25.5=testCompileClasspath,testRuntimeClasspath
com.h2database:h2:2.2.222=testRuntimeClasspath
com.h2database:h2:2.4.240=testRuntimeClasspath
com.squareup.okhttp3:logging-interceptor:4.12.0=testCompileClasspath,testRuntimeClasspath
com.squareup.okhttp3:okhttp-jvm:5.1.0=testCompileClasspath,testRuntimeClasspath
com.squareup.okhttp3:okhttp-jvm:5.3.2=testCompileClasspath,testRuntimeClasspath
com.squareup.okhttp3:okhttp:4.12.0=testCompileClasspath,testRuntimeClasspath
com.squareup.okio:okio-jvm:3.15.0=testCompileClasspath,testRuntimeClasspath
com.squareup.okio:okio:3.15.0=testCompileClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.13=testCompileClasspath,testRuntimeClasspath
commons-io:commons-io:2.20.0=testCompileClasspath,testRuntimeClasspath
com.squareup.okio:okio-jvm:3.16.4=testCompileClasspath,testRuntimeClasspath
com.squareup.okio:okio:3.16.4=testCompileClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.21.0=testCompileClasspath,testRuntimeClasspath
commons-io:commons-io:2.21.0=testCompileClasspath,testRuntimeClasspath
javax.annotation:javax.annotation-api:1.3.2=testCompileClasspath,testRuntimeClasspath
net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.18.0=testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-text:1.14.0=testCompileClasspath,testRuntimeClasspath
org.apache.maven:maven-artifact:3.9.11=testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-exec:1.6.0=testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-text:1.15.0=testCompileClasspath,testRuntimeClasspath
org.apache.maven:maven-artifact:3.9.12=testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-utils:3.6.0=testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.2.0=testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.2.21=testCompileClasspath,testRuntimeClasspath
org.jetbrains:annotations:13.0=testCompileClasspath,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=testCompileClasspath
org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter:6.0.3=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath
org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
org.junit.platform:junit-platform-suite-api:6.0.3=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-suite-engine:6.0.3=testRuntimeClasspath
org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:6.1.0=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:6.1.0=testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:6.1.0=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter:6.1.0=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:6.1.0=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:6.1.0=testRuntimeClasspath
org.junit.platform:junit-platform-launcher:6.1.0=testRuntimeClasspath
org.junit.platform:junit-platform-suite-api:6.1.0=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-suite-engine:6.1.0=testRuntimeClasspath
org.junit:junit-bom:6.1.0=testCompileClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
org.slf4j:jcl-over-slf4j:2.0.17=testRuntimeClasspath
org.slf4j:log4j-over-slf4j:2.0.17=testRuntimeClasspath
org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testRuntimeClasspath
org.sonarsource.api.plugin:sonar-plugin-api:10.11.0.2468=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-build:6.1.0.3962=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-config:6.1.0.3962=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-http:6.1.0.3962=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-junit5:6.1.0.3962=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-locators:6.1.0.3962=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-utils:6.1.0.3962=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator:6.1.0.3962=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-build:6.2.0.4392=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-config:6.2.0.4392=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-http:6.2.0.4392=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-junit5:6.2.0.4392=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-locators:6.2.0.4392=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator-utils:6.2.0.4392=testCompileClasspath,testRuntimeClasspath
org.sonarsource.orchestrator:sonar-orchestrator:6.2.0.4392=testCompileClasspath,testRuntimeClasspath
org.sonarsource.sonarqube:sonar-ws:10.7.0.96327=testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor
1 change: 1 addition & 0 deletions gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.sonarsource.rule-api:rule-api:2.17.0.5605=ruleApi
empty=
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format

[versions]
junit-jupiter = "6.0.3"
license-report = "3.1.1"
junit-jupiter = "6.1.0"
license-report = "3.1.2"

[libraries]
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
Expand Down
Loading
Loading