Update Directory Structure and Artifact Group Names

.github/workflows/build-timestamped-master.yml

@@ -35,12 +35,5 @@ jobs:
           publishPAT: ${{ secrets.BALLERINA_BOT_TOKEN }}
         run: |
           ./gradlew publish --scan --no-daemon
-      - name: Archive Error Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: Ballerina Internal Log
-          path: websub-ballerina/ballerina-internal.log
-          if-no-files-found: ignore
       - name: Generate Codecov Report
         uses: codecov/codecov-action@v1

.github/workflows/pull-request.yml

@@ -19,13 +19,6 @@ jobs:
           packageUser: ${{ github.actor }}
           packagePAT: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build --scan
-      - name: Archive Error Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: Ballerina Internal Log
-          path: websub-ballerina/ballerina-internal.log
-          if-no-files-found: ignore
       - name: Generate Codecov Report
         if:  github.event_name == 'pull_request'
         uses: codecov/codecov-action@v1

ballerina/Ballerina.toml

@@ -0,0 +1,55 @@
+[package]
+org = "ballerina"
+name = "websub"
+version = "@toml.version@"
+
+[[platform.java11.dependency]]
+path = "../native/build/libs/websub-native-@project.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/http-native-@http.native.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-common-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-buffer-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-transport-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-resolver-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-handler-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-codec-http-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-codec-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-handler-proxy-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-codec-http2-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/commons-pool-@wso2commonspool.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/snakeyaml-@wso2snakeyaml.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/bcprov-jdk15on-@bouncycastle.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-tcnative-boringssl-static-@nettytcnative.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/org.wso2.carbon.metrics.core-@wso2carbonmetrics.version@.jar"

websub-ballerina/CompilerPlugin.toml → ballerina/CompilerPlugin.toml

@@ -3,4 +3,4 @@ id = "websub-compiler-plugin"
 class = "io.ballerina.stdlib.websub.WebSubCompilerPlugin"
 
 [[dependency]]
-path = "../websub-compiler-plugin/build/libs/websub-compiler-plugin-@project.version@.jar"
+path = "../compiler-plugin/build/libs/websub-compiler-plugin-@project.version@.jar"

websub-ballerina/build.gradle → ballerina/build.gradle

@@ -113,7 +113,7 @@ dependencies {
     externalJars(group: 'org.wso2.carbon.metrics', name: 'org.wso2.carbon.metrics.core', version: "${wso2CarbonMetricsVersion}") {
         transitive = false
     }
-    externalJars(group: 'org.ballerinalang', name: 'http-native', version: "${stdlibHttpVersion}") {
+    externalJars(group: 'io.ballerina.stdlib', name: 'http-native', version: "${stdlibHttpVersion}") {
         transitive = false
     }
 }

build-config/checkstyle/build.gradle

@@ -21,7 +21,7 @@ plugins {
 
 apply plugin: 'java'
 
-task downloadMultipleFiles(type: Download) {
+task downloadCheckstyleRuleFiles(type: Download) {
     src([
             'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml',
             'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml'
@@ -40,9 +40,9 @@ clean {
 }
 
 artifacts.add('default', file("$project.buildDir/checkstyle.xml")) {
-    builtBy('downloadMultipleFiles')
+    builtBy('downloadCheckstyleRuleFiles')
 }
 
 artifacts.add('default', file("$project.buildDir/suppressions.xml")) {
-    builtBy('downloadMultipleFiles')
+    builtBy('downloadCheckstyleRuleFiles')
 }

build.gradle

@@ -100,23 +100,23 @@ subprojects {
         }
 
         /* Standard libraries */
-        ballerinaStdLibs "org.ballerinalang:http-ballerina:${stdlibHttpVersion}"
-        ballerinaStdLibs "org.ballerinalang:mime-ballerina:${stdlibMimeVersion}"
-        ballerinaStdLibs "org.ballerinalang:auth-ballerina:${stdlibAuthVersion}"
-        ballerinaStdLibs "org.ballerinalang:file-ballerina:${stdlibFileVersion}"
-        ballerinaStdLibs "org.ballerinalang:cache-ballerina:${stdlibCacheVersion}"
-        ballerinaStdLibs "org.ballerinalang:crypto-ballerina:${stdlibCryptoVersion}"
-        ballerinaStdLibs "org.ballerinalang:url-ballerina:${stdlibUrlVersion}"
-        ballerinaStdLibs "org.ballerinalang:task-ballerina:${stdlibTaskVersion}"
-        ballerinaStdLibs "org.ballerinalang:log-ballerina:${stdlibLogVersion}"
-        ballerinaStdLibs "org.ballerinalang:time-ballerina:${stdlibTimeVersion}"
-        ballerinaStdLibs "org.ballerinalang:os-ballerina:${stdlibOsVersion}"
-        ballerinaStdLibs "org.ballerinalang:io-ballerina:${stdlibIoVersion}"
-        ballerinaStdLibs "org.ballerinalang:regex-ballerina:${stdlibRegexVersion}"
-        ballerinaStdLibs "org.ballerinalang:uuid-ballerina:${stdlibUuidVersion}"
-        ballerinaStdLibs "org.ballerinalang:jwt-ballerina:${stdlibJwtVersion}"
-        ballerinaStdLibs "org.ballerinalang:oauth2-ballerina:${stdlibOAuth2Version}"
-        ballerinaStdLibs "org.ballerinalang:random-ballerina:${stdlibRandomVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:http-ballerina:${stdlibHttpVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:mime-ballerina:${stdlibMimeVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:auth-ballerina:${stdlibAuthVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:file-ballerina:${stdlibFileVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:cache-ballerina:${stdlibCacheVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:crypto-ballerina:${stdlibCryptoVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:url-ballerina:${stdlibUrlVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:task-ballerina:${stdlibTaskVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:log-ballerina:${stdlibLogVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:time-ballerina:${stdlibTimeVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:os-ballerina:${stdlibOsVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:regex-ballerina:${stdlibRegexVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:uuid-ballerina:${stdlibUuidVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:jwt-ballerina:${stdlibJwtVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:oauth2-ballerina:${stdlibOAuth2Version}"
+        ballerinaStdLibs "io.ballerina.stdlib:random-ballerina:${stdlibRandomVersion}"
     }
 }
 

websub-compiler-plugin-test/build.gradle → compiler-plugin-test/build.gradle

@@ -24,12 +24,12 @@ plugins {
 
 description = 'Ballerina - WebSub Compiler Plugin Tests'
 
-def ballerinaModulePath = "${project.rootDir}/websub-ballerina/"
+def ballerinaModulePath = "${project.rootDir}/ballerina/"
 def ballerinaDistPath = "${ballerinaModulePath}/build/target/extracted-distributions/jballerina-tools-zip/jballerina-tools-${ballerinaLangVersion}"
 def ballerinaDist = "${buildDir}/target/ballerina-distribution"
 
 dependencies {
-    checkstyle project(':build-config:checkstyle')
+    checkstyle project(':checkstyle')
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
 
     testImplementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
@@ -49,7 +49,7 @@ checkstyle {
     configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
 }
 
-checkstyleTest.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsTest {
     effort "max"

websub-compiler-plugin/build.gradle → compiler-plugin/build.gradle

@@ -24,7 +24,7 @@ plugins {
 description = 'Ballerina - Websub Compiler Plugin'
 
 dependencies {
-    checkstyle project(':build-config:checkstyle')
+    checkstyle project(':checkstyle')
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-parser', version: "${ballerinaLangVersion}"
@@ -37,7 +37,7 @@ checkstyle {
     configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
 }
 
-checkstyleMain.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
     effort "max"

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.caching=true
-group=org.ballerinalang
+group=io.ballerina.stdlib
 version=1.2.0-beta.3-SNAPSHOT
 ballerinaLangVersion=2.0.0-beta.2.1
 
@@ -13,22 +13,30 @@ wso2CommonsPoolVersion=1.5.6.wso2v1
 wso2CarbonMetricsVersion=2.3.7
 wso2SnakeYamlVersion=1.26.0.wso2v1
 testngVersion=7.4.0
-ballerinaGradlePluginVersion=0.9.1
+ballerinaGradlePluginVersion=0.10.1
 
-stdlibHttpVersion=1.1.0-beta.2
-stdlibMimeVersion=1.1.0-beta.2
-stdlibAuthVersion=1.1.0-beta.2
-stdlibFileVersion=0.7.0-beta.2
-stdlibCacheVersion=2.1.0-beta.2
-stdlibCryptoVersion=1.1.0-beta.2
-stdlibUrlVersion=1.1.0-beta.2
-stdlibTaskVersion=2.0.0-beta.2
-stdlibLogVersion=1.1.0-beta.2
-stdlibTimeVersion=2.0.0-beta.2
-stdlibOsVersion=0.8.0-beta.2
-stdlibIoVersion=0.6.0-beta.2
-stdlibRegexVersion=0.7.0-beta.2
-stdlibUuidVersion=0.10.0-beta.2
-stdlibJwtVersion=1.1.0-beta.2
-stdlibOAuth2Version=1.1.0-beta.2
-stdlibRandomVersion=0.10.0-beta.2
+ # Direct Dependencies
+stdlibAuthVersion=1.1.0-beta.3-20210709-185300-42be42e
+stdlibFileVersion=0.7.0-beta.3-20210709-182700-9a3dc6d
+stdlibHttpVersion=1.1.0-beta.3-20210712-180400-f765707
+stdlibIoVersion=0.6.0-beta.3-20210708-142400-de75ca2
+stdlibJwtVersion=1.1.0-beta.3-20210709-185500-2beca97
+stdlibOAuth2Version=1.1.0-beta.3-20210709-191200-434ab3f
+stdlibRegexVersion=0.7.0-beta.3-20210708-161600-c58ceb5
+stdlibUrlVersion=1.1.0-beta.3-20210708-195000-66534bb
+
+# Transitive Dependencies
+# Level 01
+stdlibTimeVersion=2.0.0-beta.3-20210708-150800-a71f297
+stdlibRandomVersion=0.10.0-beta.3-20210708-165200-ebea0a8
+
+# Level 02
+stdlibCryptoVersion=1.1.0-beta.3-20210708-193200-3362778
+stdlibLogVersion=1.1.0-beta.3-20210709-104700-e27bb49
+stdlibOsVersion=0.8.0-beta.3-20210708-232300-2bf238e
+stdlibTaskVersion=2.0.0-beta.3-20210708-181600-4f72d85
+
+# Level 03
+stdlibCacheVersion=2.1.0-beta.3-20210709-112300-ad0cc44
+stdlibMimeVersion=1.1.0-beta.3-20210709-182700-7f1c1cd
+stdlibUuidVersion=0.10.0-beta.3-20210709-111400-54f7b98

websub-native/build.gradle → native/build.gradle

@@ -24,16 +24,16 @@ plugins {
 description = 'Ballerina - Websub Java Utils'
 
 dependencies {
-    checkstyle project(':build-config:checkstyle')
+    checkstyle project(':checkstyle')
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}"
     implementation (group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}") {
         transitive = false
     }
-    implementation group: 'org.ballerinalang', name: 'http-native', version: "${stdlibHttpVersion}"
-    implementation group: 'org.ballerinalang', name: 'mime-native', version: "${stdlibMimeVersion}"
-    implementation (group: 'org.ballerinalang', name: 'io-native', version: "${stdlibIoVersion}") {
+    implementation group: 'io.ballerina.stdlib', name: 'http-native', version: "${stdlibHttpVersion}"
+    implementation group: 'io.ballerina.stdlib', name: 'mime-native', version: "${stdlibMimeVersion}"
+    implementation (group: 'io.ballerina.stdlib', name: 'io-native', version: "${stdlibIoVersion}") {
         transitive = false
     }
     implementation (group: 'org.ballerinalang', name: 'value', version: "${ballerinaLangVersion}") {
@@ -58,7 +58,7 @@ checkstyle {
     configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
 }
 
-checkstyleMain.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
     effort "max"

settings.gradle

@@ -12,12 +12,19 @@ plugins {
 }
 
 rootProject.name = 'websub'
-include ':build-config:checkstyle'
+
+include ':checkstyle'
 include ':websub-native'
 include ':websub-ballerina'
 include ':websub-compiler-plugin'
 include ':websub-compiler-plugin-test'
 
+project(':checkstyle').projectDir = file("build-config${File.separator}checkstyle")
+project(':websub-native').projectDir = file("native")
+project(':websub-compiler-plugin').projectDir = file("compiler-plugin")
+project(':websub-ballerina').projectDir = file("ballerina")
+project(':websub-compiler-plugin-test').projectDir = file("compiler-plugin-test")
+
 gradleEnterprise {
     buildScan {
         termsOfServiceUrl = 'https://gradle.com/terms-of-service'