Skip to content

Commit 20d944a

Browse files
committed
remove task for deleting type_descriptions.yaml
1 parent 61fe08c commit 20d944a

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

sdk-extensions/incubator/build.gradle.kts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,10 @@ dependencies {
5252
// The sequence of tasks is:
5353
// 1. downloadConfigurationSchema - download configuration schema from open-telemetry/opentelemetry-configuration
5454
// 2. unzipConfigurationSchema - unzip the configuration schema archive contents to $buildDir/configuration/
55-
// 3. deleteTypeDescriptions - delete type_descriptions.yaml $buildDir/configuration/schema, which is not part of core schema and causes problems resolving type refs
56-
// 4. generateJsonSchema2Pojo - generate java POJOs from the configuration schema
57-
// 5. jsonSchema2PojoPostProcessing - perform various post processing on the generated POJOs, e.g. replace javax.annotation.processing.Generated with javax.annotation.Generated, add @SuppressWarning("rawtypes") annotation
58-
// 6. overwriteJs2p - overwrite original generated classes with versions containing updated @Generated annotation
59-
// 7. deleteJs2pTmp - delete tmp directory
55+
// 3. generateJsonSchema2Pojo - generate java POJOs from the configuration schema
56+
// 4. jsonSchema2PojoPostProcessing - perform various post processing on the generated POJOs, e.g. replace javax.annotation.processing.Generated with javax.annotation.Generated, add @SuppressWarning("rawtypes") annotation
57+
// 5. overwriteJs2p - overwrite original generated classes with versions containing updated @Generated annotation
58+
// 6. deleteJs2pTmp - delete tmp directory
6059
// ... proceed with normal sourcesJar, compileJava, etc
6160

6261
val configurationTag = "1.0.0-rc.1"
@@ -82,11 +81,6 @@ val unzipConfigurationSchema by tasks.registering(Copy::class) {
8281
into("$buildDirectory/configuration/")
8382
}
8483

85-
val deleteTypeDescriptions by tasks.registering(Delete::class) {
86-
dependsOn(unzipConfigurationSchema)
87-
delete("$buildDirectory/configuration/schema/type_descriptions.yaml")
88-
}
89-
9084
jsonSchema2Pojo {
9185
sourceFiles = setOf(file("$buildDirectory/configuration/opentelemetry_configuration.json"))
9286
targetDirectory = file("$buildDirectory/generated/sources/js2p/java/main")
@@ -115,7 +109,7 @@ jsonSchema2Pojo {
115109
}
116110

117111
val generateJsonSchema2Pojo = tasks.getByName("generateJsonSchema2Pojo")
118-
generateJsonSchema2Pojo.dependsOn(deleteTypeDescriptions)
112+
generateJsonSchema2Pojo.dependsOn(unzipConfigurationSchema)
119113

120114
val jsonSchema2PojoPostProcessing by tasks.registering(Copy::class) {
121115
dependsOn(generateJsonSchema2Pojo)

0 commit comments

Comments
 (0)