Merge pull request #95 from lavcraft/fix-GAP-281

GAP-281 – Avoid using removed BuildInfoBaseTask i

Author: rspieldenner

src/main/groovy/nebula/plugin/release/ReleasePlugin.groovy

@@ -33,6 +33,7 @@ import org.gradle.api.publish.ivy.plugins.IvyPublishPlugin
 import org.gradle.api.publish.ivy.tasks.GenerateIvyDescriptor
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 import org.gradle.api.publish.maven.tasks.GenerateMavenPom
+import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
 import org.jfrog.gradle.plugin.artifactory.task.BuildInfoBaseTask
 
 class ReleasePlugin implements Plugin<Project> {
@@ -255,12 +256,21 @@ class ReleasePlugin implements Plugin<Project> {
         }
 
         if (isClassPresent('org.jfrog.gradle.plugin.artifactory.task.BuildInfoBaseTask')) {
+            project.logger.warn 'Please upgrade com.jfrog.artifactory (org.jfrog.buildinfo:build-info-extractor-gradle:) to version 4.6.0 or above'
             project.tasks.withType(BuildInfoBaseTask) { Task task ->
                 project.plugins.withType(JavaPlugin) {
                     task.dependsOn(project.tasks.build)
                 }
                 project.rootProject.tasks.postRelease.dependsOn(task)
             }
+        } else if(isClassPresent('org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask')) {
+            // JFrog remove BuildInfoBaseTask see https://www.jfrog.com/jira/browse/GAP-281
+            project.tasks.withType(ArtifactoryTask) { Task task ->
+                project.plugins.withType(JavaPlugin) {
+                    task.dependsOn(project.tasks.build)
+                }
+                project.rootProject.tasks.postRelease.dependsOn(task)
+            }
         } else {
             logger.info('Skipping configuration of artifactoryPublish task since it is not present')
         }

src/test/groovy/nebula/plugin/release/ReleasePluginOptionalDepsSpec.groovy

@@ -52,7 +52,8 @@ class ReleasePluginOptionalDepsSpec extends ProjectSpec {
         Logger myLogger = Mock()
         ReleasePlugin.logger = myLogger
         ReleasePlugin.metaClass.isClassPresent = { String name ->
-            name != 'org.jfrog.gradle.plugin.artifactory.task.BuildInfoBaseTask'
+            name != 'org.jfrog.gradle.plugin.artifactory.task.BuildInfoBaseTask' &&
+                name != 'org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask'
         }
 
         when: