diff --git a/build.gradle b/build.gradle index b187fc35..1d44d968 100644 --- a/build.gradle +++ b/build.gradle @@ -3,12 +3,12 @@ import com.bmuschko.gradle.docker.tasks.container.* import com.bmuschko.gradle.docker.tasks.image.* plugins { - id 'pl.allegro.tech.build.axion-release' version '1.9.0' id "java" id "groovy" id "jacoco" id "osgi" id "maven-publish" + id 'pl.allegro.tech.build.axion-release' version '1.9.0' id "com.bmuschko.docker-remote-api" version "3.2.1" id "com.github.hierynomus.license" version "0.12.1" id "com.jfrog.bintray" version "1.7" @@ -229,8 +229,8 @@ if (project.hasProperty("bintrayUsername") && project.hasProperty("bintrayApiKey labels = ["ssh", "sftp", "secure-shell", "network", "file-transfer"] githubRepo = "hierynomus/sshj" version { - name = "${->project.version}" - vcsTag = "v${->project.version}" + name = "${project.version}" + vcsTag = "v${project.version}" released = new SimpleDateFormat('yyyy-MM-dd\'T\'HH:mm:ss.SSSZZ').format(new Date()) gpg { sign = true @@ -275,10 +275,15 @@ task stopItestContainer(type: DockerStopContainer) { targetContainerId { createItestContainer.getContainerId() } } +task forkedUploadRelease(type: GradleBuild) { + buildFile = project.buildFile + tasks = ["bintrayUpload"] +} + project.tasks.integrationTest.dependsOn(startItestContainer) project.tasks.integrationTest.finalizedBy(stopItestContainer) project.tasks.release.dependsOn([project.tasks.integrationTest, project.tasks.build]) -project.tasks.release.finalizedBy(project.tasks.bintrayUpload) +project.tasks.release.finalizedBy(project.tasks.forkedUploadRelease) project.tasks.jacocoTestReport.dependsOn(project.tasks.test) project.tasks.check.dependsOn(project.tasks.jacocoTestReport)