#10: 1) remove the unexpected feature def (stated here stempler/bnd-p…

…latform#20) 2) no hash qualifier
testng-team · Oct 21, 2016 · 0fa5aa5 · 0fa5aa5
1 parent c574224
commit 0fa5aa5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,28 +39,24 @@ defaultTasks 'updateSiteZip'
 updateSiteZip.dependsOn clean
 
 platform {
-	feature(id: 'org.testng.p2.feature', name: 'TestNG Feature') {
-		plugin "org.testng:testng:${version}", {
-		    bnd {
-            	optionalImport 'com.google.common.*'
-        	}
-			exclude module: 'ant'
-		}
-	}
+    bundle "org.testng:testng:${version}", {
+        bnd {
+            optionalImport 'com.google.common.*'
+            version = versionWithQualifier
+        }
+        exclude module: 'ant'
+    }
 
-	featureId 'org.testng.p2.feature'
-	featureName 'TestNG Feature'
-	featureVersion versionWithQualifier
+    featureId 'org.testng.p2.feature'
+    featureName 'TestNG Feature'
+    featureVersion versionWithQualifier
 
-	categoryName 'TestNG Libraries'
-	categoryId 'org.testng.p2.libraries'
+    categoryName 'TestNG Libraries'
+    categoryId 'org.testng.p2.libraries'
 
-	useBndHashQualifiers false
+    useBndHashQualifiers false
+    useFeatureHashQualifiers false
     defaultQualifier ''
-
-    bnd(group: 'org.testng', name: 'testng', version: "${version}") {
-		version = versionWithQualifier
-	}
 }
 
 clean {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Oct 15 20:14:11 PDT 2016
+#Fri Oct 21 07:15:35 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip