From 420b1023b5aff25393f14f77bb57c687abe98d9e Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 26 Nov 2024 14:22:11 +0530 Subject: [PATCH 1/2] [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 6afe839..e0901f6 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,12 +1,12 @@ [package] org = "ballerinax" name = "mssql.driver" -version = "1.6.1" +version = "1.7.0" authors = ["Ballerina"] keywords = ["MSSQL", "SQL Server"] repository = "https://github.com/ballerina-platform/module-ballerinax-mssql.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/mssql-jdbc-12.8.1.jre11.jar" [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "mssql.driver-native" -version = "1.6.1" -path = "../native/build/libs/mssql.driver-native-1.6.1-SNAPSHOT.jar" +version = "1.7.0" +path = "../native/build/libs/mssql.driver-native-1.7.0-SNAPSHOT.jar" From 4e1590c132cc6b0d847d3a4e02b0dd54beadaa6b Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 26 Nov 2024 14:23:09 +0530 Subject: [PATCH 2/2] Update msSQL driver version for update 11 --- .github/workflows/central-publish.yml | 7 ++++++- .github/workflows/publish-release.yml | 7 ++++++- .gitignore | 2 +- build-config/resources/Ballerina.toml | 2 +- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index 5509335..20fb4f1 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 ac1be10..a58e82d 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 diff --git a/.gitignore b/.gitignore index 179819f..95ebeab 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 dd76682..d64e939 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -6,7 +6,7 @@ authors = ["Ballerina"] keywords = ["MSSQL", "SQL Server"] repository = "https://github.com/ballerina-platform/module-ballerinax-mssql.driver" license = ["Apache-2.0"] -distribution = "2201.11.0-20241112-214900-6b80ab87" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true diff --git a/gradle.properties b/gradle.properties index 4a9fbb8..93b30f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=io.ballerina.stdlib -version=1.6.1-SNAPSHOT +version=1.7.0-SNAPSHOT githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.0 @@ -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