Merge pull request #16034 from ldclakmal/refactor-jballerina

Refactor Gradle configuration files
ballerina-platform · Jun 28, 2019 · 3c68b07 · 3c68b07
2 parents f2e8b9f + 26c03d7
commit 3c68b07
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 195 deletions.
diff --git a/stdlib/auth/build.gradle b/stdlib/auth/build.gradle
@@ -17,14 +17,6 @@
 
 apply from: "$rootDir/gradle/balNativeLibProject.gradle"
 
-description = 'Ballerina - Auth'
-
-configurations.testCompileClasspath {
-    resolutionStrategy {
-        preferProjectModules()
-    }
-}
-
 dependencies {
     baloImplementation project(path: ":ballerina-internal", configuration: 'baloImplementation')
     baloImplementation project(path: ":ballerina-builtin", configuration: 'baloImplementation')
@@ -82,16 +74,24 @@ dependencies {
     testCompile project(':ballerina-crypto')
 }
 
-createBalo {
-    jvmTarget = 'true'
-}
-
 configurations.all {
     resolutionStrategy.preferProjectModules()
 }
 
+configurations.testCompileClasspath {
+    resolutionStrategy {
+        preferProjectModules()
+    }
+}
+
 configurations {
     testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple'
     testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api'
 }
+
+createBalo {
+    jvmTarget = 'true'
+}
+
+description = 'Ballerina - Auth'
diff --git a/stdlib/auth/src/test/java/org/ballerinalang/stdlib/auth/util/JBallerinaTestInitializer.java b/stdlib/auth/src/test/java/org/ballerinalang/stdlib/auth/util/JBallerinaTestInitializer.java
diff --git a/stdlib/auth/src/test/resources/testng.xml b/stdlib/auth/src/test/resources/testng.xml
@@ -20,12 +20,16 @@ under the License.
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
 <suite name="ballerina-test-suite">
-    <listeners>
-        <listener class-name="org.ballerinalang.stdlib.auth.util.JBallerinaTestInitializer"/>
-    </listeners>
 
     <test name="ballerina-lang-test-suite" preserve-order="true" parallel="false">
         <parameter name="enableJBallerinaTests" value="true"/>
+        <groups>
+            <run>
+                <exclude name="broken"/>
+                <exclude name="brokenOnJBallerina"/>
+            </run>
+        </groups>
+
         <packages>
             <package name="org.ballerinalang.stdlib.auth.*"/>
         </packages>

diff --git a/stdlib/crypto/build.gradle b/stdlib/crypto/build.gradle
@@ -17,10 +17,6 @@
 
 apply from: "$rootDir/gradle/balNativeLibProject.gradle"
 
-configurations {
-    localDependency
-}
-
 dependencies {
     baloImplementation project(path: ':ballerina-time', configuration: 'baloImplementation')
     baloImplementation project(path: ':ballerina-builtin', configuration: 'baloImplementation')
@@ -40,6 +36,22 @@ dependencies {
     testCompile project(':ballerina-jvm')
 }
 
+configurations.all {
+    resolutionStrategy.preferProjectModules()
+}
+
+configurations.testCompileClasspath {
+    resolutionStrategy {
+        preferProjectModules()
+    }
+}
+
+configurations {
+    testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple'
+    testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api'
+}
+
 createBalo {
     jvmTarget = 'true'
 }

diff --git a/.../crypto/src/test/java/org/ballerinalang/stdlib/crypto/util/JBallerinaTestInitializer.java b/.../crypto/src/test/java/org/ballerinalang/stdlib/crypto/util/JBallerinaTestInitializer.java
diff --git a/stdlib/crypto/src/test/resources/testng.xml b/stdlib/crypto/src/test/resources/testng.xml
@@ -20,11 +20,16 @@ under the License.
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
 <suite name="ballerina-test-suite">
-    <listeners>
-        <listener class-name="org.ballerinalang.stdlib.crypto.util.JBallerinaTestInitializer"/>
-    </listeners>
+
     <test name="ballerina-crypto-test-suite" preserve-order="true" parallel="false">
         <parameter name="enableJBallerinaTests" value="true"/>
+        <groups>
+            <run>
+                <exclude name="broken"/>
+                <exclude name="brokenOnJBallerina"/>
+            </run>
+        </groups>
+
         <packages>
             <package name="org.ballerinalang.stdlib.crypto.*"/>
         </packages>

diff --git a/stdlib/ldap/build.gradle b/stdlib/ldap/build.gradle
@@ -18,10 +18,6 @@
 
 apply from: "$rootDir/gradle/balNativeLibProject.gradle"
 
-configurations.all {
-    resolutionStrategy.preferProjectModules()
-}
-
 dependencies {
     baloCreat project(':lib-creator')
     implementation project(':ballerina-core')
@@ -49,4 +45,24 @@ dependencies {
     baloImplementation project(path: ':ballerina-system', configuration: 'baloImplementation')
 }
 
+configurations.all {
+    resolutionStrategy.preferProjectModules()
+}
+
+configurations.testCompileClasspath {
+    resolutionStrategy {
+        preferProjectModules()
+    }
+}
+
+configurations {
+    testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple'
+    testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api'
+}
+
+createBalo {
+    jvmTarget = 'true'
+}
+
 description = 'Ballerina - LDAP'
diff --git a/stdlib/oauth2/build.gradle b/stdlib/oauth2/build.gradle
@@ -18,16 +18,6 @@
 
 apply from: "$rootDir/gradle/balNativeLibProject.gradle"
 
-configurations.all {
-    resolutionStrategy.preferProjectModules()
-}
-
-configurations.testCompileClasspath {
-    resolutionStrategy {
-        preferProjectModules()
-    }
-}
-
 dependencies {
     baloCreat project(':lib-creator')
 
@@ -65,8 +55,24 @@ dependencies {
     baloImplementation project(path: ':ballerina-config-api', configuration: 'baloImplementation')
 }
 
-description = 'Ballerina - OAuth2'
+configurations.all {
+    resolutionStrategy.preferProjectModules()
+}
+
+configurations.testCompileClasspath {
+    resolutionStrategy {
+        preferProjectModules()
+    }
+}
+
+configurations {
+    testCompile.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    testCompile.exclude group: 'org.slf4j', module: 'slf4j-simple'
+    testCompile.exclude group: 'org.ops4j.pax.logging', module: 'pax-logging-api'
+}
 
 createBalo {
     jvmTarget = 'true'
 }
+
+description = 'Ballerina - OAuth2'