From 97e5b8be51b457b446052eec1143ec77d3478fb0 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 23 Dec 2025 09:51:52 +0100 Subject: [PATCH] chore: Inline yaml component Migrate functionality to config-utils, its only usage. --- components/yaml/build.gradle.kts | 9 --- components/yaml/gradle.lockfile | 73 ------------------- gradle/dependencies.gradle | 1 - internal-api/build.gradle.kts | 1 - settings.gradle.kts | 1 - utils/config-utils/build.gradle.kts | 2 +- .../main/java/datadog/yaml/YamlParser.java | 0 7 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 components/yaml/build.gradle.kts delete mode 100644 components/yaml/gradle.lockfile rename {components/yaml => utils/config-utils}/src/main/java/datadog/yaml/YamlParser.java (100%) diff --git a/components/yaml/build.gradle.kts b/components/yaml/build.gradle.kts deleted file mode 100644 index f2297262236..00000000000 --- a/components/yaml/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - `java-library` -} - -apply(from = "$rootDir/gradle/java.gradle") - -dependencies { - implementation("org.snakeyaml", "snakeyaml-engine", "2.9") -} diff --git a/components/yaml/gradle.lockfile b/components/yaml/gradle.lockfile deleted file mode 100644 index 3596efb1de6..00000000000 --- a/components/yaml/gradle.lockfile +++ /dev/null @@ -1,73 +0,0 @@ -# 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.2.13=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath -com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs:4.9.8=spotbugs -com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.thoughtworks.qdox:qdox:1.12.1=codenarc -commons-io:commons-io:2.20.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath -io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.8=testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.8=testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.9=spotbugs -org.apache.ant:ant-antlr:1.10.14=codenarc -org.apache.ant:ant-junit:1.10.14=codenarc -org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-text:1.14.0=spotbugs -org.apache.logging.log4j:log4j-api:2.25.2=spotbugs -org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.codehaus.groovy:groovy-ant:3.0.23=codenarc -org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc -org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-templates:3.0.23=codenarc -org.codehaus.groovy:groovy-xml:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codenarc:CodeNarc:3.7.0=codenarc -org.dom4j:dom4j:2.2.0=spotbugs -org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt -org.jacoco:org.jacoco.core:0.8.14=jacocoAnt -org.jacoco:org.jacoco.report:0.8.14=jacocoAnt -org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath -org.junit:junit-bom:5.14.0=spotbugs -org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath -org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.9=spotbugs -org.ow2.asm:asm-commons:9.9=jacocoAnt,spotbugs -org.ow2.asm:asm-tree:9.9=jacocoAnt,spotbugs -org.ow2.asm:asm-util:9.9=spotbugs -org.ow2.asm:asm:9.9=jacocoAnt,spotbugs -org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j -org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.3.3=spotbugs -empty=annotationProcessor,spotbugsPlugins,testAnnotationProcessor diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 5c04909b194..35f3537825a 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -19,7 +19,6 @@ final class CachedData { exclude(project(':components:context')) exclude(project(':components:environment')) exclude(project(':components:json')) - exclude(project(':components:yaml')) exclude(project(':products:feature-flagging:bootstrap')) exclude(project(':remote-config:remote-config-api')) exclude(project(':remote-config:remote-config-core')) diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index e4186e38d5e..c959b7c2bd7 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -268,7 +268,6 @@ dependencies { api(project(":components:context")) api(project(":components:environment")) api(project(":components:json")) - api(project(":components:yaml")) api(project(":utils:config-utils")) api(project(":utils:time-utils")) diff --git a/settings.gradle.kts b/settings.gradle.kts index b7b1c2d88ea..99512261064 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -106,7 +106,6 @@ include( ":components:environment", ":components:json", ":components:native-loader", - ":components:yaml", ":telemetry", ":remote-config:remote-config-api", ":remote-config:remote-config-core", diff --git a/utils/config-utils/build.gradle.kts b/utils/config-utils/build.gradle.kts index 77114b3804c..f48eb933098 100644 --- a/utils/config-utils/build.gradle.kts +++ b/utils/config-utils/build.gradle.kts @@ -55,10 +55,10 @@ val excludedClassesInstructionCoverage by extra( dependencies { implementation(project(":components:environment")) - implementation(project(":components:yaml")) implementation(project(":dd-trace-api")) implementation(project(":utils:filesystem-utils")) implementation(libs.slf4j) + implementation("org.snakeyaml", "snakeyaml-engine", "2.9") testImplementation(project(":utils:test-utils")) testImplementation("org.snakeyaml:snakeyaml-engine:2.9") diff --git a/components/yaml/src/main/java/datadog/yaml/YamlParser.java b/utils/config-utils/src/main/java/datadog/yaml/YamlParser.java similarity index 100% rename from components/yaml/src/main/java/datadog/yaml/YamlParser.java rename to utils/config-utils/src/main/java/datadog/yaml/YamlParser.java