From bef678fe17aa2b1b5ffd28c5dacb4e044584dc41 Mon Sep 17 00:00:00 2001 From: jmp Date: Mon, 21 Dec 2020 01:43:06 -0800 Subject: [PATCH] [ci-skip] Simpler method of merging metadata files --- buildSrc/src/main/kotlin/ConfigureSubprojects.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/ConfigureSubprojects.kt b/buildSrc/src/main/kotlin/ConfigureSubprojects.kt index f6932e0bb..e446d41e6 100644 --- a/buildSrc/src/main/kotlin/ConfigureSubprojects.kt +++ b/buildSrc/src/main/kotlin/ConfigureSubprojects.kt @@ -65,9 +65,7 @@ private fun Project.configureServerProject() { val shadowJar by tasks.getting(ShadowJar::class) { dependsOn(generatePomFileForMavenJavaPublication) transform(Log4j2PluginsCacheFileTransformer::class.java) - transform(AppendingTransformer::class.java) { - resource = "META-INF/services/java.sql.Driver" - } + mergeServiceFiles() manifest { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main",