From 7fcb3171d4a518b4f058e97d6d25074143cbc673 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Wed, 3 Jan 2024 13:57:19 +0530 Subject: [PATCH 1/4] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 6 +++--- ballerina/Dependencies.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 22e9527..bf37326 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerinax" name = "h2.driver" -version = "1.1.0" +version = "1.1.1" authors = ["Ballerina"] keywords = ["H2"] repository = "https://github.com/ballerina-platform/module-ballerinax-h2.driver" @@ -17,5 +17,5 @@ path = "./lib/h2-2.2.220.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "h2.driver-native" -version = "1.1.0" -path = "../native/build/libs/h2.driver-native-1.1.0.jar" +version = "1.1.1" +path = "../native/build/libs/h2.driver-native-1.1.1-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 14d2f8f..916c57c 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -10,7 +10,7 @@ distribution-version = "2201.8.0" [[package]] org = "ballerinax" name = "h2.driver" -version = "1.1.0" +version = "1.1.1" modules = [ {org = "ballerinax", packageName = "h2.driver", moduleName = "h2.driver"} ] From 337c25782661abe7c7c083d15545cb55a63b19ab Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 26 Nov 2024 12:41:13 +0530 Subject: [PATCH 2/4] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index e46896c..2f641b8 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,12 +1,12 @@ [package] org = "ballerinax" name = "h2.driver" -version = "1.1.1" +version = "1.2.0" authors = ["Ballerina"] keywords = ["H2"] repository = "https://github.com/ballerina-platform/module-ballerinax-h2.driver" license = ["Apache-2.0"] -distribution = "2201.11.0-20241112-214900-6b80ab87" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true @@ -17,5 +17,5 @@ path = "./lib/h2-2.3.232.jar" [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "h2.driver-native" -version = "1.1.1" -path = "../native/build/libs/h2.driver-native-1.1.1-SNAPSHOT.jar" +version = "1.2.0" +path = "../native/build/libs/h2.driver-native-1.2.0-SNAPSHOT.jar" From 35b74327b90c5f7180eade30c7b400f105db8c93 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 26 Nov 2024 12:45:17 +0530 Subject: [PATCH 3/4] Update H2 driver version for update 11 --- .gitignore | 2 +- build-config/resources/Ballerina.toml | 2 +- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 268b724..907ef7d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ hs_err_pid* # Target folder of ballerina project -/target/* +target # resources folder /resources/* diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 98b6209..6e67639 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -6,7 +6,7 @@ authors = ["Ballerina"] keywords = ["H2"] repository = "https://github.com/ballerina-platform/module-ballerinax-h2.driver" license = ["Apache-2.0"] -distribution = "2201.10.0-20241011-161100-51978649" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true diff --git a/gradle.properties b/gradle.properties index eb8f6b9..1113572 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=io.ballerina.stdlib -version=1.1.1-SNAPSHOT +version=1.2.0-SNAPSHOT githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 @@ -8,4 +8,4 @@ underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 ballerinaGradlePluginVersion=2.0.1 -ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 +ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From d95b8f55ec5f3c44ac9cee2499060adead19415b Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 26 Nov 2024 13:02:02 +0530 Subject: [PATCH 4/4] update trivy scan in github workflows --- .github/workflows/central-publish.yml | 7 ++++++- .github/workflows/publish-release.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index 13bd320..05881a0 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -32,12 +32,17 @@ jobs: run: mkdir -p ballerina/lib - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master + env: + TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db with: scan-type: 'rootfs' - scan-ref: '/github/workspace/ballerina/lib' + scan-ref: '${{ github.workspace }}/ballerina/lib' format: 'table' timeout: '10m0s' exit-code: '1' + scanners: 'vuln' + cache-dir: '/tmp/trivy-cache' - name: Ballerina Central Push if: ${{ github.event.inputs.environment == 'CENTRAL' }} diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index f47122e..7475c96 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -30,12 +30,17 @@ jobs: run: mkdir -p ballerina/lib - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master + env: + TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db with: scan-type: 'rootfs' - scan-ref: '/github/workspace/ballerina/lib' + scan-ref: '${{ github.workspace }}/ballerina/lib' format: 'table' timeout: '10m0s' exit-code: '1' + scanners: 'vuln' + cache-dir: '/tmp/trivy-cache' - name: Set version env variable run: echo "VERSION=$((grep -w 'version' | cut -d= -f2) < gradle.properties | rev | cut --complement -d- -f1 | rev)" >> $GITHUB_ENV - name: Pre release dependency version update