Skip to content

Commit

Permalink
Merge pull request #20 from kaneeldias/j17
Browse files Browse the repository at this point in the history
  • Loading branch information
kaneeldias authored Oct 20, 2023
2 parents b922696 + babecdc commit 57eef31
Show file tree
Hide file tree
Showing 16 changed files with 224 additions and 154 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/central-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
if: github.repository_owner == 'ballerina-platform'
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
java-version: 17.0.7
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
if: github.repository_owner == 'ballerina-platform'
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
java-version: 17.0.7
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand All @@ -44,6 +44,8 @@ jobs:
run: |
echo "Version: ${VERSION}"
git checkout -b release-${VERSION}
sed -i 's/ballerinaLangVersion=\(.*\)-SNAPSHOT/ballerinaLangVersion=\1/g' gradle.properties
sed -i 's/ballerinaLangVersion=\(.*\)-[0-9]\{8\}-[0-9]\{6\}-.*$/ballerinaLangVersion=\1/g' gradle.properties
git add gradle.properties
git commit -m "Move dependencies to stable version" || echo "No changes to commit"
- name: Grant execute permission for gradlew
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
java-version: 17.0.7
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand All @@ -29,11 +29,11 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
java-version: 17.0.7
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
java-version: 17.0.7
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ This Package bundles the latest PostgreSQL drivers so that the PostgreSQL connec

### Set up the prerequisites

1. Download and install Java SE Development Kit (JDK) version 11 (from one of the following locations).
* [Oracle](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html)
* [OpenJDK](https://adoptium.net/)
1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
* [Oracle](https://www.oracle.com/java/technologies/downloads/)
* [OpenJDK](https://adoptium.net/)

2. Export your GitHub personal access token with read package permissions as follows.

Expand Down
14 changes: 7 additions & 7 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[package]
org = "ballerinax"
name = "postgresql.driver"
version = "1.4.0"
version = "1.5.0"
authors = ["Ballerina"]
keywords = ["PostgreSQL"]
repository = "https://github.com/ballerina-platform/module-ballerinax-postgresql.driver"
license = ["Apache-2.0"]
distribution = "2201.7.0"
distribution = "2201.8.0"

[platform.java11]
graalvmCompatible = true

[[platform.java11.dependency]]
path = "./lib/postgresql-42.5.1.jar"
[[platform.java17.dependency]]
path = "./lib/postgresql-42.6.0.jar"

[[platform.java11.dependency]]
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "postgresql.driver-native"
version = "1.4.0"
path = "../native/build/libs/postgresql.driver-native-1.4.0.jar"
version = "1.5.0"
path = "../native/build/libs/postgresql.driver-native-1.5.0-SNAPSHOT.jar"
4 changes: 2 additions & 2 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.7.0"
distribution-version = "2201.8.0"

[[package]]
org = "ballerinax"
name = "postgresql.driver"
version = "1.4.0"
version = "1.5.0"
modules = [
{org = "ballerinax", packageName = "postgresql.driver", moduleName = "postgresql.driver"}
]
Expand Down
6 changes: 3 additions & 3 deletions ballerina/Module.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ This Package bundles the latest PostgreSQL drivers so that the PostgreSQL connec

| | Version |
|:---|:----------------:|
|Ballerina Language | **2201.3.0** |
|PostgreSQL Driver | **42.5.1** |
|PostgreSQL DB Server| **8.2 or above** |
|Ballerina Language | **2201.8.0** |
|PostgreSQL Driver | **42.6.0** |
|PostgreSQL DB Server| **8.4 or above** |

> The above PostgreSQL drivers are released under the [BSD 2-Clause](https://jdbc.postgresql.org/about/license.html).
Expand Down
4 changes: 2 additions & 2 deletions ballerina/Package.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ This Package bundles the latest PostgreSQL drivers so that the PostgreSQL connec
| | Version |
|:---|:----------------:|
|Ballerina Language | **2201.7.0** |
|PostgreSQL Driver | **42.5.1** |
|PostgreSQL DB Server| **8.2 or above** |
|PostgreSQL Driver | **42.6.0** |
|PostgreSQL DB Server| **8.4 or above** |

> The above PostgreSQL drivers are released under the [BSD 2-Clause](https://jdbc.postgresql.org/about/license.html).
Expand Down
6 changes: 3 additions & 3 deletions build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ authors = ["Ballerina"]
keywords = ["PostgreSQL"]
repository = "https://github.com/ballerina-platform/module-ballerinax-postgresql.driver"
license = ["Apache-2.0"]
distribution = "2201.7.0"
distribution = "2201.8.0"

[platform.java11]
graalvmCompatible = true

[[platform.java11.dependency]]
[[platform.java17.dependency]]
path = "./lib/[email protected]@.jar"

[[platform.java11.dependency]]
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "postgresql.driver-native"
version = "@toml.version@"
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
group=io.ballerina.stdlib
version=1.4.1-SNAPSHOT
version=1.5.0-SNAPSHOT

githubSpotbugsVersion=4.0.5
githubJohnrengelmanShadowVersion=5.2.0
postgreSQLDriverVersion=42.5.1
underCouchDownloadVersion=4.0.4
githubSpotbugsVersion=5.0.14
githubJohnrengelmanShadowVersion=8.1.1
postgreSQLDriverVersion=42.6.0
underCouchDownloadVersion=5.4.0
researchgateReleaseVersion=2.8.0
ballerinaGradlePluginVersion=0.15.0
ballerinaGradlePluginVersion=2.0.1

ballerinaLangVersion=2201.7.0
ballerinaLangVersion=2201.8.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 57eef31

Please sign in to comment.