Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version for the update 11 #94

Merged
merged 3 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,18 @@ jobs:
- name: Create lib directory if not exists
run: mkdir -p ballerina/lib
- name: Run Trivy vulnerability scanner
uses: aquasecurity/[email protected]
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
Expand Down
12 changes: 6 additions & 6 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[package]
org = "ballerinax"
name = "persist.sql"
version = "1.4.2"
version = "1.5.0"
authors = ["Ballerina"]
keywords = ["persist", "sql", "mysql", "mssql", "sql-server"]
repository = "https://github.com/ballerina-platform/module-ballerinax-persist.sql"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.10.0-20241011-161100-51978649"
distribution = "2201.11.0"

[platform.java21]
graalvmCompatible = true

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "persist.sql-native"
version = "1.4.2"
path = "../native/build/libs/persist.sql-native-1.4.2-SNAPSHOT.jar"
version = "1.5.0"
path = "../native/build/libs/persist.sql-native-1.5.0-SNAPSHOT.jar"

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "persist-native"
version = "1.4.1"
path = "./lib/persist-native-1.4.1-20241113-122000-306cc63.jar"
version = "1.5.0"
path = "./lib/persist-native-1.5.0-20241122-123800-2ae4d59.jar"

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
Expand Down
6 changes: 3 additions & 3 deletions ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ id = "persist.sql-compiler-plugin"
class = "io.ballerina.stdlib.persist.sql.compiler.PersistSqlCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/persist.sql-compiler-plugin-1.4.2-SNAPSHOT.jar"
path = "../compiler-plugin/build/libs/persist.sql-compiler-plugin-1.5.0-SNAPSHOT.jar"

[[dependency]]
path = "./lib/persist-native-1.4.1-20241113-122000-306cc63.jar"
path = "./lib/persist-native-1.5.0-20241122-123800-2ae4d59.jar"

[[dependency]]
path = "./lib/persist-compiler-plugin-1.4.1-20241113-122000-306cc63.jar"
path = "./lib/persist-compiler-plugin-1.5.0-20241122-123800-2ae4d59.jar"
50 changes: 25 additions & 25 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.11.0-20241117-133400-a3054b77"
distribution-version = "2201.11.0-20241121-075100-c4c87cbc"

[[package]]
org = "ballerina"
name = "auth"
version = "2.12.1"
version = "2.13.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand All @@ -23,7 +23,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "cache"
version = "3.8.1"
version = "3.9.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "constraint"},
Expand All @@ -44,7 +44,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "crypto"
version = "2.7.3"
version = "2.8.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -54,7 +54,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "data.jsondata"
version = "0.3.0"
version = "1.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -64,7 +64,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "file"
version = "1.10.1"
version = "1.11.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand Down Expand Up @@ -106,7 +106,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "io"
version = "1.6.2"
version = "1.7.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"}
Expand All @@ -123,7 +123,7 @@ modules = [
[[package]]
org = "ballerina"
name = "jwt"
version = "2.13.1"
version = "2.14.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -238,7 +238,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "log"
version = "2.10.1"
version = "2.11.0"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -252,7 +252,7 @@ modules = [
[[package]]
org = "ballerina"
name = "mime"
version = "2.10.2"
version = "2.11.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand All @@ -264,7 +264,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "oauth2"
version = "2.12.1"
version = "2.13.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand All @@ -286,7 +286,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "os"
version = "1.8.1"
version = "1.9.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand All @@ -296,7 +296,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "persist"
version = "1.4.1"
version = "1.5.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -321,7 +321,7 @@ modules = [
[[package]]
org = "ballerina"
name = "task"
version = "2.5.1"
version = "2.6.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -356,7 +356,7 @@ modules = [
[[package]]
org = "ballerina"
name = "url"
version = "2.4.1"
version = "2.5.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
Expand All @@ -365,7 +365,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "uuid"
version = "1.8.1"
version = "1.9.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand Down Expand Up @@ -399,7 +399,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "h2.driver"
version = "1.1.1"
version = "1.2.0"
scope = "testOnly"
modules = [
{org = "ballerinax", packageName = "h2.driver", moduleName = "h2.driver"}
Expand All @@ -408,7 +408,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "java.jdbc"
version = "1.12.2"
version = "1.13.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand All @@ -424,7 +424,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "mssql"
version = "1.13.2"
version = "1.14.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand All @@ -439,7 +439,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "mssql.driver"
version = "1.6.1"
version = "1.7.0"
scope = "testOnly"
modules = [
{org = "ballerinax", packageName = "mssql.driver", moduleName = "mssql.driver"}
Expand All @@ -448,7 +448,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "mysql"
version = "1.13.2"
version = "1.14.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand All @@ -464,7 +464,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "mysql.driver"
version = "1.7.1"
version = "1.8.0"
scope = "testOnly"
modules = [
{org = "ballerinax", packageName = "mysql.driver", moduleName = "mysql.driver"}
Expand All @@ -473,7 +473,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "persist.sql"
version = "1.4.2"
version = "1.5.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "log"},
Expand All @@ -498,7 +498,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "postgresql"
version = "1.13.3"
version = "1.14.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand All @@ -514,7 +514,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "postgresql.driver"
version = "1.5.2"
version = "1.6.0"
scope = "testOnly"
modules = [
{org = "ballerinax", packageName = "postgresql.driver", moduleName = "postgresql.driver"}
Expand Down
2 changes: 1 addition & 1 deletion build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords = ["persist", "sql", "mysql", "mssql", "sql-server"]
repository = "https://github.com/ballerina-platform/module-ballerinax-persist.sql"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.10.0-20241011-161100-51978649"
distribution = "2201.11.0"

[platform.java21]
graalvmCompatible = true
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
// under the License.

plugins {
id "com.github.spotbugs" version "${githubSpotbugsVersion}"
id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}"
id "de.undercouch.download" version "${underCouchDownloadVersion}"
id "net.researchgate.release" version "${researchgateReleaseVersion}"
id "com.github.spotbugs-base"
id "com.github.johnrengelman.shadow"
id "de.undercouch.download"
id "net.researchgate.release"
}

description = 'Ballerina Persist - SQL Extension'
Expand Down
4 changes: 2 additions & 2 deletions compiler-plugin-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def ballerinaDist = "${project.rootDir}/target/ballerina-runtime"
dependencies {
jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime"
checkstyle project(':checkstyle')
checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}"
implementation project(":persist.sql-compiler-plugin")
testImplementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
testImplementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}"
Expand Down Expand Up @@ -115,7 +115,7 @@ tasks.withType(Checkstyle) {
}

checkstyle {
toolVersion "${project.puppycrawlCheckstyleVersion}"
toolVersion "${project.checkstylePluginVersion}"
configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml")
configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
}
Expand Down
4 changes: 2 additions & 2 deletions compiler-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ description = 'Ballerina - Persist SQL Compiler Plugin'

dependencies {
checkstyle project(':checkstyle')
checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}"

implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
implementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}"
Expand All @@ -43,7 +43,7 @@ tasks.withType(Checkstyle) {
}

checkstyle {
toolVersion "${project.puppycrawlCheckstyleVersion}"
toolVersion "${project.checkstylePluginVersion}"
configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml")
configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
}
Expand Down
Loading
Loading