From fbadcfa9af4080571a3bcfc1cac632df87e437a1 Mon Sep 17 00:00:00 2001
From: Shelby Holden <sholden@broadinstitute.org>
Date: Wed, 26 Jul 2023 15:38:17 -0400
Subject: [PATCH] PR Review

---
 buildSrc/build.gradle                                  |  4 ++--
 .../bio.terra.pfb.java-application-conventions.gradle  |  4 ++++
 .../bio.terra.pfb.java-common-conventions.gradle       |  3 +++
 cli/build.gradle                                       | 10 ++++------
 cli/publishing.gradle                                  |  2 +-
 library/build.gradle                                   |  3 ---
 library/publishing.gradle                              |  2 +-
 settings.gradle                                        |  1 -
 8 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/bio.terra.pfb.java-application-conventions.gradle

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 76de12f8..39e457ab 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,7 +1,5 @@
 plugins {
     id 'groovy-gradle-plugin'
-    id 'com.jfrog.artifactory' version '5.0.3'
-    id 'com.gorylenko.gradle-git-properties' version '2.3.1'
 }
 
 repositories {
@@ -13,4 +11,6 @@ dependencies {
     implementation 'com.srcclr.gradle:com.srcclr.gradle.gradle.plugin:3.1.12'
     implementation 'org.sonarqube:org.sonarqube.gradle.plugin:4.2.1.3168'
     implementation 'info.picocli:picocli:4.7.4'
+    implementation 'com.gorylenko.gradle-git-properties:gradle-git-properties:2.3.1'
+    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:5.0.3'
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/bio.terra.pfb.java-application-conventions.gradle b/buildSrc/src/main/groovy/bio.terra.pfb.java-application-conventions.gradle
new file mode 100644
index 00000000..018ce897
--- /dev/null
+++ b/buildSrc/src/main/groovy/bio.terra.pfb.java-application-conventions.gradle
@@ -0,0 +1,4 @@
+plugins {
+    id 'bio.terra.pfb.java-common-conventions'
+    id 'application'
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/bio.terra.pfb.java-common-conventions.gradle b/buildSrc/src/main/groovy/bio.terra.pfb.java-common-conventions.gradle
index df686b67..f74dde77 100644
--- a/buildSrc/src/main/groovy/bio.terra.pfb.java-common-conventions.gradle
+++ b/buildSrc/src/main/groovy/bio.terra.pfb.java-common-conventions.gradle
@@ -4,6 +4,9 @@ plugins {
     id 'java'
     id 'org.sonarqube'
     id 'com.diffplug.spotless'
+    id 'maven-publish'
+    id 'com.jfrog.artifactory'
+    id 'com.gorylenko.gradle-git-properties'
 }
 
 boolean isCiServer = System.getenv().containsKey("CI")
diff --git a/cli/build.gradle b/cli/build.gradle
index b8329cac..0b6f8fb8 100644
--- a/cli/build.gradle
+++ b/cli/build.gradle
@@ -1,11 +1,8 @@
 plugins {
-    id 'bio.terra.pfb.java-library-conventions'
-    id 'maven-publish'
-    id 'com.jfrog.artifactory' version '5.0.3'
-    id 'com.gorylenko.gradle-git-properties' version '2.3.1'
+    id 'bio.terra.pfb.java-application-conventions'
 }
 
-version 'unspecified'
+version gradle.releaseVersion
 apply from: "publishing.gradle"
 apply from: "generators.gradle"
 
@@ -15,7 +12,7 @@ repositories {
 
 dependencies {
     implementation 'info.picocli:picocli:4.7.4'
-    implementation 'bio.terra:java-pfb-library:0.1.0-SNAPSHOT'
+    implementation project(':library')
 }
 
 jar {
@@ -27,6 +24,7 @@ jar {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    dependsOn(':library:jar')
 }
 
 sonar {
diff --git a/cli/publishing.gradle b/cli/publishing.gradle
index 239cc38e..d5d2582d 100644
--- a/cli/publishing.gradle
+++ b/cli/publishing.gradle
@@ -20,7 +20,7 @@ publishing {
         javaPfbCli(MavenPublication) {
             groupId = gradle.projectGroup
             artifactId = rootProject.name + "-cli"
-            version = gradle.releaseVersion + "-SNAPSHOT"
+            version = gradle.releaseVersion
             from components.java
         }
     }
diff --git a/library/build.gradle b/library/build.gradle
index f8a46c2e..761a8441 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -2,9 +2,6 @@ plugins {
     id 'com.srcclr.gradle'
 
     id 'bio.terra.pfb.java-library-conventions'
-    id 'maven-publish'
-    id 'com.jfrog.artifactory' version '5.0.3'
-    id 'com.gorylenko.gradle-git-properties' version '2.3.1'
 }
 
 repositories {
diff --git a/library/publishing.gradle b/library/publishing.gradle
index 4c79bac3..c34e483a 100644
--- a/library/publishing.gradle
+++ b/library/publishing.gradle
@@ -20,7 +20,7 @@ publishing {
         javaPfbLibrary(MavenPublication) {
             groupId = gradle.projectGroup
             artifactId = rootProject.name + "-library"
-            version = gradle.releaseVersion + "-SNAPSHOT"
+            version = gradle.releaseVersion
             from components.java
         }
     }
diff --git a/settings.gradle b/settings.gradle
index 35788152..0e931730 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,4 +4,3 @@ include('library', 'cli')
 
 gradle.ext.projectGroup = 'bio.terra'
 gradle.ext.releaseVersion = '0.2.0-SNAPSHOT'
-