Merge pull request #17 from ayeshLK/2201.9.x-dev

[2201.9.x] Restructure package dependencies
ballerina-platform · Feb 24, 2025 · 372f1ea · 372f1ea
2 parents 4b6caf3 + e75f6ac
commit 372f1ea
Show file tree

Hide file tree

Showing 6 changed files with 404 additions and 14 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -2,24 +2,177 @@
 distribution = "2201.9.2"
 org = "ballerinax"
 name = "aws.marketplace.mpm"
-version = "0.1.2"
+version = "0.1.3"
 license= ["Apache-2.0"]
 authors = ["Ballerina"]
 keywords = ["AWS", "Marketplace", "Cloud/Billing", "Consumption Tracking"]
 icon = "icon.png"
 repository = "/~https://github.com/ballerina-platform/module-ballerinax-aws.marketplace.mpm"
 
-[platform.java17]
-graalvmCompatible = true
-
 [[platform.java17.dependency]]
 groupId = "io.ballerina.lib"
 artifactId = "aws.marketplace.mpm-native"
-version = "0.1.2"
-path = "../native/build/libs/aws.marketplace.mpm-native-0.1.2.jar"
+version = "0.1.3-SNAPSHOT"
+path = "../native/build/libs/aws.marketplace.mpm-native-0.1.3-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "time-native"
 version = "2.4.0"
 path = "./lib/time-native-2.4.0.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "marketplacemetering"
+version = "2.30.22"
+path = "./lib/marketplacemetering-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "apache-client"
+version = "2.30.22"
+path = "./lib/apache-client-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "auth"
+version = "2.30.22"
+path = "./lib/auth-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "aws-core"
+version = "2.30.22"
+path = "./lib/aws-core-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "aws-json-protocol"
+version = "2.30.22"
+path = "./lib/aws-json-protocol-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "checksums"
+version = "2.30.22"
+path = "./lib/checksums-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "checksums-spi"
+version = "2.30.22"
+path = "./lib/checksums-spi-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "endpoints-spi"
+version = "2.30.22"
+path = "./lib/endpoints-spi-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "http-auth"
+version = "2.30.22"
+path = "./lib/http-auth-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "http-auth-aws"
+version = "2.30.22"
+path = "./lib/http-auth-aws-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "http-auth-spi"
+version = "2.30.22"
+path = "./lib/http-auth-spi-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "http-client-spi"
+version = "2.30.22"
+path = "./lib/http-client-spi-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "identity-spi"
+version = "2.30.22"
+path = "./lib/identity-spi-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "json-utils"
+version = "2.30.22"
+path = "./lib/json-utils-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "metrics-spi"
+version = "2.30.22"
+path = "./lib/metrics-spi-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "profiles"
+version = "2.30.22"
+path = "./lib/profiles-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "protocol-core"
+version = "2.30.22"
+path = "./lib/protocol-core-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "regions"
+version = "2.30.22"
+path = "./lib/regions-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "retries"
+version = "2.30.22"
+path = "./lib/retries-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "retries-spi"
+version = "2.30.22"
+path = "./lib/retries-spi-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "sdk-core"
+version = "2.30.22"
+path = "./lib/sdk-core-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "third-party-jackson-core"
+version = "2.30.22"
+path = "./lib/third-party-jackson-core-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "software.amazon.awssdk"
+artifactId = "utils"
+version = "2.30.22"
+path = "./lib/utils-2.30.22.jar"
+
+[[platform.java17.dependency]]
+groupId = "org.apache.httpcomponents"
+artifactId = "httpcore"
+version = "4.4.16"
+path = "./lib/httpcore-4.4.16.jar"
+
+[[platform.java17.dependency]]
+groupId = "org.apache.httpcomponents"
+artifactId = "httpclient"
+version = "4.5.14"
+path = "./lib/httpclient-4.5.14.jar"
+
+[[platform.java17.dependency]]
+groupId = "org.reactivestreams"
+artifactId = "reactive-streams"
+version = "1.0.4"
+path = "./lib/reactive-streams-1.0.4.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -40,7 +40,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "aws.marketplace.mpm"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "jballerina.java"},

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -58,13 +58,96 @@ configurations {
 
 dependencies {
     externalJars(group: 'io.ballerina.stdlib', name: 'time-native', version: "${stdlibTimeVersion}")
+
+    externalJars(group: 'software.amazon.awssdk', name: 'marketplacemetering', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'apache-client', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'auth', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'aws-core', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'aws-json-protocol', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'checksums', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'checksums-spi', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'endpoints-spi', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'http-auth', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'http-auth-aws', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'http-auth-spi', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'http-client-spi', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'identity-spi', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'json-utils', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'metrics-spi', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'profiles', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'protocol-core', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'regions', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'retries', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'retries-spi', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'sdk-core', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'third-party-jackson-core', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'software.amazon.awssdk', name: 'utils', version: "${awsJavaSdkVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'org.apache.httpcomponents', name: 'httpcore', version: "${apacheHttpCoreVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'org.apache.httpcomponents', name: 'httpclient', version: "${apacheHttpClientVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'org.reactivestreams', name: 'reactive-streams', version: "${reactiveStreamsVersion}") {
+        transitive = false
+    }
 }
 
 task updateTomlFiles {
     doLast {
         def newBallerinaToml = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
         newBallerinaToml = newBallerinaToml.replace("@toml.version@", tomlVersion)
         newBallerinaToml = newBallerinaToml.replace('@time.native.version@', project.stdlibTimeVersion)
+        newBallerinaToml = newBallerinaToml.replace("@aws.sdk.version@", project.awsJavaSdkVersion)
+        newBallerinaToml = newBallerinaToml.replace("@apache.httpcore.version@", project.apacheHttpCoreVersion)
+        newBallerinaToml = newBallerinaToml.replace("@apache.httpclient.version@", project.apacheHttpClientVersion)
+        newBallerinaToml = newBallerinaToml.replace("@reactivestreams.version@", project.reactiveStreamsVersion)
         ballerinaTomlFile.text = newBallerinaToml
     }
 }