From 4d336612740c33f71efb6672d05b7049b73527bc Mon Sep 17 00:00:00 2001 From: Alexander Ryabokon Date: Tue, 1 Aug 2023 16:23:43 +0300 Subject: [PATCH 1/3] octopus-rm-gradle-plugin-26 release-management.version -> octopus-release-management.version --- .../asciidoc/release-management-gradle-plugin.adoc | 14 +++++++------- .../gradle/ReleaseManagementPluginDockerTest.kt | 8 ++++---- .../test/resources/mesh-agent2/gradle.properties | 2 +- .../src/test/resources/mesh-agent2/settings.gradle | 2 +- ft-docker/src/test/resources/uds/gradle.properties | 4 ++-- ft-docker/src/test/resources/uds/settings.gradle | 4 ++-- .../gradle/ReleaseManagementPluginRunner.kt | 4 ++-- .../gradle/AutoUpdateDependenciesExtensionTest.kt | 4 ++-- .../plugins/gradle/ReleaseManagementPluginTest.kt | 4 ++-- .../auto-mapping/gradle.properties | 2 +- .../auto-mapping/settings.gradle | 2 +- .../custom-mapping/gradle.properties | 4 ++-- .../custom-mapping/settings.gradle | 2 +- .../default-values/gradle.properties | 4 ++-- .../default-values/settings.gradle | 2 +- .../dump-to-output/gradle.properties | 4 ++-- .../dump-to-output/settings.gradle | 2 +- .../kotlin-dsl/gradle.properties | 4 ++-- .../kotlin-dsl/settings.gradle | 2 +- .../version-range/gradle.properties | 4 ++-- .../version-range/settings.gradle | 2 +- .../single-module/gradle.properties | 2 +- .../single-module/settings.gradle | 2 +- .../publish/multi-module-4.10.3/build.gradle | 2 +- .../build.gradle | 2 +- .../gradle.properties | 2 +- .../publish/multi-module/gradle.properties | 2 +- .../resources/publish/multi-module/settings.gradle | 4 ++-- .../single-module-gradle-4.10.3/build.gradle | 2 +- .../single-module-gradle-6.8.3/gradle.properties | 2 +- .../single-module-gradle-6.8.3/settings.gradle | 2 +- .../publish/single-module/gradle.properties | 2 +- .../publish/single-module/settings.gradle | 2 +- .../resources/publish/sqlprs/gradle.properties | 2 +- .../test/resources/publish/sqlprs/settings.gradle | 2 +- .../teamcity-gradle-template-command.properties | 2 +- .../auto-registration/gradle.properties | 4 ++-- .../auto-registration/settings.gradle | 2 +- .../multi-module/gradle.properties | 2 +- .../multi-module/settings.gradle | 2 +- .../teamcity-gradle-template-command.properties | 2 +- .../version-specification/gradle.properties | 2 +- .../version-specification/settings.gradle | 2 +- 43 files changed, 64 insertions(+), 64 deletions(-) diff --git a/docs/src/docs/asciidoc/release-management-gradle-plugin.adoc b/docs/src/docs/asciidoc/release-management-gradle-plugin.adoc index 31a1fdc..0a49f74 100644 --- a/docs/src/docs/asciidoc/release-management-gradle-plugin.adoc +++ b/docs/src/docs/asciidoc/release-management-gradle-plugin.adoc @@ -212,7 +212,7 @@ Applying the org.octopusden.octopus-release-management plugin with the buildscri ---- buildscript { dependencies { - classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('release-management.version') ?: '{version-label}'}" + classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('octopus-release-management.version') ?: '{version-label}'}" } } @@ -230,7 +230,7 @@ This method will require timeFor that need to configure plugin management in pro ---- pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } ---- @@ -240,16 +240,16 @@ pluginManagement { ---- pluginManagement { plugins { - id("org.octopusden.octopus-release-management") version(extra["release-management.version"] as String) + id("org.octopusden.octopus-release-management") version(extra["octopus-release-management.version"] as String) } } ---- -and put property _release-management.version_ with version in the project _gradle.properties_ +and put property _octopus-release-management.version_ with version in the project _gradle.properties_ [subs="attributes"] ---- -release-management.version={version-label} +octopus-release-management.version={version-label} ---- === TeamCity compile and continues delivery build configuration @@ -493,7 +493,7 @@ If TeamCity project build configuration is not based on standard templates and i .gradle.properties [subs="attributes"] ---- -release-management.version={version-label} +octopus-release-management.version={version-label} kotlin.version=1.3.70 spring-boot.version=2.2.5.RELEASE platform-commons.version=1.2.687 @@ -504,7 +504,7 @@ platform-commons.version=1.2.687 ---- pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] id 'org.jetbrains.kotlin.jvm' version settings['kotlin.version'] id 'org.springframework.boot' version settings['spring-boot.version'] } diff --git a/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt b/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt index 75fc897..ff9b807 100644 --- a/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt +++ b/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt @@ -35,7 +35,7 @@ class ReleaseManagementPluginDockerTest { .commandAndArguments("$projectPath/gradlew") .build() .execute( - "-Prelease-management.version=$releaseManagementVersion", + "-Poctopus-release-management.version=$releaseManagementVersion", "-Pescrow.build-phase=ASSEMBLE", "-Pdocker.registry=$dockerRegistry", "-PpackageName=$packageName", @@ -46,7 +46,7 @@ class ReleaseManagementPluginDockerTest { .toCompletableFuture() .get() assertEquals(0, processInstance.exitCode, "Gradle execution failure") - assertThat(processInstance.stdOut).contains("Pull docker image docker.artifactory." + java.lang.System.getProperty("packageName") + ".com/platform/go-build:1.1.7") + assertThat(processInstance.stdOut).contains("Pull docker image $dockerRegistry/platform/go-build:1.1.7") } @Test @@ -66,7 +66,7 @@ class ReleaseManagementPluginDockerTest { .commandAndArguments("$projectPath/gradlew") .build() .execute( - "-Prelease-management.version=$releaseManagementVersion", + "-Poctopus-release-management.version=$releaseManagementVersion", "-Pescrow.build-phase=ASSEMBLE", "-Pdocker.registry=$dockerRegistry", "bootBuildImage" @@ -77,4 +77,4 @@ class ReleaseManagementPluginDockerTest { assertThat(processInstance.stdOut).anyMatch{logEntry -> logEntry.contains("Pulled builder image '$dockerRegistry/cnbs/uds-stack-builder")} assertThat(processInstance.stdOut).anyMatch{logEntry -> logEntry.contains("Pulled run image '$dockerRegistry/cnbs/uds-stack-run")} } -} \ No newline at end of file +} diff --git a/ft-docker/src/test/resources/mesh-agent2/gradle.properties b/ft-docker/src/test/resources/mesh-agent2/gradle.properties index dff4d24..f8d3c50 100644 --- a/ft-docker/src/test/resources/mesh-agent2/gradle.properties +++ b/ft-docker/src/test/resources/mesh-agent2/gradle.properties @@ -1,2 +1,2 @@ use_dev_repository=all -release-management.version=1.0-SNAPSHOT \ No newline at end of file +octopus-release-management.version=1.0-SNAPSHOT diff --git a/ft-docker/src/test/resources/mesh-agent2/settings.gradle b/ft-docker/src/test/resources/mesh-agent2/settings.gradle index e10c4f2..c44c707 100644 --- a/ft-docker/src/test/resources/mesh-agent2/settings.gradle +++ b/ft-docker/src/test/resources/mesh-agent2/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft-docker/src/test/resources/uds/gradle.properties b/ft-docker/src/test/resources/uds/gradle.properties index 11383bb..09ba9c8 100644 --- a/ft-docker/src/test/resources/uds/gradle.properties +++ b/ft-docker/src/test/resources/uds/gradle.properties @@ -1,4 +1,4 @@ use_dev_repository=all -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT spring-boot.version=2.6.1 -spring-dependency-management.version=1.0.11.RELEASE \ No newline at end of file +spring-dependency-management.version=1.0.11.RELEASE diff --git a/ft-docker/src/test/resources/uds/settings.gradle b/ft-docker/src/test/resources/uds/settings.gradle index 01a3eac..1f0151f 100644 --- a/ft-docker/src/test/resources/uds/settings.gradle +++ b/ft-docker/src/test/resources/uds/settings.gradle @@ -1,9 +1,9 @@ pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] id 'org.springframework.boot' version settings['spring-boot.version'] id 'io.spring.dependency-management' version settings['spring-dependency-management.version'] } } -rootProject.name = 'releng-update-dependencies-service' \ No newline at end of file +rootProject.name = 'releng-update-dependencies-service' diff --git a/ft/src/main/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginRunner.kt b/ft/src/main/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginRunner.kt index c038ee6..3bd7564 100644 --- a/ft/src/main/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginRunner.kt +++ b/ft/src/main/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginRunner.kt @@ -45,7 +45,7 @@ fun gradleProcessInstance(init: TestGradleDSL.() -> Unit): Pair processInstanceConfiguration.unlimited() } .commandAndArguments("$projectPath/gradlew", "--no-daemon") .build() - .execute(*(listOf("-Prelease-management.version=$releaseManagementVersion") + testGradleDSL.tasks + testGradleDSL.additionalArguments).toTypedArray()) + .execute(*(listOf("-Poctopus-release-management.version=$releaseManagementVersion") + testGradleDSL.tasks + testGradleDSL.additionalArguments).toTypedArray()) .toCompletableFuture() .join(), projectPath) -} \ No newline at end of file +} diff --git a/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/AutoUpdateDependenciesExtensionTest.kt b/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/AutoUpdateDependenciesExtensionTest.kt index 2955e54..397c658 100644 --- a/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/AutoUpdateDependenciesExtensionTest.kt +++ b/ft/src/test/kotlin/org/octopusden/release/management/plugins/gradle/AutoUpdateDependenciesExtensionTest.kt @@ -26,7 +26,7 @@ class AutoUpdateDependenciesExtensionTest { Arguments.of("auto-mapping", mapOf( "a-doc.version" to "3.53.3-137", - "release-management.version" to "1.0-SNAPSHOT" + "octopus-release-management.version" to "1.0-SNAPSHOT" ), emptyList() ), @@ -149,4 +149,4 @@ class AutoUpdateDependenciesExtensionTest { assertThat(processInstance.first.stdOut).containsAnyElementsOf(listOf("-----BEGIN AUDC-----", " \"declared\" : {", " \"configured\" : [ {", "-----END AUDC-----")) } -} \ No newline at end of file +} 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 562d2ef..e021d79 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 @@ -146,7 +146,7 @@ class ReleaseManagementPluginTest { .workDirectory(projectPath) .commandAndArguments("$projectPath/gradlew") .build() - .execute("clean", "assemble", "generatePomFileForMavenPublication", "-Prelease-management.version=$releaseManagementVersion", "-PpackageName=$packageName") + .execute("clean", "assemble", "generatePomFileForMavenPublication", "-Poctopus-release-management.version=$releaseManagementVersion", "-PpackageName=$packageName") .toCompletableFuture() .get() assertEquals(0, processInstance.exitCode, "Gradle execution failure") @@ -169,7 +169,7 @@ class ReleaseManagementPluginTest { .mapBatExtension() .mapCmdExtension() .workDirectory(projectPath) - .commandAndArguments("$projectPath/gradlew", "-Prelease-management.version=$releaseManagementVersion") + .commandAndArguments("$projectPath/gradlew", "-Poctopus-release-management.version=$releaseManagementVersion") .processInstance { it.unlimited() } .build() .execute(*commandLineArguments.toTypedArray()) diff --git a/ft/src/test/resources/auto-update-dependencies/auto-mapping/gradle.properties b/ft/src/test/resources/auto-update-dependencies/auto-mapping/gradle.properties index 8d587c1..0b6f7bb 100644 --- a/ft/src/test/resources/auto-update-dependencies/auto-mapping/gradle.properties +++ b/ft/src/test/resources/auto-update-dependencies/auto-mapping/gradle.properties @@ -1,5 +1,5 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT a-doc.version=3.53.3-137 diff --git a/ft/src/test/resources/auto-update-dependencies/auto-mapping/settings.gradle b/ft/src/test/resources/auto-update-dependencies/auto-mapping/settings.gradle index b27b9d3..ea333f6 100644 --- a/ft/src/test/resources/auto-update-dependencies/auto-mapping/settings.gradle +++ b/ft/src/test/resources/auto-update-dependencies/auto-mapping/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/auto-update-dependencies/custom-mapping/gradle.properties b/ft/src/test/resources/auto-update-dependencies/custom-mapping/gradle.properties index c18f0b2..349fc65 100644 --- a/ft/src/test/resources/auto-update-dependencies/custom-mapping/gradle.properties +++ b/ft/src/test/resources/auto-update-dependencies/custom-mapping/gradle.properties @@ -1,7 +1,7 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT pl-commons-version=1.1 -as-server.version=1.7.3182 \ No newline at end of file +as-server.version=1.7.3182 diff --git a/ft/src/test/resources/auto-update-dependencies/custom-mapping/settings.gradle b/ft/src/test/resources/auto-update-dependencies/custom-mapping/settings.gradle index 702d946..a91d619 100644 --- a/ft/src/test/resources/auto-update-dependencies/custom-mapping/settings.gradle +++ b/ft/src/test/resources/auto-update-dependencies/custom-mapping/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/auto-update-dependencies/default-values/gradle.properties b/ft/src/test/resources/auto-update-dependencies/default-values/gradle.properties index c18f0b2..349fc65 100644 --- a/ft/src/test/resources/auto-update-dependencies/default-values/gradle.properties +++ b/ft/src/test/resources/auto-update-dependencies/default-values/gradle.properties @@ -1,7 +1,7 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT pl-commons-version=1.1 -as-server.version=1.7.3182 \ No newline at end of file +as-server.version=1.7.3182 diff --git a/ft/src/test/resources/auto-update-dependencies/default-values/settings.gradle b/ft/src/test/resources/auto-update-dependencies/default-values/settings.gradle index 702d946..a91d619 100644 --- a/ft/src/test/resources/auto-update-dependencies/default-values/settings.gradle +++ b/ft/src/test/resources/auto-update-dependencies/default-values/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/auto-update-dependencies/dump-to-output/gradle.properties b/ft/src/test/resources/auto-update-dependencies/dump-to-output/gradle.properties index c18f0b2..349fc65 100644 --- a/ft/src/test/resources/auto-update-dependencies/dump-to-output/gradle.properties +++ b/ft/src/test/resources/auto-update-dependencies/dump-to-output/gradle.properties @@ -1,7 +1,7 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT pl-commons-version=1.1 -as-server.version=1.7.3182 \ No newline at end of file +as-server.version=1.7.3182 diff --git a/ft/src/test/resources/auto-update-dependencies/dump-to-output/settings.gradle b/ft/src/test/resources/auto-update-dependencies/dump-to-output/settings.gradle index 702d946..a91d619 100644 --- a/ft/src/test/resources/auto-update-dependencies/dump-to-output/settings.gradle +++ b/ft/src/test/resources/auto-update-dependencies/dump-to-output/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/gradle.properties b/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/gradle.properties index b97fa0e..d58fc92 100644 --- a/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/gradle.properties +++ b/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/gradle.properties @@ -1,6 +1,6 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT platform-commons.version=1.2.687 -escrow.version=5.327 \ No newline at end of file +escrow.version=5.327 diff --git a/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/settings.gradle b/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/settings.gradle index 702d946..a91d619 100644 --- a/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/settings.gradle +++ b/ft/src/test/resources/auto-update-dependencies/kotlin-dsl/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/auto-update-dependencies/version-range/gradle.properties b/ft/src/test/resources/auto-update-dependencies/version-range/gradle.properties index c18f0b2..349fc65 100644 --- a/ft/src/test/resources/auto-update-dependencies/version-range/gradle.properties +++ b/ft/src/test/resources/auto-update-dependencies/version-range/gradle.properties @@ -1,7 +1,7 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT pl-commons-version=1.1 -as-server.version=1.7.3182 \ No newline at end of file +as-server.version=1.7.3182 diff --git a/ft/src/test/resources/auto-update-dependencies/version-range/settings.gradle b/ft/src/test/resources/auto-update-dependencies/version-range/settings.gradle index 702d946..a91d619 100644 --- a/ft/src/test/resources/auto-update-dependencies/version-range/settings.gradle +++ b/ft/src/test/resources/auto-update-dependencies/version-range/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/declare-pom-dependencies/single-module/gradle.properties b/ft/src/test/resources/declare-pom-dependencies/single-module/gradle.properties index fec53b4..913e2e4 100644 --- a/ft/src/test/resources/declare-pom-dependencies/single-module/gradle.properties +++ b/ft/src/test/resources/declare-pom-dependencies/single-module/gradle.properties @@ -1,3 +1,3 @@ -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT # To enable access to non released versions of the org.octopusden.octopus-release-management gradle plugin use_dev_repository=plugins diff --git a/ft/src/test/resources/declare-pom-dependencies/single-module/settings.gradle b/ft/src/test/resources/declare-pom-dependencies/single-module/settings.gradle index 3a561d9..61193bf 100644 --- a/ft/src/test/resources/declare-pom-dependencies/single-module/settings.gradle +++ b/ft/src/test/resources/declare-pom-dependencies/single-module/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/publish/multi-module-4.10.3/build.gradle b/ft/src/test/resources/publish/multi-module-4.10.3/build.gradle index e5db7b4..357b686 100644 --- a/ft/src/test/resources/publish/multi-module-4.10.3/build.gradle +++ b/ft/src/test/resources/publish/multi-module-4.10.3/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('release-management.version') ?: '1.0-SNAPSHOT'}" + classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('octopus-release-management.version') ?: '1.0-SNAPSHOT'}" } } diff --git a/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/build.gradle b/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/build.gradle index ca9419c..ff9a8d8 100644 --- a/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/build.gradle +++ b/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('release-management.version') ?: '1.0-SNAPSHOT'}" + classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('octopus-release-management.version') ?: '1.0-SNAPSHOT'}" } } diff --git a/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/gradle.properties b/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/gradle.properties index c73adbd..a7d7081 100644 --- a/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/gradle.properties +++ b/ft/src/test/resources/publish/multi-module-with-root-publish-4.10.3/gradle.properties @@ -1,4 +1,4 @@ # To enable access to non released versions of the org.octopusden.octopus-release-management gradle plugin use_dev_repository=buildscript -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT diff --git a/ft/src/test/resources/publish/multi-module/gradle.properties b/ft/src/test/resources/publish/multi-module/gradle.properties index e647b3c..1ca4d7e 100644 --- a/ft/src/test/resources/publish/multi-module/gradle.properties +++ b/ft/src/test/resources/publish/multi-module/gradle.properties @@ -1,4 +1,4 @@ # To enable access to non released versions of the org.octopusden.octopus-release-management gradle plugin use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT diff --git a/ft/src/test/resources/publish/multi-module/settings.gradle b/ft/src/test/resources/publish/multi-module/settings.gradle index 0582259..7a87265 100644 --- a/ft/src/test/resources/publish/multi-module/settings.gradle +++ b/ft/src/test/resources/publish/multi-module/settings.gradle @@ -1,11 +1,11 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } rootProject.name = 'multi-module' include ':module-1' -include ':module-2' \ No newline at end of file +include ':module-2' diff --git a/ft/src/test/resources/publish/single-module-gradle-4.10.3/build.gradle b/ft/src/test/resources/publish/single-module-gradle-4.10.3/build.gradle index 0f73c04..f4032bd 100644 --- a/ft/src/test/resources/publish/single-module-gradle-4.10.3/build.gradle +++ b/ft/src/test/resources/publish/single-module-gradle-4.10.3/build.gradle @@ -8,7 +8,7 @@ buildscript { staging() } dependencies { - classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('release-management.version') ?: '1.0-SNAPSHOT'}" + classpath "org.octopusden.octopus-release-management:org.octopusden.octopus-release-management:${project.findProperty('octopus-release-management.version') ?: '1.0-SNAPSHOT'}" } } diff --git a/ft/src/test/resources/publish/single-module-gradle-6.8.3/gradle.properties b/ft/src/test/resources/publish/single-module-gradle-6.8.3/gradle.properties index fec53b4..913e2e4 100644 --- a/ft/src/test/resources/publish/single-module-gradle-6.8.3/gradle.properties +++ b/ft/src/test/resources/publish/single-module-gradle-6.8.3/gradle.properties @@ -1,3 +1,3 @@ -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT # To enable access to non released versions of the org.octopusden.octopus-release-management gradle plugin use_dev_repository=plugins diff --git a/ft/src/test/resources/publish/single-module-gradle-6.8.3/settings.gradle b/ft/src/test/resources/publish/single-module-gradle-6.8.3/settings.gradle index 7c701dd..7c06c3d 100644 --- a/ft/src/test/resources/publish/single-module-gradle-6.8.3/settings.gradle +++ b/ft/src/test/resources/publish/single-module-gradle-6.8.3/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/publish/single-module/gradle.properties b/ft/src/test/resources/publish/single-module/gradle.properties index fec53b4..913e2e4 100644 --- a/ft/src/test/resources/publish/single-module/gradle.properties +++ b/ft/src/test/resources/publish/single-module/gradle.properties @@ -1,3 +1,3 @@ -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT # To enable access to non released versions of the org.octopusden.octopus-release-management gradle plugin use_dev_repository=plugins diff --git a/ft/src/test/resources/publish/single-module/settings.gradle b/ft/src/test/resources/publish/single-module/settings.gradle index 3a561d9..61193bf 100644 --- a/ft/src/test/resources/publish/single-module/settings.gradle +++ b/ft/src/test/resources/publish/single-module/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/publish/sqlprs/gradle.properties b/ft/src/test/resources/publish/sqlprs/gradle.properties index e303cbf..2d59336 100644 --- a/ft/src/test/resources/publish/sqlprs/gradle.properties +++ b/ft/src/test/resources/publish/sqlprs/gradle.properties @@ -1,3 +1,3 @@ -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT use_dev_repository=plugins com.jfrog.artifactory.publishConfigs=builds diff --git a/ft/src/test/resources/publish/sqlprs/settings.gradle b/ft/src/test/resources/publish/sqlprs/settings.gradle index 353e2d2..ca74ab5 100644 --- a/ft/src/test/resources/publish/sqlprs/settings.gradle +++ b/ft/src/test/resources/publish/sqlprs/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/publish/teamcity-gradle-template-command.properties b/ft/src/test/resources/publish/teamcity-gradle-template-command.properties index ed6b0f5..a6efb3c 100644 --- a/ft/src/test/resources/publish/teamcity-gradle-template-command.properties +++ b/ft/src/test/resources/publish/teamcity-gradle-template-command.properties @@ -1,4 +1,4 @@ -command-and-arguments=-Prelease-management.version=__RELEASE_MANAGEMENT_VERSION__ \ +command-and-arguments=-Poctopus-release-management.version=__RELEASE_MANAGEMENT_VERSION__ \ -PbuildVersion=__BUILD_VERSION__ \ -PgradleStagingPluginVersion=__RELEASE_MANAGEMENT_VERSION__ \ -PreleaseManagementPluginVersion=7.2927 \ diff --git a/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/gradle.properties b/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/gradle.properties index b78da5e..239a9d3 100644 --- a/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/gradle.properties +++ b/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/gradle.properties @@ -1,5 +1,5 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT -doc.version=3.53.3-137 \ No newline at end of file +doc.version=3.53.3-137 diff --git a/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/settings.gradle b/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/settings.gradle index b27b9d3..ea333f6 100644 --- a/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/settings.gradle +++ b/ft/src/test/resources/teamcity-dependencies-registration/auto-registration/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/teamcity-dependencies-registration/multi-module/gradle.properties b/ft/src/test/resources/teamcity-dependencies-registration/multi-module/gradle.properties index 5549fa1..38cc303 100644 --- a/ft/src/test/resources/teamcity-dependencies-registration/multi-module/gradle.properties +++ b/ft/src/test/resources/teamcity-dependencies-registration/multi-module/gradle.properties @@ -1,6 +1,6 @@ use_dev_repository=plugins -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT dbsm-cloud-api.version=0.1.71 dbsm-cloud-common.version=0.1.67 diff --git a/ft/src/test/resources/teamcity-dependencies-registration/multi-module/settings.gradle b/ft/src/test/resources/teamcity-dependencies-registration/multi-module/settings.gradle index b27b9d3..ea333f6 100644 --- a/ft/src/test/resources/teamcity-dependencies-registration/multi-module/settings.gradle +++ b/ft/src/test/resources/teamcity-dependencies-registration/multi-module/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } diff --git a/ft/src/test/resources/teamcity-dependencies-registration/teamcity-gradle-template-command.properties b/ft/src/test/resources/teamcity-dependencies-registration/teamcity-gradle-template-command.properties index 5292422..7dff295 100644 --- a/ft/src/test/resources/teamcity-dependencies-registration/teamcity-gradle-template-command.properties +++ b/ft/src/test/resources/teamcity-dependencies-registration/teamcity-gradle-template-command.properties @@ -1,4 +1,4 @@ -command-and-arguments=-Prelease-management.version=__RELEASE_MANAGEMENT_VERSION__ \ +command-and-arguments=-Poctopus-release-management.version=__RELEASE_MANAGEMENT_VERSION__ \ -PbuildVersion=1.0-SNAPSHOT \ -PgradleStagingPluginVersion=1.287 \ -PreleaseManagementPluginVersion=7.2927 \ diff --git a/ft/src/test/resources/version-specification/gradle.properties b/ft/src/test/resources/version-specification/gradle.properties index fec53b4..913e2e4 100644 --- a/ft/src/test/resources/version-specification/gradle.properties +++ b/ft/src/test/resources/version-specification/gradle.properties @@ -1,3 +1,3 @@ -release-management.version=1.0-SNAPSHOT +octopus-release-management.version=1.0-SNAPSHOT # To enable access to non released versions of the org.octopusden.octopus-release-management gradle plugin use_dev_repository=plugins diff --git a/ft/src/test/resources/version-specification/settings.gradle b/ft/src/test/resources/version-specification/settings.gradle index 3a561d9..61193bf 100644 --- a/ft/src/test/resources/version-specification/settings.gradle +++ b/ft/src/test/resources/version-specification/settings.gradle @@ -1,7 +1,7 @@ // pluginManagement { plugins { - id 'org.octopusden.octopus-release-management' version settings['release-management.version'] + id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version'] } } From f8043a57e9113f4fc61b9338e2db10cc2526ee7b Mon Sep 17 00:00:00 2001 From: Alexander Ryabokon Date: Tue, 1 Aug 2023 17:12:27 +0300 Subject: [PATCH 2/3] octopus-rm-gradle-plugin-26 Set DOCKER_HOST to testPullDockerImage() --- .../plugins/gradle/ReleaseManagementPluginDockerTest.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt b/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt index ff9b807..2dc6049 100644 --- a/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt +++ b/ft-docker/src/test/kotlin/org/octopusden/release/management/plugins/gradle/ReleaseManagementPluginDockerTest.kt @@ -24,9 +24,13 @@ class ReleaseManagementPluginDockerTest { val projectPath = Paths.get(ReleaseManagementPluginDockerTest::class.java.getResource("/mesh-agent2")!!.toURI()) logger.debug("Project directory {}", projectPath) val processBuilder: LocalProcessBuilder = ProcessBuilders.newProcessBuilder(LocalProcessSpec.LOCAL_COMMAND) - var packageName: String = System.getProperty("packageName").toString() + val packageName: String = System.getProperty("packageName").toString() + val envVariables = mutableMapOf("JAVA_HOME" to System.getProperty("java.home")) + System.getenv()["DOCKER_HOST"]?.let { dockerHost -> + envVariables["DOCKER_HOST"] = dockerHost + } val processInstance = processBuilder - .envVariables(mapOf("JAVA_HOME" to System.getProperty("java.home"))) + .envVariables(envVariables) .logger { it.logger(logger) } .processInstance { it.unlimited() } .mapBatExtension() From d54ac4082d9265edaa5826c2b9429c9b640ffa01 Mon Sep 17 00:00:00 2001 From: Alexander Ryabokon Date: Tue, 1 Aug 2023 17:46:57 +0300 Subject: [PATCH 3/3] octopus-rm-gradle-plugin-26 Add DOCKER_HOST var to ft-docker/build.gradle --- ft-docker/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ft-docker/build.gradle b/ft-docker/build.gradle index 68101f1..2a762aa 100644 --- a/ft-docker/build.gradle +++ b/ft-docker/build.gradle @@ -25,6 +25,11 @@ dependencies { test { useJUnitPlatform() environment 'DOCKER_REGISTRY', System.getenv().get('DOCKER_REGISTRY') ?: project.'docker.registry' + + def dockerHost = System.getenv().get('DOCKER_HOST') + if (dockerHost != null) { + environment 'DOCKER_HOST', dockerHost + } systemProperty 'packageName', project.properties['packageName'] testLogging.showStandardStreams = true }