diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ab584ad..4c02166e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,17 +73,17 @@ jobs: - name: Maven Build run: mvn clean install - name: Ballerina Download - run: sudo wget https://dist.ballerina.io/downloads/2201.2.1/ballerina-2201.2.1-swan-lake.zip + run: sudo wget https://dist.ballerina.io/downloads/2201.3.1/ballerina-2201.3.1-swan-lake.zip - name: Use Ballerina zip version run: sudo apt-get install -y unzip - - run: sudo unzip ballerina-2201.2.1-swan-lake.zip + - run: sudo unzip ballerina-2201.3.1-swan-lake.zip env: JAVA_HOME: /usr/lib/jvm/default-jvm JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true - name: Ballerina Build - run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.2.1-swan-lake/bin/bal pack redis + run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.3.1-swan-lake/bin/bal pack redis - name: Ballerina Test - run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.2.1-swan-lake/bin/bal test --code-coverage redis + run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.3.1-swan-lake/bin/bal test --code-coverage redis # Read the ballerina test results - name: Read Ballerina Test Results diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 931ae8da..296b4191 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -76,17 +76,17 @@ jobs: - name: Maven Build run: mvn clean install - name: Ballerina Download - run: sudo wget https://dist.ballerina.io/downloads/2201.2.1/ballerina-2201.2.1-swan-lake.zip + run: sudo wget https://dist.ballerina.io/downloads/2201.3.1/ballerina-2201.3.1-swan-lake.zip - name: Use Ballerina zip version run: sudo apt-get install -y unzip - - run: sudo unzip ballerina-2201.2.1-swan-lake.zip + - run: sudo unzip ballerina-2201.3.1-swan-lake.zip env: JAVA_HOME: /usr/lib/jvm/default-jvm JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true - name: Ballerina Build - run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.2.1-swan-lake/bin/bal pack redis + run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.3.1-swan-lake/bin/bal pack redis - name: Ballerina Test - run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.2.1-swan-lake/bin/bal test --code-coverage redis + run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.3.1-swan-lake/bin/bal test --code-coverage redis # Read the ballerina test results - name: Read Ballerina Test Results diff --git a/.github/workflows/dev-stg-release.yml b/.github/workflows/dev-stg-release.yml index d1f3e8cb..84e6c78b 100644 --- a/.github/workflows/dev-stg-release.yml +++ b/.github/workflows/dev-stg-release.yml @@ -84,7 +84,7 @@ jobs: - name: Maven Build run: mvn clean install - name: Ballerina Build - uses: ballerina-platform/ballerina-action@2201.2.1 + uses: ballerina-platform/ballerina-action@2201.3.1 with: args: pack redis @@ -94,7 +94,7 @@ jobs: - name: Push to Staging if: github.event.inputs.bal_central_environment == 'STAGE' - uses: ballerina-platform/ballerina-action@2201.2.1 + uses: ballerina-platform/ballerina-action@2201.3.1 with: args: push @@ -105,7 +105,7 @@ jobs: - name: Push to Dev if: github.event.inputs.bal_central_environment == 'DEV' - uses: ballerina-platform/ballerina-action@2201.2.1 + uses: ballerina-platform/ballerina-action@2201.3.1 with: args: push diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 9f44674d..fc55a19d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -50,12 +50,12 @@ jobs: - name: Maven Build run: mvn clean install - name: Ballerina Download - run: sudo wget https://dist.ballerina.io/downloads/2201.2.1/ballerina-2201.2.1-swan-lake.zip + run: sudo wget https://dist.ballerina.io/downloads/2201.3.1/ballerina-2201.3.1-swan-lake.zip - name: Use Ballerina zip version run: sudo apt-get install -y unzip - - run: sudo unzip ballerina-2201.2.1-swan-lake.zip + - run: sudo unzip ballerina-2201.3.1-swan-lake.zip env: JAVA_HOME: /usr/lib/jvm/default-jvm JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true - name: Ballerina Build - run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.2.1-swan-lake/bin/bal build redis + run: /home/runner/work/module-ballerinax-redis/module-ballerinax-redis/ballerina-2201.3.1-swan-lake/bin/bal build redis diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f292c62..b6f5fc48 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,7 +77,7 @@ jobs: - name: Maven Build run: mvn clean install - name: Ballerina Build - uses: ballerina-platform/ballerina-action@2201.2.1 + uses: ballerina-platform/ballerina-action@2201.3.1 with: args: pack redis @@ -85,7 +85,7 @@ jobs: JAVA_HOME: /usr/lib/jvm/default-jvm JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true - name: Ballerina Push - uses: ballerina-platform/ballerina-action@2201.2.1 + uses: ballerina-platform/ballerina-action@2201.3.1 with: args: push diff --git a/pom.xml b/pom.xml index 8fd4967b..bcd14e4f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.ballerinalang connector-redis-parent - 2.3.0 + 2.3.2 pom @@ -313,7 +313,7 @@ my-scm-server - 2201.3.0-rc1 + 2201.3.1 2.2.4 UTF-8 2.17 diff --git a/redis-utils/pom.xml b/redis-utils/pom.xml index 89ac5c73..4dd15842 100644 --- a/redis-utils/pom.xml +++ b/redis-utils/pom.xml @@ -21,7 +21,7 @@ connector-redis-parent org.ballerinalang - 2.3.0 + 2.3.2 4.0.0 diff --git a/redis-utils/src/main/java/org/ballerinalang/redis/utils/RedisDbUtils.java b/redis-utils/src/main/java/org/ballerinalang/redis/utils/RedisDbUtils.java index 62b103d4..076501ff 100644 --- a/redis-utils/src/main/java/org/ballerinalang/redis/utils/RedisDbUtils.java +++ b/redis-utils/src/main/java/org/ballerinalang/redis/utils/RedisDbUtils.java @@ -56,7 +56,7 @@ public class RedisDbUtils { * @throws IOException exception */ public static Object initServer() throws IOException { - String scriptPath = Paths.get(System.getProperty("user.dir")). + String scriptPath = Paths.get(System.getProperty("user.dir")). resolve("redis/tests").resolve("resources").resolve("setup.sh").toString(); ProcessBuilder processBuilder = new ProcessBuilder(); processBuilder.command("bash", scriptPath); diff --git a/redis/Ballerina.toml b/redis/Ballerina.toml index 15b98c0f..794bc47d 100644 --- a/redis/Ballerina.toml +++ b/redis/Ballerina.toml @@ -1,8 +1,8 @@ [package] -distribution = "2201.3.0" +distribution = "2201.3.1" org="ballerinax" name = "redis" -version="2.3.0" +version="2.3.2" authors = ["Ballerina"] keywords = ["IT Operations/Databases", "Cost/Freemium"] icon = "icon.png" @@ -10,29 +10,29 @@ repository = "https://github.com/ballerina-platform/module-ballerinax-redis" license = ["Apache-2.0"] [[platform.java11.dependency]] -path = "../redis-utils/target/redis-2.3.0.jar" +path = "../redis-utils/target/redis-2.3.2.jar" groupId = "org.ballerinalang" artifactId = "redis-utils" module = "redis-utils" -version="2.3.0" +version="2.3.2" [[platform.java11.dependency]] path = "./libs/lettuce-core-5.1.2.RELEASE.jar" [[platform.java11.dependency]] -path = "./libs/netty-common-4.1.77.Final.jar" +path = "./libs/netty-common-4.1.86.Final.jar" [[platform.java11.dependency]] -path = "./libs/netty-buffer-4.1.77.Final.jar" +path = "./libs/netty-buffer-4.1.86.Final.jar" [[platform.java11.dependency]] -path = "./libs/netty-transport-4.1.77.Final.jar" +path = "./libs/netty-transport-4.1.86.Final.jar" [[platform.java11.dependency]] -path = "./libs/netty-resolver-4.1.77.Final.jar" +path = "./libs/netty-resolver-4.1.86.Final.jar" [[platform.java11.dependency]] -path = "./libs/netty-handler-4.1.77.Final.jar" +path = "./libs/netty-handler-4.1.86.Final.jar" [[platform.java11.dependency]] -path = "./libs/netty-codec-4.1.77.Final.jar" +path = "./libs/netty-codec-4.1.86.Final.jar" diff --git a/redis/Dependencies.toml b/redis/Dependencies.toml new file mode 100644 index 00000000..f4cb3840 --- /dev/null +++ b/redis/Dependencies.toml @@ -0,0 +1,98 @@ +# AUTO-GENERATED FILE. DO NOT MODIFY. + +# This file is auto-generated by Ballerina for managing dependency versions. +# It should not be modified by hand. + +[ballerina] +dependencies-toml-version = "2" + +[[package]] +org = "ballerina" +name = "io" +version = "1.3.1" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"} +] + +[[package]] +org = "ballerina" +name = "jballerina.java" +version = "0.0.0" +modules = [ + {org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.runtime" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] +modules = [ + {org = "ballerina", packageName = "lang.runtime", moduleName = "lang.runtime"} +] + +[[package]] +org = "ballerina" +name = "lang.value" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "log" +version = "2.5.1" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"}, + {org = "ballerina", name = "observe"} +] +modules = [ + {org = "ballerina", packageName = "log", moduleName = "log"} +] + +[[package]] +org = "ballerina" +name = "observe" +version = "1.0.6" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "test" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] +modules = [ + {org = "ballerina", packageName = "test", moduleName = "test"} +] + +[[package]] +org = "ballerinax" +name = "redis" +version = "2.3.2" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.runtime"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "test"} +] +modules = [ + {org = "ballerinax", packageName = "redis", moduleName = "redis"} +] + + diff --git a/redis/pom.xml b/redis/pom.xml index 1f31f0b2..52f5942c 100644 --- a/redis/pom.xml +++ b/redis/pom.xml @@ -21,7 +21,7 @@ connector-redis-parent org.ballerinalang - 2.3.0 + 2.3.2 4.0.0 @@ -56,42 +56,42 @@ io.netty netty-common - 4.1.77.Final + 4.1.86.Final io.netty netty-transport - 4.1.77.Final + 4.1.86.Final io.netty netty-handler - 4.1.77.Final + 4.1.86.Final io.netty netty-transport-native-kqueue - 4.1.77.Final + 4.1.86.Final io.netty netty-transport-native-epoll - 4.1.77.Final + 4.1.86.Final io.netty netty-buffer - 4.1.77.Final + 4.1.86.Final io.netty netty-resolver - 4.1.77.Final + 4.1.86.Final io.netty netty-codec - 4.1.77.Final + 4.1.86.Final