fix: correct build and release issues

jeremylong · Nov 28, 2022 · 8aac432 · 8aac432
1 parent dd56f05
commit 8aac432
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/buildSrc/src/main/groovy/vuln.tools.java-common-conventions.gradle b/buildSrc/src/main/groovy/vuln.tools.java-common-conventions.gradle
@@ -66,6 +66,9 @@ java {
 signing {
     sign publishing.publications
 }
+sourcesJar.dependsOn(compileJava)
+sourcesJar.dependsOn(compileTestJava)
+javadoc.dependsOn(compileTestJava)
 
 publishing {
     repositories {

diff --git a/nvd-lib/build.gradle b/nvd-lib/build.gradle
@@ -3,6 +3,8 @@ plugins {
     id 'org.jsonschema2dataclass' version '4.5.0'
 }
 
+description = 'A java library to call the NVD API'
+
 sourceSets {
     main {
         java {
@@ -32,6 +34,8 @@ jsonSchema2Pojo {
     targetVersion = "1.8"
 }
 
+sourcesJar.dependsOn('generateJsonSchema2DataClass')
+
 publishing {
     publications {
         maven(MavenPublication) {
@@ -41,7 +45,8 @@ publishing {
             from components.java
             pom {
                 url = 'https://github.com/jeremylong/vuln-tools/'
-
+                description = project.description
+                name = project.name
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'

diff --git a/vulnz/build.gradle b/vulnz/build.gradle
@@ -6,6 +6,8 @@ plugins {
     id 'io.spring.dependency-management' version '1.0.15.RELEASE'
 }
 
+description = 'A java CLI to call the NVD API'
+
 dependencies {
     implementation project(':nvd-lib')
     implementation 'info.picocli:picocli-spring-boot-starter:4.6.3'
@@ -16,7 +18,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 jar {
-    enabled = true
+    enabled = false
 }
 bootJar {
     launchScript()
@@ -39,11 +41,12 @@ processResources {
 
 publishing {
     publications {
-        bootJava(MavenPublication) {
+        maven(MavenPublication) {
             artifact tasks.named("bootJar")
             pom {
                 url = 'https://github.com/jeremylong/vuln-tools/'
-
+                description = project.description
+                name = project.name
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'
@@ -63,11 +66,5 @@ publishing {
                 }
             }
         }
-        mavenJava(MavenPublication) {
-            artifact tasks.named("javadocJar")
-        }
-        mavenJava(MavenPublication) {
-            artifact tasks.named("sourcesJar")
-        }
     }
 }