Merge pull request #56 from chadlwilson/upgrade-build-and-dependencies

Update & modernize build and dependencies

Author: tomzo

CHANGELOG.md

@@ -1,4 +1,5 @@
-### 0.5.1 - Unreleased
+### 0.6.0 (2022-Jul-31)
+* Upgrade all dependencies to latest, patched versions
 
 ### 0.5.0 (2019-Oct-02)
 

build.gradle

@@ -6,14 +6,14 @@ plugins {
     id "com.github.jk1.dependency-license-report"
 }
 
-group = 'cd.go.plugin.config.json'
-version "0.5.2"
+group 'cd.go.plugin.config.json'
+version "0.6.0"
 
 apply plugin: 'java'
 
 project.ext {
     pluginDesc = [
-            version    : project.version,
+            version: project.version,
             goCdVersion: '20.4.0'
     ]
 
@@ -28,20 +28,22 @@ repositories {
 }
 
 dependencies {
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'commons-io', name: 'commons-io', version: '2.6'
-    compile group: 'org.apache.ant', name: 'ant', version: '1.10.7'
-    compile group: 'com.beust', name: 'jcommander', version: '1.78'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.1'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
+    implementation group: 'org.apache.ant', name: 'ant', version: '1.10.12'
+    implementation group: 'com.beust', name: 'jcommander', version: '1.82'
 
     compileOnly group: 'cd.go.plugin', name: 'go-plugin-api', version: project.pluginApiVersion
-    testCompile group: 'cd.go.plugin', name: 'go-plugin-api', version: project.pluginApiVersion
+    testImplementation group: 'cd.go.plugin', name: 'go-plugin-api', version: project.pluginApiVersion
 
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '3.0.0'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-core', version: '2.1'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.0'
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.6.1'
+    testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
 }
 
 processResources {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     from("resource-templates") {
         filesMatching('*') {
             expand project.pluginDesc
@@ -67,18 +69,18 @@ sourceSets {
 }
 
 test {
-    useJUnit {
-    }
+    useJUnitPlatform()
     testLogging {
         events "passed", "skipped", "failed", "standardOut"
     }
 }
 
 // create a fat jar with all dependencies
 jar {
-    baseName = project.name
+    archiveBaseName = project.name
     preserveFileTimestamps = false
     reproducibleFileOrder = true
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 
     manifest {
         attributes 'Main-Class': 'com.tw.go.config.json.cli.JsonPluginCli'
@@ -89,10 +91,9 @@ jar {
         exclude "NOTICE.txt"
     }
 
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
 }
 
-
 licenseReport {
     renderers = [new NoticeFileGenerator(new TeeRenderer(new SimpleHtmlReportRenderer()), "${project.buildDir}/reports/dependency-license/")]
 }

buildSrc/build.gradle

@@ -6,5 +6,5 @@ repositories {
 }
 
 dependencies {
-    compile group: 'com.github.jk1.dependency-license-report', name: 'com.github.jk1.dependency-license-report.gradle.plugin', version: '1.3'
+    implementation group: 'com.github.jk1.dependency-license-report', name: 'com.github.jk1.dependency-license-report.gradle.plugin', version: '2.0'
 }

buildSrc/src/main/groovy/cd/go/plugin/buildsrc/license/NoticeFileGenerator.groovy

@@ -2,9 +2,9 @@ package cd.go.plugin.buildsrc.license
 
 import com.github.jk1.license.ProjectData
 import com.github.jk1.license.render.ReportRenderer
-import com.github.jk1.license.render.SingleInfoReportRenderer
+import com.github.jk1.license.render.TextReportRenderer
 
-class NoticeFileGenerator extends SingleInfoReportRenderer implements ReportRenderer {
+class NoticeFileGenerator extends TextReportRenderer implements ReportRenderer {
     ReportRenderer toDecorate
     String licenseFolder
 
@@ -20,9 +20,9 @@ class NoticeFileGenerator extends SingleInfoReportRenderer implements ReportRend
         projectData.allDependencies.collect { data ->
             def noticeFile = new File(licenseFolder + 'NOTICE.txt')
             if (!data.licenseFiles.empty) {
-                data.licenseFiles.first().files.collect { file ->
-                    if (new File(file).name.toLowerCase().contains("notice")) {
-                        noticeFile.append(new File(licenseFolder + file).getText('UTF-8'))
+                data.licenseFiles.first().fileDetails.collect { details ->
+                    if (new File(details.file).name.toLowerCase().contains("notice")) {
+                        noticeFile.append(new File(licenseFolder + details.file).getText('UTF-8'))
                         noticeFile.append('\n')
                     }
                 }

buildSrc/src/main/groovy/cd/go/plugin/buildsrc/license/TeeRenderer.groovy

@@ -2,13 +2,14 @@ package cd.go.plugin.buildsrc.license
 
 import com.github.jk1.license.ProjectData
 import com.github.jk1.license.render.ReportRenderer
-import com.github.jk1.license.render.SingleInfoReportRenderer
+import com.github.jk1.license.render.TextReportRenderer
 
-class TeeRenderer extends SingleInfoReportRenderer implements ReportRenderer {
+class TeeRenderer extends TextReportRenderer implements ReportRenderer {
     ReportRenderer toDecorate
     def LICENSES = [
             'Apache License, Version 2.0',
             'Apache 2.0',
+            'Apache-2.0',
             'The Apache Software License, Version 2.0',
             'New BSD License'
     ]

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists