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 to Ballerina 2201.3.1 to master branch #152

Merged
merged 1 commit into from
Feb 13, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dev-stg-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ 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
env:
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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>org.ballerinalang</groupId>
<artifactId>connector-redis-parent</artifactId>
<version>2.3.0</version>
<version>2.3.2</version>
<packaging>pom</packaging>

<scm>
Expand Down Expand Up @@ -313,7 +313,7 @@

<properties>
<project.scm.id>my-scm-server</project.scm.id>
<ballerina.version>2201.3.0-rc1</ballerina.version>
<ballerina.version>2201.3.1</ballerina.version>
<mvn.processor.plugin.version>2.2.4</mvn.processor.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion redis-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>connector-redis-parent</artifactId>
<groupId>org.ballerinalang</groupId>
<version>2.3.0</version>
<version>2.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions redis/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
[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"
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"
98 changes: 98 additions & 0 deletions redis/Dependencies.toml
Original file line number Diff line number Diff line change
@@ -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"}
]


18 changes: 9 additions & 9 deletions redis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>connector-redis-parent</artifactId>
<groupId>org.ballerinalang</groupId>
<version>2.3.0</version>
<version>2.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -56,42 +56,42 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.77.Final</version>
<version>4.1.86.Final</version>
</dependency>
</dependencies>
<build>
Expand Down