Skip to content

Commit 26aa5f0

Browse files
committed
Fix Maven plugin descriptor
1 parent 70f834e commit 26aa5f0

1 file changed

Lines changed: 4 additions & 9 deletions

File tree

‎build.gradle.kts‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import org.gradle.api.plugins.JavaPlugin
1212
import org.gradle.api.plugins.JavaPluginExtension
1313
import org.gradle.api.publish.PublishingExtension
1414
import org.gradle.api.publish.maven.MavenPublication
15-
import org.gradle.api.tasks.Copy
1615
import org.gradle.api.tasks.JavaExec
1716
import org.gradle.api.tasks.SourceSetContainer
1817
import org.gradle.api.tasks.Sync
1918
import org.gradle.api.tasks.compile.JavaCompile
2019
import org.gradle.api.tasks.javadoc.Javadoc
2120
import org.gradle.api.tasks.testing.Test
2221
import org.gradle.external.javadoc.StandardJavadocDocletOptions
22+
import org.gradle.language.jvm.tasks.ProcessResources
2323
import org.gradle.plugins.signing.SigningExtension
2424
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2525
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -306,21 +306,16 @@ project(":scip-maven-plugin") {
306306
"compileOnly"(library("maven-plugin-annotations"))
307307
}
308308

309-
val generatePluginXml = tasks.register<Copy>("generatePluginXml") {
309+
tasks.named<ProcessResources>("processResources") {
310+
exclude("META-INF/maven/plugin.template.xml")
310311
from("src/main/resources/META-INF/maven/plugin.template.xml") {
312+
into("META-INF/maven")
311313
rename { "plugin.xml" }
312314
filter { line: String -> line.replace("@VERSION@", project.version.toString()) }
313315
}
314-
into(layout.buildDirectory.dir("generated/resources/pluginXml/META-INF/maven"))
315316
inputs.property("version", project.version.toString())
316317
}
317318

318-
extensions.configure<SourceSetContainer> {
319-
named("main") {
320-
resources.srcDir(generatePluginXml)
321-
}
322-
}
323-
324319
configureMavenPublishing(
325320
displayName = "scip-maven-plugin",
326321
descriptionText = "A Maven plugin that exports dependency metadata for scip-java",

0 commit comments

Comments
 (0)