diff --git a/Jenkinsfile b/Jenkinsfile index 817517d0..dbc1d5e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,11 +11,18 @@ pipeline { stage ('Build') { steps { sh 'git submodule update --init --recursive' - sh './gradlew clean build' + rtGradleRun { + usesPlugin: true, + tool: 'Gradle 7', + buildFile: 'build.gradle.kts', + tasks: 'clean build', + } } post { success { - archiveArtifacts artifacts: '**/build/libs/floodgate-*.jar', fingerprint: true + archiveArtifacts artifacts: '**/build/libs/floodgate-*.jar', + excludes: '**/floodgate-parent-*.jar', + fingerprint: true } } } @@ -45,7 +52,7 @@ pipeline { rootDir: "", useWrapper: true, buildFile: 'build.gradle.kts', - tasks: 'build artifactoryPublish', + tasks: 'artifactoryPublish', deployerId: "GRADLE_DEPLOYER", resolverId: "GRADLE_RESOLVER" ) diff --git a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts index 0a0b9b28..f85e3c98 100644 --- a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts @@ -4,6 +4,7 @@ plugins { id("floodgate.base-conventions") id("com.github.johnrengelman.shadow") id("com.jfrog.artifactory") + id("maven-publish") } tasks { diff --git a/build.gradle.kts b/build.gradle.kts index fbcf0e1c..e4a88f13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,8 +20,6 @@ val platforms = setOf( //todo re-add pmd and organisation/license/sdcm/issuemanagement stuff -val api: Project = projects.api.dependencyProject - subprojects { // apply(plugin = "com.github.spotbugs") @@ -47,7 +45,6 @@ subprojects { } else { when (this) { in platforms -> plugins.apply("floodgate.shadow-conventions") - api -> plugins.apply("floodgate.shadow-conventions") else -> plugins.apply("floodgate.base-conventions") } }