diff --git a/build.gradle.kts b/build.gradle.kts index 330cc08..9842dfd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,9 +18,6 @@ import java.util.* * limitations under the License. */ plugins { - // build performance - id("com.gradle.build-scan") version "3.0" - // project plugins `java-gradle-plugin` groovy @@ -35,7 +32,7 @@ plugins { `maven-publish` // intershop version plugin - id("com.intershop.gradle.scmversion") version "6.0.0" + id("com.intershop.gradle.scmversion") version "6.1.0" // plugin for documentation id("org.asciidoctor.jvm.convert") version "2.3.0" @@ -48,12 +45,9 @@ plugins { } scm { - version.initialVersion = "1.0.0" -} - -buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + version { + initialVersion = "1.0.0" + } } group = "com.intershop.gradle.publish" @@ -109,7 +103,7 @@ if (project.version.toString().endsWith("-SNAPSHOT")) { tasks { withType().configureEach { - systemProperty("intershop.gradle.versions", "5.6.3, 6.0") + systemProperty("intershop.gradle.versions", "6.1.1") } val copyAsciiDoc = register("copyAsciiDoc") { @@ -256,7 +250,7 @@ bintray { } dependencies { - implementation("com.intershop.gradle.jiraconnector:jiraconnector-gradle-plugin:5.1.1") + implementation("com.intershop.gradle.jiraconnector:jiraconnector-gradle-plugin:6.0.0") implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.13.0") { exclude(module = "groovy-all") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..f3d88b1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a92ccc0..1b16c34 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Oct 29 12:36:44 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip diff --git a/gradlew b/gradlew index 83f2acf..2fe81a7 100755 --- a/gradlew +++ b/gradlew @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactoryKtsSpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactoryKtsSpec.groovy new file mode 100644 index 0000000..78c6686 --- /dev/null +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactoryKtsSpec.groovy @@ -0,0 +1,457 @@ +/* + * Copyright 2017 Intershop Communications AG. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intershop.gradle.artifactorypublish + +import com.intershop.gradle.test.AbstractIntegrationKotlinSpec +import com.intershop.gradle.test.util.TestDispatcher +import okhttp3.mockwebserver.MockWebServer +import org.junit.Rule +import spock.lang.Unroll + +import static org.gradle.testkit.runner.TaskOutcome.SUCCESS +import static org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE + +@Unroll +class MultiProjectArtifactoryKtsSpec extends AbstractIntegrationKotlinSpec { + + static String issueKey = 'ISTOOLS-993' + + static String pluginConfig = """ + id("com.intershop.gradle.scmversion") version "6.1.0" + id("com.intershop.gradle.artifactorypublish-configuration") + """.stripIndent() + + String configURL = System.properties['configURL'] + String configToken = System.properties['configURLToken'] + + private static String buildFileContentBase = """ + plugins { + java + `maven-publish` + } + + publishing { + publications { + create("maven") { + from(components["java"]) + } + } + } + """.stripIndent() + + @Rule + public final MockWebServer server = new MockWebServer() + + def 'test release publishing with artifactory'() { + given: + String urlStr = server.url('/').toString() + List upLoadList = [] + Map responses = [:] + + server.setDispatcher(TestDispatcher.getIntegrationDispatcher(responses, upLoadList)) + + buildFile << """ + import groovy.lang.GroovyObject + import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig + + plugins { + `maven-publish` + ${pluginConfig} + } + + group = "com.intershop.testproject" + version = "1.0.0" + + artifactory { + publish(delegateClosureOf{ + defaults(delegateClosureOf { + invokeMethod("publications", "maven") + setProperty( "properties", mapOf( "testBla" to "testBla")) + }) + }) + } + + subprojects { + group = "com.intershop.testproject" + version = rootProject.getVersion() + } + """.stripIndent() + + settingsFile << """ + // define root proejct name + rootProject.name = "p_testProject" + """.stripIndent() + createSubProjectJava('project1a','com.intereshop.a', buildFileContent, '1.0.0') + createSubProjectJava('project2b', 'com.intereshop.b', buildFileContent, '1.0.0') + + File changelog = file('build/changelog/changelog.asciidoc') + changelog << """ + = Change Log for 2.0.0 + + This list contains changes since version 1.0.0. + + Created: Sun Feb 21 17:11:48 CET 2016 + + [cols="5%,5%,90%", width="95%", options="header"] + |=== + 3+| ${issueKey} change on master (e6c62c43) + | | M | gradle.properties + 3+| remove unnecessary files (a2da48ad) + | | D | gradle/wrapper/gradle-wrapper.jar + | | D | gradle/wrapper/gradle-wrapper.properties + |===""".stripIndent() + + when: + def result = getPreparedGradleRunner() + .withArguments('artifactoryPublish', '--exclude-task', 'changelog', '--stacktrace', '-i', "-DRUNONCI=true", '-PjiraFieldName=Labels', "-DARTIFACTORYBASEURL=${urlStr}", '-DSNAPSHOTREPOKEY=snapshots', '-DRELEASEREPOKEY=releases', '-DARTIFACTORYUSERNAME=admin', '-DARTIFACTORYUSERPASSWD=admin123', "-DJIRABASEURL=${urlStr}", '-DJIRAUSERNAME=admin', '-DJIRAUSERPASSWD=admin123') + .build() + + boolean upLoadListCheck = true + upLoadList.each { + upLoadListCheck &= it.contains('releases/com/intershop/testproject/') + } + + then: + result.task(':artifactoryPublish').outcome == SUCCESS + result.getTasks().findAll( { it.path == ':setIssueField'} ).isEmpty() + upLoadListCheck + upLoadList.size() > 0 + + where: + buildFileContent << [buildFileContentBase] + } + + def 'test release log with artifactory configuration'() { + given: + String urlStr = server.url('/').toString() + List upLoadList = [] + Map responses = [:] + + server.setDispatcher(TestDispatcher.getIntegrationDispatcher(responses, upLoadList)) + + buildFile << """ + import groovy.lang.GroovyObject + import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig + + plugins { + `maven-publish` + ${pluginConfig} + } + + group = "com.intershop.testproject" + version = "1.0.0" + + artifactory { + publish(delegateClosureOf{ + defaults(delegateClosureOf { + invokeMethod("publications", "maven") + setProperty( "properties", mapOf( "testBla" to "testBla")) + }) + }) + } + + subprojects { + group = "com.intershop.testproject" + version = rootProject.getVersion() + } + + repositories { + jcenter() + } + """.stripIndent() + + settingsFile << """ + // define root proejct name + rootProject.name = "p_testProject" + """.stripIndent() + createSubProjectJava('project1a', 'com.intereshop.a', buildFileContent, '1.0.0') + createSubProjectJava('project2b', 'com.intereshop.b', buildFileContent, '1.0.0') + + File changelog = file('build/changelog/changelog.asciidoc') + changelog << """ + = Change Log for 2.0.0 + + This list contains changes since version 1.0.0. + + Created: Sun Feb 21 17:11:48 CET 2016 + + [cols="5%,5%,90%", width="95%", options="header"] + |=== + 3+| ${issueKey} change on master (e6c62c43) + | | M | gradle.properties + 3+| remove unnecessary files (a2da48ad) + | | D | gradle/wrapper/gradle-wrapper.jar + | | D | gradle/wrapper/gradle-wrapper.properties + |===""".stripIndent() + + when: + def result = getPreparedGradleRunner() + .withArguments('releaseLog', '--exclude-task', 'changelog', '--stacktrace', '-i', "-DRUNONCI=true", '-PjiraFieldName=Labels', "-DARTIFACTORYBASEURL=${urlStr}", '-DSNAPSHOTREPOKEY=snapshots', '-DRELEASEREPOKEY=releases', '-DARTIFACTORYUSERNAME=admin', '-DARTIFACTORYUSERPASSWD=admin123', "-DJIRABASEURL=${urlStr}", '-DJIRAUSERNAME=admin', '-DJIRAUSERPASSWD=admin123') + .build() + + boolean upLoadListCheck = true + upLoadList.each { + upLoadListCheck &= it.contains('releases/com/intershop/testproject/') + } + + then: + result.task(':setIssueField').outcome == SUCCESS + responses.get('onebody').contains('"project":{"key":"ISTOOLS"}') + responses.get('onebody').contains('"issuetype":{"id":"10001"}') + + where: + buildFileContent << [buildFileContentBase] + } + + def 'test publishing without artifactory'() { + given: + String urlStr = server.url('/').toString() + List upLoadList = [] + Map responses = [:] + + server.setDispatcher(TestDispatcher.getIntegrationDispatcher(responses, upLoadList)) + + buildFile << """ + import groovy.lang.GroovyObject + import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig + + plugins { + `maven-publish` + ${pluginConfig} + } + + group = "com.intershop.testproject" + version = "1.0.0" + + artifactory { + publish(delegateClosureOf{ + defaults(delegateClosureOf { + invokeMethod("publications", "maven") + setProperty( "properties", mapOf( "testBla" to "testBla")) + }) + }) + } + + subprojects { + group = "com.intershop.testproject" + version = rootProject.getVersion() + } + """.stripIndent() + + settingsFile << """ + // define root proejct name + rootProject.name = "p_testProject" + """.stripIndent() + createSubProjectJava('project1a', 'com.intereshop.a', buildFileContent, '1.0.0') + createSubProjectJava('project2b', 'com.intereshop.b', buildFileContent, '1.0.0') + + File changelog = file('build/changelog/changelog.asciidoc') + changelog << """ + = Change Log for 2.0.0 + + This list contains changes since version 1.0.0. + + Created: Sun Feb 21 17:11:48 CET 2016 + + [cols="5%,5%,90%", width="95%", options="header"] + |=== + 3+| ${issueKey} change on master (e6c62c43) + | | M | gradle.properties + 3+| remove unnecessary files (a2da48ad) + | | D | gradle/wrapper/gradle-wrapper.jar + | | D | gradle/wrapper/gradle-wrapper.properties + |===""".stripIndent() + + when: + def result = getPreparedGradleRunner() + .withArguments('publish', '--stacktrace', '-i') + .build() + + boolean upLoadListCheck = true + upLoadList.each { + upLoadListCheck &= it.contains('releases/com/intershop/testproject/') + } + + then: + ! result.tasks.contains(':setIssueField') + ! result.tasks.contains(':artifactoryPublish') + upLoadListCheck + upLoadList.size() == 0 + + where: + buildFileContent << [buildFileContentBase] + } + + def 'test snapshot publishing with artifactory'() { + given: + String urlStr = server.url('/').toString() + List upLoadList = [] + Map responses = [:] + + server.setDispatcher(TestDispatcher.getIntegrationDispatcher(responses, upLoadList)) + + buildFile << """ + import groovy.lang.GroovyObject + import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig + + plugins { + `maven-publish` + ${pluginConfig} + } + + group = "com.intershop.testproject" + version = "1.0.0-SNAPSHOT" + + artifactory { + publish(delegateClosureOf{ + defaults(delegateClosureOf { + invokeMethod("publications", "maven") + setProperty( "properties", mapOf( "testBla" to "testBla")) + }) + }) + } + + subprojects { + group = "com.intershop.testproject" + version = rootProject.getVersion() + } + """.stripIndent() + + settingsFile << """ + // define root proejct name + rootProject.name = "p_testProject" + """.stripIndent() + createSubProjectJava('project1a', 'com.intereshop.a', buildFileContent, '1.0.0-SNAPSHOT') + createSubProjectJava('project2b', 'com.intereshop.b', buildFileContent, '1.0.0-SNAPSHOT') + + File changelog = file('project1a/build/changelog/changelog.asciidoc') + changelog << """ + = Change Log for 2.0.0 + + This list contains changes since version 1.0.0. + + Created: Sun Feb 21 17:11:48 CET 2016 + + [cols="5%,5%,90%", width="95%", options="header"] + |=== + 3+| ${issueKey} change on master (e6c62c43) + | | M | gradle.properties + 3+| remove unnecessary files (a2da48ad) + | | D | gradle/wrapper/gradle-wrapper.jar + | | D | gradle/wrapper/gradle-wrapper.properties + |===""".stripIndent() + + when: + def result = getPreparedGradleRunner() + .withArguments('artifactoryPublish', '--exclude-task', 'changelog', '--stacktrace', '-i', "-DRUNONCI=true", '-PjiraFieldName=Labels', "-DARTIFACTORYBASEURL=${urlStr}", '-DSNAPSHOTREPOKEY=snapshots', '-DRELEASEREPOKEY=releases', '-DARTIFACTORYUSERNAME=admin', '-DARTIFACTORYUSERPASSWD=admin123', "-DJIRABASEURL=${urlStr}", '-DJIRAUSERNAME=admin', '-DJIRAUSERPASSWD=admin123', '-Dhttp.proxyHost=localhost', '-Dhttp.proxyPort=8200') + .build() + + boolean upLoadListCheck = true + upLoadList.each { + upLoadListCheck &= it.contains('snapshots/com/intershop/testproject/') + } + + then: + result.task(':artifactoryPublish').outcome == SUCCESS + upLoadListCheck + upLoadList.size() == 6 + ! result.tasks.contains(':writeToJira') + + where: + buildFileContent << [buildFileContentBase] + } + + def 'test snapshot publishing with artifactory configuration and release log'() { + given: + String urlStr = server.url('/').toString() + List upLoadList = [] + Map responses = [:] + + server.setDispatcher(TestDispatcher.getIntegrationDispatcher(responses, upLoadList)) + + buildFile << """ + import groovy.lang.GroovyObject + import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig + + plugins { + `maven-publish` + ${pluginConfig} + } + + group = "com.intershop.testproject" + version = "1.0.0-SNAPSHOT" + + artifactory { + publish(delegateClosureOf{ + defaults(delegateClosureOf { + invokeMethod("publications", "maven") + setProperty( "properties", mapOf( "testBla" to "testBla")) + }) + }) + } + + subprojects { + group = "com.intershop.testproject" + version = rootProject.getVersion() + } + """.stripIndent() + + settingsFile << """ + // define root proejct name + rootProject.name = "p_testProject" + """.stripIndent() + createSubProjectJava('project1a', 'com.intereshop.a', buildFileContent, '1.0.0-SNAPSHOT') + createSubProjectJava('project2b', 'com.intereshop.b', buildFileContent, '1.0.0-SNAPSHOT') + + File changelog = file('project1a/build/changelog/changelog.asciidoc') + changelog << """ + = Change Log for 2.0.0 + + This list contains changes since version 1.0.0. + + Created: Sun Feb 21 17:11:48 CET 2016 + + [cols="5%,5%,90%", width="95%", options="header"] + |=== + 3+| ${issueKey} change on master (e6c62c43) + | | M | gradle.properties + 3+| remove unnecessary files (a2da48ad) + | | D | gradle/wrapper/gradle-wrapper.jar + | | D | gradle/wrapper/gradle-wrapper.properties + |===""".stripIndent() + + when: + def result = getPreparedGradleRunner() + .withArguments('releaseLog', '--exclude-task', 'changelog', '--stacktrace', '-i', "-DRUNONCI=true", '-PjiraFieldName=Labels', "-DARTIFACTORYBASEURL=${urlStr}", '-DSNAPSHOTREPOKEY=snapshots', '-DRELEASEREPOKEY=releases', '-DARTIFACTORYUSERNAME=admin', '-DARTIFACTORYUSERPASSWD=admin123', "-DJIRABASEURL=${urlStr}", '-DJIRAUSERNAME=admin', '-DJIRAUSERPASSWD=admin123', '-Dhttp.proxyHost=localhost', '-Dhttp.proxyPort=8200') + .build() + + boolean upLoadListCheck = true + upLoadList.each { + upLoadListCheck &= it.contains('snapshots/com/intershop/testproject/') + } + + then: + result.task(':releaseLog').outcome == UP_TO_DATE + ! result.tasks.contains(':writeToJira') + + where: + buildFileContent << [buildFileContentBase] + } + + /** + * Creates a java sub project + */ + private File createSubProjectJava(String projectPath, String packageName, String buildContent, String version){ + File subProject = createSubProject(projectPath, buildContent.replace('VERSION', version)) + writeJavaTestClass(packageName, subProject) + return subProject + } +} diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy index b274130..2d73bb3 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy @@ -30,7 +30,7 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationGroovySpec { static String issueKey = 'ISTOOLS-993' static String pluginConfig = """ - id 'com.intershop.gradle.scmversion' version '3.6.0' + id 'com.intershop.gradle.scmversion' version '6.1.0' id 'com.intershop.gradle.artifactorypublish-configuration' """.stripIndent() @@ -43,10 +43,6 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationGroovySpec { id 'maven-publish' } - if(project.hasProperty("releaseWithJavaDoc") && project.ext.releaseWithJavaDoc.toBoolean()) { - println 'CREATE JAVADOC' - } - publishing { publications { maven(MavenPublication) { @@ -353,7 +349,7 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationGroovySpec { then: result.task(':artifactoryPublish').outcome == SUCCESS upLoadListCheck - upLoadList.size() == 4 + upLoadList.size() > 4 ! result.tasks.contains(':writeToJira') where: diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy index 7156c9b..0fd677d 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy @@ -32,7 +32,7 @@ class MultiProjectSimpleArtifactoryPublishSpec extends AbstractIntegrationGroovy String configToken = System.properties['configURLToken'] static String pluginConfig = """ - id 'com.intershop.gradle.scmversion' version '3.6.0' + id 'com.intershop.gradle.scmversion' version '6.1.0' id 'com.intershop.gradle.simpleartifactorypublish-configuration' """.stripIndent() diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy index 8fca8af..81ad73e 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy @@ -29,7 +29,7 @@ class SingleProjectSpec extends AbstractIntegrationGroovySpec { static String issueKey = 'ISTOOLS-993' static String pluginConfig = """ - id 'com.intershop.gradle.scmversion' version '5.0.0' + id 'com.intershop.gradle.scmversion' version '6.1.0' id 'com.intershop.gradle.artifactorypublish-configuration' """.stripIndent() @@ -342,7 +342,7 @@ class SingleProjectSpec extends AbstractIntegrationGroovySpec { then: upLoadListCheck - upLoadList.size() == 2 + upLoadList.size() == 3 result.task(':artifactoryPublish').outcome == SUCCESS ! result.tasks.contains(':writeToJira') } diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy index a4cdc46..4c61d3d 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy @@ -27,7 +27,7 @@ import static org.gradle.testkit.runner.TaskOutcome.SUCCESS class SingleSimpleProjectSpec extends AbstractIntegrationGroovySpec { static String pluginConfig = """ - id 'com.intershop.gradle.scmversion' version '3.6.0' + id 'com.intershop.gradle.scmversion' version '6.1.0' id 'com.intershop.gradle.simpleartifactorypublish-configuration' """.stripIndent() @@ -204,7 +204,7 @@ class SingleSimpleProjectSpec extends AbstractIntegrationGroovySpec { then: upLoadListCheck - upLoadList.size() == 2 + upLoadList.size() == 3 result.task(':artifactoryPublish').outcome == SUCCESS }