fixing property setting

blackducksoftware · Mar 13, 2020 · a290501 · a290501
1 parent 057c0df
commit a290501
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 tasks.withType(GroovyCompile) { options.encoding = 'UTF-8' }
 
 group = 'com.synopsys.integration'
-version = '1.4.2-SNAPSHOT'
+version = '1.4.2'
 description = 'A common plugin for all integration libraries and solutions to use.'
 
 sourceCompatibility = 1.8

diff --git a/src/main/groovy/com/synopsys/integration/Common.groovy b/src/main/groovy/com/synopsys/integration/Common.groovy
@@ -89,6 +89,7 @@ public abstract class Common implements Plugin<Project> {
         }
 
         project.ext.isSnapshot = project.version.endsWith('-SNAPSHOT')
+        project.ext[PROPERTY_BUILDSCRIPT_DEPENDENCY] = BUILDSCRIPT_DEPENDENCY_LOCATION
 
         // assume some reasonable defaults if the environment doesn't provide specific values
         setExtPropertyOnProject(project, PROPERTY_DOWNLOAD_ARTIFACTORY_URL, 'https://sig-repo.synopsys.com')
@@ -116,8 +117,6 @@ public abstract class Common implements Plugin<Project> {
         setExtPropertyOnProjectNoDefaults(project, PROPERTY_SONATYPE_PASSWORD, ENVIRONMENT_VARIABLE_SONATYPE_PASSWORD)
         setExtPropertyOnProjectNoDefaults(project, PROPERTY_SONAR_QUBE_LOGIN, ENVIRONMENT_VARIABLE_SONAR_QUBE_LOGIN)
 
-        setExtPropertyOnProjectNoDefaults(project, PROPERTY_BUILDSCRIPT_DEPENDENCY, BUILDSCRIPT_DEPENDENCY_LOCATION)
-
         project.repositories {
             mavenLocal()
             maven { url "${project.ext[PROPERTY_DOWNLOAD_ARTIFACTORY_URL]}/${project.ext[PROPERTY_ARTIFACTORY_RELEASE_REPO]}" }