fix release

baev · baev · commit aade0b8bbf12 · 2017-03-14T14:17:52.000+03:00
diff --git a/allure-java-commons/build.gradle b/allure-java-commons/build.gradle
@@ -1,5 +1,8 @@
 description = 'Allure Java Commons'
 
+apply from: "${gradleScriptDir}/maven-publish.gradle"
+apply from: "${gradleScriptDir}/bintray.gradle"
+apply plugin: 'maven'
 apply plugin: 'java'
 
 dependencies {
diff --git a/allure-junit4/build.gradle b/allure-junit4/build.gradle
@@ -1,5 +1,9 @@
 description = 'Allure JUnit 4'
 
+apply from: "${gradleScriptDir}/maven-publish.gradle"
+apply from: "${gradleScriptDir}/bintray.gradle"
+apply plugin: 'maven'
+
 configurations {
     agent
 }
diff --git a/allure-junit5/build.gradle b/allure-junit5/build.gradle
@@ -9,7 +9,9 @@ buildscript {
     }
 }
 
-apply plugin: 'java'
+apply from: "${gradleScriptDir}/maven-publish.gradle"
+apply from: "${gradleScriptDir}/bintray.gradle"
+apply plugin: 'maven'
 apply plugin: 'org.junit.platform.gradle.plugin'
 
 compileTestJava {
diff --git a/allure-testng/build.gradle b/allure-testng/build.gradle
@@ -1,5 +1,9 @@
 description = 'Allure TestNG'
 
+apply from: "${gradleScriptDir}/maven-publish.gradle"
+apply from: "${gradleScriptDir}/bintray.gradle"
+apply plugin: 'maven'
+
 configurations {
     agent
 }
diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle
@@ -10,7 +10,7 @@ def customizePom(pom, gradleProject) {
     pom.whenConfigured { generatedPom ->
         // eliminate testng-scoped dependencies (no need in maven central poms)
         generatedPom.dependencies.removeAll { dep ->
-            dep.scope == "testng"
+            dep.scope == "test"
         }
 
         // sort to make pom dependencies order consistent to ease comparison of older poms

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`description = 'Allure JUnit 4'`
`2`	`2`
	`3`	`+apply from: "${gradleScriptDir}/maven-publish.gradle"`
	`4`	`+apply from: "${gradleScriptDir}/bintray.gradle"`
	`5`	`+apply plugin: 'maven'`
	`6`	`+`
`3`	`7`	`configurations {`
`4`	`8`	`agent`
`5`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`		`-apply plugin: 'java'`
	`12`	`+apply from: "${gradleScriptDir}/maven-publish.gradle"`
	`13`	`+apply from: "${gradleScriptDir}/bintray.gradle"`
	`14`	`+apply plugin: 'maven'`
`13`	`15`	`apply plugin: 'org.junit.platform.gradle.plugin'`
`14`	`16`
`15`	`17`	`compileTestJava {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`description = 'Allure TestNG'`
`2`	`2`
	`3`	`+apply from: "${gradleScriptDir}/maven-publish.gradle"`
	`4`	`+apply from: "${gradleScriptDir}/bintray.gradle"`
	`5`	`+apply plugin: 'maven'`
	`6`	`+`
`3`	`7`	`configurations {`
`4`	`8`	`agent`
`5`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ def customizePom(pom, gradleProject) {`
`10`	`10`	`pom.whenConfigured { generatedPom ->`
`11`	`11`	`// eliminate testng-scoped dependencies (no need in maven central poms)`
`12`	`12`	`generatedPom.dependencies.removeAll { dep ->`
`13`		`- dep.scope == "testng"`
	`13`	`+ dep.scope == "test"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`// sort to make pom dependencies order consistent to ease comparison of older poms`