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

Add configurations for native-image build #633

Merged
merged 4 commits into from
Oct 4, 2022
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
10 changes: 5 additions & 5 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerinax"
name = "java.jdbc"
version = "1.5.0"
version = "1.5.1"
authors = ["Ballerina"]
keywords = ["database", "client", "network", "SQL", "RDBMS", "JDBC"]
repository = "https://github.com/ballerina-platform/module-ballerinax-java.jdbc"
Expand All @@ -12,14 +12,14 @@ distribution = "2201.2.0"
[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "java.jdbc-native"
version = "1.5.0"
path = "../native/build/libs/java.jdbc-native-1.5.0.jar"
version = "1.5.1"
path = "../native/build/libs/java.jdbc-native-1.5.1-SNAPSHOT.jar"

[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "sql-native"
version = "1.5.0"
path = "./lib/sql-native-1.5.0.jar"
version = "1.5.1"
path = "./lib/sql-native-1.5.1-20221003-172800-1268ddc.jar"

[[platform.java11.dependency]]
path = "./lib/h2-2.1.212.jar"
Expand Down
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ id = "jdbc-compiler-plugin"
class = "io.ballerina.stdlib.java.jdbc.compiler.JDBCCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/java.jdbc-compiler-plugin-1.5.0.jar"
path = "../compiler-plugin/build/libs/java.jdbc-compiler-plugin-1.5.1-SNAPSHOT.jar"
25 changes: 13 additions & 12 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies-toml-version = "2"
[[package]]
org = "ballerina"
name = "auth"
version = "2.4.0"
version = "2.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand All @@ -23,9 +23,10 @@ dependencies = [
[[package]]
org = "ballerina"
name = "cache"
version = "3.2.2"
version = "3.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "task"},
{org = "ballerina", name = "time"}
Expand All @@ -43,7 +44,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "crypto"
version = "2.2.2"
version = "2.2.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -53,7 +54,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "file"
version = "1.4.0"
version = "1.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand All @@ -70,7 +71,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.4.0"
version = "2.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "auth"},
Expand Down Expand Up @@ -119,7 +120,7 @@ modules = [
[[package]]
org = "ballerina"
name = "jwt"
version = "2.4.0"
version = "2.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -222,7 +223,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "log"
version = "2.4.0"
version = "2.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand All @@ -245,7 +246,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "oauth2"
version = "2.4.0"
version = "2.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand All @@ -267,7 +268,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "os"
version = "1.4.0"
version = "1.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand Down Expand Up @@ -301,7 +302,7 @@ modules = [
[[package]]
org = "ballerina"
name = "task"
version = "2.2.2"
version = "2.2.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -343,7 +344,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "uuid"
version = "1.3.0"
version = "1.3.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand Down Expand Up @@ -378,7 +379,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "java.jdbc"
version = "1.5.0"
version = "1.5.1"
dependencies = [
{org = "ballerina", name = "file"},
{org = "ballerina", name = "io"},
Expand Down
24 changes: 12 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ h2DriverVersion=2.1.212

ballerinaLangVersion=2201.2.0

stdlibSqlVersion=1.5.0
stdlibSqlVersion=1.5.1-20221003-172800-1268ddc

# Direct Dependencies
# Level 01
Expand All @@ -23,10 +23,10 @@ stdlibTimeVersion=2.2.2

# Level 02
stdlibLogVersion=2.4.0
stdlibOsVersion=1.4.0
stdlibOsVersion=1.4.1-20220923-100900-5935e0c

# Level 03
stdlibFileVersion=1.4.0
stdlibFileVersion=1.4.1-20220926-142300-9b48f88

# Ballerinax Observer
observeVersion=1.0.5
Expand All @@ -38,21 +38,21 @@ stdlibConstraintVersion=1.0.0
stdlibUrlVersion=2.2.2

# Level 02
stdlibCryptoVersion=2.2.2
stdlibTaskVersion=2.2.2
stdlibCryptoVersion=2.2.3-20220921-105400-812e99d
stdlibTaskVersion=2.2.3-20220920-184600-c109457

# Level 03
stdlibCacheVersion=3.2.2
stdlibCacheVersion=3.3.0-20220926-104700-377cccd
stdlibMimeVersion=2.4.0
stdlibUuidVersion=1.3.0
stdlibUuidVersion=1.3.1-20220926-130700-3e3e76b

# Level 04
stdlibAuthVersion=2.4.0
stdlibJwtVersion=2.4.0
stdlibOAuth2Version=2.4.0
stdlibAuthVersion=2.4.1-20220927-114400-615039d
stdlibJwtVersion=2.4.1-20220926-140600-6b1756f
stdlibOAuth2Version=2.4.1-20220928-092800-5ca4f8b

# Level 05
stdlibHttpVersion=2.4.0
stdlibHttpVersion=2.4.1-20220928-131100-d539a2e

# Level 06
stdlibTransactionVersion=1.2.0
stdlibTransactionVersion=1.2.1-20220930-110100-4e984cb
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
[
{
"name": "org.h2.Driver"
},
{
"name": "org.h2.mvstore.db.LobStorageMap$BlobMeta$Type",
"fields": [
{
"name": "INSTANCE"
}
]
},
{
"name": "org.h2.mvstore.db.LobStorageMap$BlobReference$Type",
"fields": [
{
"name": "INSTANCE"
}
]
},
{
"name": "org.h2.mvstore.db.NullValueDataType",
"fields": [
{
"name": "INSTANCE"
}
]
},
{
"name": "org.h2.mvstore.db.RowDataType$Factory",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.mvstore.tx.VersionedValueType$Factory",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.mvstore.type.ByteArrayDataType",
"fields": [
{
"name": "INSTANCE"
}
]
},
{
"name": "org.h2.mvstore.type.LongDataType",
"fields": [
{
"name": "INSTANCE"
}
]
},
{
"name": "org.h2.store.fs.async.FilePathAsync",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.disk.FilePathDisk",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.mem.FilePathMem",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.mem.FilePathMemLZF",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.niomapped.FilePathNioMapped",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.niomem.FilePathNioMem",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.niomem.FilePathNioMemLZF",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.retry.FilePathRetryOnInterrupt",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.split.FilePathSplit",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "org.h2.store.fs.zip.FilePathZip",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"resources": {
"includes": [
{
"pattern": "\\Qorg/h2/util/data.zip\\E"
}
]
},
"bundles": []
}