Pivotal ID # 187611460: Fix Artifacts Deployment

.gitlab-ci.yml

@@ -79,7 +79,7 @@ stages:
 
 build-test:
   stage: build-test
-  script: gradle build test -x itest -x jacocoTestCoverageVerification buildArtifacts
+  script: gradle build test -x itest -x jacocoTestCoverageVerification
 
 nfs-itest:
   needs: [ "build-test" ]

build.gradle.kts

@@ -1,4 +1,4 @@
-import PluginVersions.DetektVersion
+
 import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.KtlintExtension
@@ -65,16 +65,3 @@ allprojects {
         }
     }
 }
-
-tasks.register("buildArtifacts") {
-    dependsOn(
-        "client:bio-commandline:shadowJar",
-        "submission:submission-webapp:bootJar",
-        "scheduler:scheduler:bootJar",
-        "scheduler:tasks:exporter-task:bootJar",
-        "scheduler:tasks:pmc-processor-task:bootJar",
-        "scheduler:tasks:submission-releaser-task:bootJar",
-        "submission:submission-handlers:bootJar",
-        "submission:submission-webapp:bootJar",
-    )
-}

buildSrc/src/main/kotlin/Plugins.kt

@@ -1,5 +1,3 @@
-import PluginVersions.DetektVersion
-
 object PluginVersions {
     const val DetektVersion = "1.23.6"
     const val KotlinPluginVersion = Versions.KotlinVersion
@@ -12,7 +10,6 @@ object PluginVersions {
 }
 
 object Plugins {
-    const val DetektFormattingPlugin = "io.gitlab.arturbosch.detekt:detekt-formatting:$DetektVersion"
     const val JacocoPlugin = "jacoco"
     const val KotlinPlugin = "org.jetbrains.kotlin.jvm"
     const val DetektPlugin = "io.gitlab.arturbosch.detekt"

ci/bio-commandline.yml

@@ -1,17 +1,17 @@
 .deploy-dev-bio-commandline:
   dependencies:
     - build-test
-  script: gradle :client:bio-commandline:shadowJar deployBioCommandLine -Penv=dev -PdeployPath=$APPS_PATH/cli/dev --info
+  script: gradle deployBioCommandLine -Penv=dev -PdeployPath=$APPS_PATH/cli/dev --info
 
 .deploy-beta-bio-commandline:
   dependencies:
     - build-test
-  script: gradle :client:bio-commandline:shadowJar deployBioCommandLine -Penv=beta -PdeployPath=$APPS_PATH/cli/beta
+  script: gradle deployBioCommandLine -Penv=beta -PdeployPath=$APPS_PATH/cli/beta
 
 .deploy-prod-bio-commandline:
   dependencies:
     - build-test
-  script: gradle :client:bio-commandline:shadowJar deployBioCommandLine -Penv=prod -PdeployPath=$APPS_PATH/cli/prod
+  script: gradle deployBioCommandLine -Penv=prod -PdeployPath=$APPS_PATH/cli/prod
 
 auto-deploy-dev-bio-commandline:
   extends: .deploy-dev-bio-commandline

ci/exporter.yml

@@ -1,7 +1,7 @@
 .deploy-prod-exporter-task:
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:exporter-task:bootJar updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
+  script: gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
 
 auto-deploy-prod-exporter-task:
   extends: .deploy-prod-exporter-task
@@ -15,14 +15,14 @@ deploy-dev-exporter-task:
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:exporter-task:bootJar updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
+  script: gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
 
 deploy-beta-exporter-task:
   stage: deploy-beta-exporter-task
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:exporter-task:bootJar updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
+  script: gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
 
 deploy-prod-exporter-task:
   extends: .deploy-prod-exporter-task

ci/pmc-processor.yml

@@ -1,7 +1,7 @@
 .deploy-prod-pmc-processor-task:
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:pmc-processor-task:bootJar updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
+  script: gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
 
 auto-deploy-prod-pmc-processor-task:
   extends: .deploy-prod-pmc-processor-task
@@ -15,14 +15,14 @@ deploy-dev-pmc-processor-task:
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:pmc-processor-task:bootJar updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
+  script: gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
 
 deploy-beta-pmc-processor-task:
   stage: deploy-beta-pmc-processor-task
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:pmc-processor-task:bootJar updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
+  script: gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
 
 deploy-prod-pmc-processor-task:
   extends: .deploy-prod-pmc-processor-task

ci/scheduler.yml

@@ -1,7 +1,7 @@
 .deploy-prod-scheduler:
   dependencies:
     - build-test
-  script: gradle :scheduler:scheduler:bootJar deployScheduler -Penv=prod -PdeployPath=$APPS_PATH/scheduler/prod
+  script: gradle deployScheduler -Penv=prod -PdeployPath=$APPS_PATH/scheduler/prod
 
 auto-deploy-prod-scheduler:
   extends: .deploy-prod-scheduler
@@ -15,14 +15,14 @@ deploy-dev-scheduler:
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:scheduler:bootJar deployScheduler -Penv=dev -PdeployPath=$APPS_PATH/scheduler/dev
+  script: gradle deployScheduler -Penv=dev -PdeployPath=$APPS_PATH/scheduler/dev
 
 deploy-beta-scheduler:
   stage: deploy-beta-scheduler
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:scheduler:bootJar deployScheduler -Penv=beta -PdeployPath=$APPS_PATH/scheduler/beta
+  script: gradle deployScheduler -Penv=beta -PdeployPath=$APPS_PATH/scheduler/beta
 
 deploy-prod-scheduler:
   extends: .deploy-prod-scheduler

ci/stats-reporter.yml

@@ -1,7 +1,7 @@
 .deploy-prod-stats-reporter-task:
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:stats-reporter-task:bootJar updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
+  script: gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
 
 auto-deploy-prod-stats-reporter-task:
   extends: .deploy-prod-stats-reporter-task
@@ -15,14 +15,14 @@ deploy-dev-stats-reporter-task:
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:stats-reporter-task:bootJar updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
+  script: gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
 
 deploy-beta-stats-reporter-task:
   stage: deploy-beta-stats-reporter-task
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:stats-reporter-task:bootJar updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
+  script: gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
 
 deploy-prod-stats-reporter-task:
   extends: .deploy-prod-stats-reporter-task

ci/submission-handlers.yml

@@ -1,22 +1,22 @@
 .deploy-dev-handlers:
   dependencies:
     - build-test
-  script: gradle :submission:submission-handlers:bootJar deployHandlers -Penv=dev -PdeployPath=$APPS_PATH/handlers/dev
+  script: gradle deployHandlers -Penv=dev -PdeployPath=$APPS_PATH/handlers/dev
 
 .deploy-beta-handlers:
   dependencies:
     - build-test
-  script: gradle :submission:submission-handlers:bootJar deployHandlers -Penv=beta -PdeployPath=$APPS_PATH/handlers/beta
+  script: gradle deployHandlers -Penv=beta -PdeployPath=$APPS_PATH/handlers/beta
 
 .deploy-prod-handlers:
   dependencies:
     - build-test
-  script: gradle :submission:submission-handlers:bootJar deployHandlers -Penv=prod -PdeployPath=$APPS_PATH/handlers/prod
+  script: gradle deployHandlers -Penv=prod -PdeployPath=$APPS_PATH/handlers/prod
 
 .deploy-sandbox-handlers:
   dependencies:
     - build-test
-  script: gradle :submission:submission-handlers:bootJar deployHandlers -Penv=sandbox -PdeployPath=$APPS_PATH/handlers/sandbox
+  script: gradle deployHandlers -Penv=sandbox -PdeployPath=$APPS_PATH/handlers/sandbox
 
 auto-deploy-dev-handlers:
   extends: .deploy-dev-handlers

ci/submission-migrator.yml

@@ -1,7 +1,7 @@
 .deploy-prod-submission-migrator-task:
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:submission-migrator-task:bootJar updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
+  script: gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
 
 auto-deploy-prod-submission-migrator-task:
   extends: .deploy-prod-submission-migrator-task
@@ -15,14 +15,14 @@ deploy-dev-submission-migrator-task:
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:submission-submission-migrator-task:bootJar updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
+  script: gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
 
 deploy-beta-submission-migrator-task:
   stage: deploy-beta-submission-migrator-task
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:submission-submission-migrator-task:bootJar updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
+  script: gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
 
 deploy-prod-submission-migrator-task:
   extends: .deploy-prod-submission-migrator-task

ci/submission-releaser.yml

@@ -1,7 +1,7 @@
 .deploy-prod-releaser-task:
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:submission-releaser-task:bootJar updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
+  script: gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps
 
 auto-deploy-prod-releaser-task:
   extends: .deploy-prod-releaser-task
@@ -15,14 +15,14 @@ deploy-dev-releaser-task:
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:submission-releaser-task:bootJar updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
+  script: gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps
 
 deploy-beta-releaser-task:
   stage: deploy-beta-releaser-task
   when: manual
   dependencies:
     - build-test
-  script: gradle :scheduler:tasks:submission-releaser-task:bootJar updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
+  script: gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps
 
 deploy-prod-releaser-task:
   extends: .deploy-prod-releaser-task

ci/submission-task.yml

@@ -1,7 +1,7 @@
 .deploy-prod-submission-task:
   dependencies:
     - build-test
-  script: gradle :submission:submission-task:bootJar updateSubmissionTaskArtifact -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod
+  script: gradle updateSubmissionTaskArtifact -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod
 
 auto-deploy-prod-submission-task:
   extends: .deploy-prod-submission-task
@@ -15,14 +15,14 @@ deploy-dev-submission-task:
   when: manual
   dependencies:
     - build-test
-  script: gradle :submission:submission-task:bootJar updateSubmissionTaskArtifact -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev
+  script: gradle updateSubmissionTaskArtifact -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev
 
 deploy-beta-submission-task:
   stage: deploy-beta-submission-task
   when: manual
   dependencies:
     - build-test
-  script: gradle :submission:submission-task:bootJar updateSubmissionTaskArtifact -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta
+  script: gradle updateSubmissionTaskArtifact -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta
 
 deploy-prod-submission-task:
   extends: .deploy-prod-submission-task

ci/submitter.yml

@@ -1,27 +1,27 @@
 .deploy-dev-submitter:
   dependencies:
     - build-test
-  script: gradle :submission:submission-webapp:bootJar deploySubmitter -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev
+  script: gradle deploySubmitter -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev
 
 .deploy-beta-submitter:
   dependencies:
     - build-test
-  script: gradle :submission:submission-webapp:bootJar deploySubmitter -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta -PjvmParams=-Xmx12g
+  script: gradle deploySubmitter -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta -PjvmParams=-Xmx12g
 
 .deploy-prod-submitter:
   dependencies:
     - build-test
-  script: gradle :submission:submission-webapp:bootJar deploySubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod -PjvmParams=-Xmx16g
+  script: gradle deploySubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod -PjvmParams=-Xmx16g
 
 .deploy-migrator-submitter:
   dependencies:
     - build-test
-  script: gradle :submission:submission-webapp:bootJar deployMigratorSubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/migrator -PjvmParams=-Xmx8g
+  script: gradle deployMigratorSubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/migrator -PjvmParams=-Xmx8g
 
 .deploy-sandbox-submitter:
   dependencies:
     - build-test
-  script: gradle :submission:submission-webapp:bootJar deploySubmitter -Penv=sandbox -PdeployPath=$APPS_PATH/submitter/sandbox -PjvmParams=-Xmx16g
+  script: gradle deploySubmitter -Penv=sandbox -PdeployPath=$APPS_PATH/submitter/sandbox -PjvmParams=-Xmx16g
 
 auto-deploy-dev-submitter:
   extends: .deploy-dev-submitter