test redesign

octopusden · Jun 24, 2024 · 6041a22 · 6041a22
1 parent e3c7bac
commit 6041a22
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/ft/src/test/resources/publish/legacy-staging-plugin/build.gradle b/ft/src/test/resources/publish/legacy-staging-plugin/build.gradle
@@ -1,9 +1,3 @@
-/*
-*/
-
-version = hasProperty("SM_DSL_VERSION") ? SM_DSL_VERSION : hasProperty("buildVersion") ? buildVersion : "1.0-SNAPSHOT"
-
-description "Deployer DSL $version"
 
 buildscript {
     /* Escrow build support */
@@ -18,13 +12,16 @@ buildscript {
             mavenLocal()
         }
     }
-    dependencies {
-        if (project.hasProperty("gradleStagingPluginVersion")) {
-            classpath group: 'org.octopusden.octopus-gradle-plugin', name: 'gradle-staging-plugin', version: gradleStagingPluginVersion
-        }
-    }
 }
 
+plugins {
+    id 'org.octopusden.octopus-release-management'
+}
+
+version = hasProperty("SM_DSL_VERSION") ? SM_DSL_VERSION : hasProperty("buildVersion") ? buildVersion : "1.0-SNAPSHOT"
+
+description "Deployer DSL $version"
+
 allprojects {
     group = 'org.octopusden.octopus-release-management.ft'
     version = rootProject.version
@@ -65,13 +62,13 @@ configure(subprojects.findAll { !(it.name in subprojectsWithoutSources) }) {
     //
     apply plugin: 'maven-publish'
 
-    if (project.hasProperty("gradleStagingPluginVersion")) {
-        apply plugin: 'gradle-staging-plugin'
+//    if (project.hasProperty("gradleStagingPluginVersion")) {
+//        apply plugin: 'gradle-staging-plugin'
         nexusStaging {
             profileId = projectParameter('stagingProfileId')
             repositoryId = projectParameter('stagingRepositoryId')
         }
-    }
+//    }
     publishing {
         publications {
             mavenJava(MavenPublication) {

diff --git a/ft/src/test/resources/publish/legacy-staging-plugin/settings.gradle b/ft/src/test/resources/publish/legacy-staging-plugin/settings.gradle
@@ -1,4 +1,12 @@
 //
+
+pluginManagement {
+    plugins {
+        id 'org.octopusden.octopus-release-management' version settings['octopus-release-management.version']
+    }
+}
+
+
 rootProject.name="deployer-dsl"
 
 include ':deployer-dsl-core'