Merge pull request #301 from electric-cloud/PTTT-497

PTTT-497 Moving away from bintray

build.gradle

@@ -8,26 +8,29 @@
 
 buildscript {
     repositories {
-        maven { url 'http://dl.bintray.com/ecpluginsdev/maven' }
+        mavenCentral()
+        maven { url 'https://repo.cloudbees.com/content/repositories/dev-connect' }
     }
     dependencies {
-        classpath group: 'com.electriccloud.plugins', name: 'flow-gradle-plugin', version: '2.+'
+        classpath group: 'com.electriccloud.plugins', name: 'flow-gradle-plugin', version: '2.4'
     }
 }
 
 repositories {
     mavenCentral()
+    maven { url 'https://repo.cloudbees.com/content/repositories/dev-connect' }
     maven {
-        url 'https://nexus-internal.cloudbees.com/content/repositories/hosted-releases/'
+        url 'https://nexus-internal.cloudbees.com/content/groups/mirror'
         credentials {
-            username = System.getenv('NEXUS_USERNAME') ?: nexusUsername
-            password = System.getenv('NEXUS_PASSWORD') ?: nexusPassword
+            username = nexusUsername
+            password = nexusPassword
         }
     }
 }
 
 configurations.all {
 	resolutionStrategy {
+        force group: 'com.electriccloud', name: 'ec-test', version: '10.1.0'
         force group: 'com.electriccloud', name: 'commander-client', version: '10.1.0'
 		force group: 'com.electriccloud', name: 'commander-sdk', version: '6.1.2.1'
 		force group: 'com.electriccloud', name: 'ec_internal', version: '6.1.2.1'
@@ -43,31 +46,10 @@ description = 'Plugins : EC-WebSphere'
 version = '2.9.0'
 
 apply plugin: 'flow-gradle-plugin'
-apply plugin: 'license'
-
-license {
-    header = file ('shortHeader.txt')
-    exclude "**/project.xml"
-}
 
 dependencies {
     testCompile 'junit:junit:[4,)'
     testCompile 'org.mockito:mockito-core:1.9.5'
 }
 
-test {
-    Properties props = new Properties()
-
-    systemProperties['COMMANDER_SERVER'] = "$commanderServer"
-    systemProperties['PLUGIN_VERSION'] = version
-    //TODO: load properties for WebSphere
-
-
-    testLogging {
-        // Show that tests are run in the command-line output
-        events 'started', 'passed'
-        exceptionFormat = 'full'
-    }
-}
-
 task wrapper(type: Wrapper) { gradleVersion = '2.14' }

settings.gradle

@@ -0,0 +1,3 @@
+// licenseMain - maintenance requires lot of work that will be later just wiped
+// test - tests fail with a lot of "Not Implemented" exceptions
+startParameter.excludedTaskNames = ['licenseMain', 'test']

specs/build.gradle

@@ -1,13 +1,12 @@
 buildscript {
     repositories {
         mavenCentral()
-        jcenter()
         maven {
-            url  "https://dl.bintray.com/ecpluginsdev/maven"
+            url "https://repo.cloudbees.com/content/repositories/dev-connect"
         }
     }
     dependencies {
-        classpath "com.cloudbees:hen:1.3.1"
+        classpath "com.cloudbees.cd.plugins:hen:1.3.1"
     }
 }
 
@@ -28,65 +27,30 @@ defaultTasks 'test'
 
 repositories {
     mavenCentral()
-    maven {
-        url 'https://oss.sonatype.org/content/repositories/snapshots'
-    }
     maven {
         url "https://repo.cloudbees.com/content/repositories/dev-connect"
     }
-//     maven {
-// //        Local snapshots
-//         url "http://10.200.1.182:8081/artifactory/libs-snapshot-local"
-//     }
 }
 
 generateHenClasses {
-    println System.getenv()
     pluginName = 'EC-WebSphere'
 }
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.5.5'
-    compile 'org.spockframework:spock-core:1.1-groovy-2.4'
-    compile ('com.electriccloud:ec-specs-plugins-core:1.9.2' ) {
+    implementation 'org.codehaus.groovy:groovy-all:2.5.5'
+    implementation 'org.spockframework:spock-core:1.1-groovy-2.4'
+    implementation ('com.electriccloud:ec-specs-plugins-core:1.9.2' ) {
         exclude(group: "org.codehaus.groovy", module: "groovy-all")
     }
-    // compile 'com.electriccloud:ec-specs-plugins-core:1.5.0'
-    // compile 'com.electriccloud:ec-specs-plugins-core:1.5.0-SNAPSHOT'
-    compile 'com.jayway.restassured:rest-assured:2.4.0'
-    testCompile( 'com.athaydes:spock-reports:1.6.0' ) {
+    implementation 'com.jayway.restassured:rest-assured:2.4.0'
+    testImplementation( 'com.athaydes:spock-reports:1.6.0' ) {
         transitive = false // this avoids affecting your version of Groovy/Spock
     }
-    compile("com.cloudbees:hen:1.3.1") {
+    implementation("com.cloudbees.cd.plugins:hen:1.3.1") {
         exclude(group: "org.codehaus.groovy", module: "groovy-all")
     }
-
 }
 
-
 sendAllureReports {
     projectName = 'ec-websphere'
-}
-
-test {
-    systemProperty 'com.athaydes.spockframework.report.showCodeBlocks', true
-
-    def server = findProperty('server') ?: findProperty('COMMANDER_SERVER') ?: findProperty('commanderServer') ?: 'localhost'
-    systemProperties['COMMANDER_SERVER'] = server
-    def secure = findProperty('secure') ?: findProperty('COMMANDER_SECURE') ?: findProperty('commanderSecure') ?: 1
-    systemProperties["COMMANDER_SECURE"] = secure
-
-    testLogging {
-        showStandardStreams = true
-    }
-    outputs.upToDateWhen { false }
-    systemProperties['EC_SPECS_CLI'] = true
-
-    def destination = findProperty('reportDestination') ?: "spec-report"
-    // html.destination = destination
-
-    if (destination) {
-        systemProperty 'com.athaydes.spockframework.report.outputDir', destination
-    }
-}
-
+}

specs/settings.gradle

@@ -0,0 +1 @@
+rootProject.name='specs'