Skip to content

Commit

Permalink
Merge pull request #25 from daneshk/main
Browse files Browse the repository at this point in the history
Update version for update 11
  • Loading branch information
daneshk authored Nov 28, 2024
2 parents ca9484b + b0851e2 commit 9c17576
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 64 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
format: 'table'
timeout: '10m0s'
exit-code: '1'
scan-type: "rootfs"
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,24 +1,24 @@
[package]
org = "ballerinax"
name = "persist.redis"
version = "0.2.0"
version = "0.3.0"
authors = ["Ballerina"]
keywords = ["persist", "redis", "experimental"]
repository = "https://github.com/ballerina-platform/module-ballerinax-persist.redis"
license = ["Apache-2.0"]
distribution = "2201.10.0"
distribution = "2201.11.0"

[platform.java21]
graalvmCompatible = true

[[platform.java21.dependency]]
groupId = "io.ballerina.lib"
artifactId = "persist.redis-native"
version = "0.2.0"
path = "../native/build/libs/persist.redis-native-0.2.0.jar"
version = "0.3.0"
path = "../native/build/libs/persist.redis-native-0.3.0-SNAPSHOT.jar"

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "persist-native"
version = "1.4.0"
path = "./lib/persist-native-1.4.0.jar"
version = "1.5.0"
path = "./lib/persist-native-1.5.0-20241122-123800-2ae4d59.jar"
18 changes: 9 additions & 9 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.10.0"
distribution-version = "2201.11.0-20241121-075100-c4c87cbc"

[[package]]
org = "ballerina"
name = "crypto"
version = "2.7.2"
version = "2.8.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "time"}
Expand All @@ -19,7 +19,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "io"
version = "1.6.1"
version = "1.7.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"}
Expand Down Expand Up @@ -102,7 +102,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "log"
version = "2.10.0"
version = "2.11.0"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -116,15 +116,15 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.3.0"
version = "1.4.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "persist"
version = "1.4.0"
version = "1.5.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -149,7 +149,7 @@ modules = [
[[package]]
org = "ballerina"
name = "time"
version = "2.4.0"
version = "2.6.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -160,7 +160,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "persist.redis"
version = "0.2.0"
version = "0.3.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.regexp"},
Expand All @@ -178,7 +178,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "redis"
version = "3.0.1"
version = "3.0.2"
dependencies = [
{org = "ballerina", name = "crypto"},
{org = "ballerina", name = "jballerina.java"}
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 @@ -6,7 +6,7 @@ authors = ["Ballerina"]
keywords = ["persist", "redis", "experimental"]
repository = "https://github.com/ballerina-platform/module-ballerinax-persist.redis"
license = ["Apache-2.0"]
distribution = "2201.10.0"
distribution = "2201.11.0"

[platform.java21]
graalvmCompatible = true
Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
*/

plugins {
id 'com.github.spotbugs'
id 'com.github.johnrengelman.shadow'
id 'de.undercouch.download'
id 'net.researchgate.release'
id 'jacoco'
id "com.github.spotbugs-base"
id "com.github.johnrengelman.shadow"
id "de.undercouch.download"
id "net.researchgate.release"
}

description = 'Ballerina - Persist'
Expand Down
60 changes: 29 additions & 31 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,52 +1,50 @@
group=io.ballerina.lib
version=0.2.1-SNAPSHOT

puppycrawlCheckstyleVersion=10.12.0
checkstyleToolVersion=10.12.0
githubSpotbugsVersion=6.0.18
githubJohnrengelmanShadowVersion=8.1.1
underCouchDownloadVersion=5.4.0
researchgateReleaseVersion=2.8.0
version=0.3.0-SNAPSHOT
ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc

checkstylePluginVersion=10.12.1
spotbugsPluginVersion=6.0.18
downloadPluginVersion=5.4.0
shadowJarPluginVersion=8.1.1
releasePluginVersion=2.8.0
ballerinaGradlePluginVersion=2.0.1
testngVersion=7.6.1
gsonVersion=2.10
ballerinaGradlePluginVersion=2.0.1

ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77

# Direct Dependencies
# Level 01
stdlibIoVersion=1.6.2-20241112-233100-995cf5f
stdlibTimeVersion=2.6.0-20241113-073800-201b904
stdlibUrlVersion=2.4.1-20241113-073900-335ff51
stdlibIoVersion=1.7.0-20241121-173300-0fbd5d4
stdlibTimeVersion=2.6.0-20241122-120400-97742a7
stdlibUrlVersion=2.5.0-20241122-120400-67af694

# Level 02
stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5
stdlibLogVersion=2.10.1-20241113-120000-4577868
stdlibOsVersion=1.8.1-20241113-122000-cca973b
stdlibCryptoVersion=2.7.3-20241113-081400-d015a39
stdlibTaskVersion=2.5.1-20241113-123500-f905281
stdlibPersistVersion=1.4.1-20241113-122000-306cc63
stdlibConstraintVersion=1.6.0-20241122-133100-98689e2
stdlibLogVersion=2.11.0-20241122-150100-2e1a3ca
stdlibOsVersion=1.9.0-20241122-071800-1fae486
stdlibCryptoVersion=2.8.0-20241122-130800-24f1267
stdlibTaskVersion=2.6.0-20241122-124800-cb84357
stdlibPersistVersion=1.5.0-20241122-123800-2ae4d59

# Level 03
stdlibFileVersion=1.10.1-20241113-151700-e1a2e38
stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf
stdlibMimeVersion=2.10.2-20241113-154200-d953747
stdlibUuidVersion=1.8.1-20241113-154400-443c67b
stdlibFileVersion=1.11.0-20241122-180900-dff344c
stdlibCacheVersion=3.9.0-20241122-182900-c956a97
stdlibMimeVersion=2.11.0-20241125-094600-bbddf94
stdlibUuidVersion=1.9.0-20241125-110300-5eb185d

# Level 04
stdlibAuthVersion=2.12.1-20241113-162300-ded40eb
stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa
stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe
stdlibAuthVersion=2.13.0-20241125-094500-d380c71
stdlibJwtVersion=2.14.0-20241125-085500-10a9526
stdlibOAuth2Version=2.13.0-20241126-071700-7eb9e0b

# Level 05
stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a
stdlibHttpVersion=2.13.0-20241126-181000-6585cc5

# Level 08
stdlibRedisVersion=3.0.1
stdlibRedisVersion=3.0.2

# Ballerinax Observer
observeVersion=1.4.0-20241113-092000-b83ae74
observeInternalVersion=1.3.1-20241113-101700-265054d
observeVersion=1.4.0-20241122-184200-c596093
observeInternalVersion=1.4.0-20241122-185200-9e5b1bb

# Enabled publishing insecure checksums, due to fail to publish to maven central
# Refer https://github.com/gradle/gradle/issues/11308
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ 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 group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}"
implementation group: 'io.ballerina.stdlib', name: 'persist-native', version: "${stdlibPersistVersion}"
Expand Down Expand Up @@ -111,7 +111,7 @@ task validateSpotbugs() {
}

checkstyle {
toolVersion "${checkstyleToolVersion}"
toolVersion "${checkstylePluginVersion}"
configFile file("${rootDir}/build-config/checkstyle/build/checkstyle.xml")
configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
}
Expand Down
9 changes: 5 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@

pluginManagement {
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" version "${spotbugsPluginVersion}"
id "com.github.johnrengelman.shadow" version "${shadowJarPluginVersion}"
id "de.undercouch.download" version "${downloadPluginVersion}"
id "net.researchgate.release" version "${releasePluginVersion}"
id "io.ballerina.plugin" version "${ballerinaGradlePluginVersion}"
}

repositories {
Expand Down

0 comments on commit 9c17576

Please sign in to comment.