diff --git a/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginTest.kt b/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginTest.kt index b39a08c..afc4904 100644 --- a/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginTest.kt +++ b/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginTest.kt @@ -25,12 +25,12 @@ class ReleaseManagementPluginTest { @JvmStatic fun projectAndArtifactsTestData(): Stream = Stream.of( -// Arguments.of("single-module-gradle-4.10.3", listOf("single-module-gradle-4103")), -// Arguments.of("single-module", listOf("single-module")), -// Arguments.of("multi-module", listOf("module-1", "module-2")), -// Arguments.of("single-module-gradle-6.8.3", listOf("single-module-gradle-6.8.3")), -// Arguments.of("multi-module-4.10.3", listOf("module-3", "module-4")), -// Arguments.of("multi-module-with-root-publish-4.10.3", listOf("multi-module-with-root-publish-4.10.3", "module-5")), + Arguments.of("single-module-gradle-4.10.3", listOf("single-module-gradle-4103")), + Arguments.of("single-module", listOf("single-module")), + Arguments.of("multi-module", listOf("module-1", "module-2")), + Arguments.of("single-module-gradle-6.8.3", listOf("single-module-gradle-6.8.3")), + Arguments.of("multi-module-4.10.3", listOf("module-3", "module-4")), + Arguments.of("multi-module-with-root-publish-4.10.3", listOf("multi-module-with-root-publish-4.10.3", "module-5")), Arguments.of("legacy-staging-plugin", listOf("deployer-dsl-core", "deployer-dsl-file")) ) @@ -89,7 +89,7 @@ class ReleaseManagementPluginTest { .replace("__PACKAGE_NAME__", System.getProperty("packageName")) .split(Regex("\\s+")) val processBuilder: LocalProcessBuilder = ProcessBuilders.newProcessBuilder(LocalProcessSpec.LOCAL_COMMAND) - val proceessInstance = processBuilder + val processInstance = processBuilder .envVariables(mapOf("JAVA_HOME" to System.getProperty("java.home"))) .logger { it.logger(logger) } .mapBatExtension() @@ -97,19 +97,10 @@ class ReleaseManagementPluginTest { .workDirectory(projectPath) .commandAndArguments("$projectPath/gradlew") .build() - - logger.info("*************************************************************************************") - logger.info("*************************************************************************************") - logger.info("Project directory: $projectPath") - logger.info("Command and arguments: ${gradleCommandAdnArguments.joinToString(" ")}") - logger.info("*************************************************************************************") - logger.info("*************************************************************************************") - - - val pe = proceessInstance.execute(*gradleCommandAdnArguments.toTypedArray()) + .execute(*gradleCommandAdnArguments.toTypedArray()) .toCompletableFuture() .get() - assertEquals(0, pe.exitCode, "Gradle execution failure") + assertEquals(0, processInstance.exitCode, "Gradle execution failure") artifactory { url = System.getenv("ARTIFACTORY_URL") diff --git a/ft/src/test/resources/teamcity-dependencies-registration/multi-module/build.gradle b/ft/src/test/resources/teamcity-dependencies-registration/multi-module/build.gradle index 825f92e..8770483 100644 --- a/ft/src/test/resources/teamcity-dependencies-registration/multi-module/build.gradle +++ b/ft/src/test/resources/teamcity-dependencies-registration/multi-module/build.gradle @@ -5,9 +5,7 @@ plugins { allprojects { group = 'org.octopusden.dbsm.cloud' - // comm me - // apply plugin: "org.octopusden.octopus-release-management" - // + apply plugin: "org.octopusden.octopus-release-management" } releaseManagement { diff --git a/src/main/groovy/org/octopusden/release/management/plugins/gradle/ReleaseManagementGradlePlugin.groovy b/src/main/groovy/org/octopusden/release/management/plugins/gradle/ReleaseManagementGradlePlugin.groovy index 7d62eff..b344c4a 100644 --- a/src/main/groovy/org/octopusden/release/management/plugins/gradle/ReleaseManagementGradlePlugin.groovy +++ b/src/main/groovy/org/octopusden/release/management/plugins/gradle/ReleaseManagementGradlePlugin.groovy @@ -73,13 +73,6 @@ class ReleaseManagementGradlePlugin implements Plugin { project.rootProject.task("dumpAutoUpdateDependencies", type: AutoUpdateDependenciesDumpTask) } - // add me - if (!project.rootProject.extensions.findByName("releaseManagement")) { - project.rootProject.extensions.create("releaseManagement", ReleaseManagementDependenciesExtension) - project.rootProject.task("exportDependenciesToTeamcity", type: ExportDependenciesToTeamcityTask) - } - // - project.rootProject.extensions.extraProperties.m2localPath = project.rootProject.hasProperty('m2_local') ? new File(project.rootProject['m2_local'] as String).toURI().toURL().toString().replaceAll(/^file:\//, 'file:///') : null project.rootProject.extensions.extraProperties.escrowBuild = project.rootProject.extensions.extraProperties.m2localPath != null