diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 66644e6..c1bbb7d 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,12 +1,12 @@ [package] org = "ballerinax" name = "oracledb.driver" -version = "1.3.0" +version = "1.4.0" authors = ["Ballerina"] keywords = ["OracleDB"] repository = "https://github.com/ballerina-platform/module-ballerinax-oracledb.driver" license = ["Apache-2.0"] -distribution = "2201.7.0" +distribution = "2201.8.0" [platform.java17] graalvmCompatible = true @@ -23,5 +23,5 @@ path = "./lib/xmlparserv2-23.2.0.0.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "oracledb.driver-native" -version = "1.3.0" -path = "../native/build/libs/oracledb.driver-native-1.3.0.jar" +version = "1.4.0" +path = "../native/build/libs/oracledb.driver-native-1.4.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 682f4c1..29b572c 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -10,7 +10,7 @@ distribution-version = "2201.8.0-20230726-145300-b2bdf796" [[package]] org = "ballerinax" name = "oracledb.driver" -version = "1.3.0" +version = "1.4.0" modules = [ {org = "ballerinax", packageName = "oracledb.driver", moduleName = "oracledb.driver"} ] diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 6482ffb..5fa1d0d 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -6,7 +6,7 @@ authors = ["Ballerina"] keywords = ["OracleDB"] repository = "https://github.com/ballerina-platform/module-ballerinax-oracledb.driver" license = ["Apache-2.0"] -distribution = "2201.7.0" +distribution = "2201.8.0" [platform.java17] graalvmCompatible = true diff --git a/gradle.properties b/gradle.properties index 9b1f701..fb65a53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=io.ballerina.stdlib -version=1.3.1-SNAPSHOT +version=1.4.0-SNAPSHOT githubSpotbugsVersion=5.0.14 githubJohnrengelmanShadowVersion=8.1.1 diff --git a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/native-image.properties b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/native-image.properties index bde942a..06e8b80 100644 --- a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/native-image.properties +++ b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/native-image.properties @@ -14,4 +14,4 @@ # specific language governing permissions and limitations # under the License. -Args = --initialize-at-build-time=oracle.jdbc.driver.DynamicByteArray +Args = --add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED diff --git a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/reflect-config.json b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/reflect-config.json index 8aa006a..c77b0d1 100644 --- a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/reflect-config.json +++ b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/reflect-config.json @@ -1,129 +1,142 @@ [ - { - "name": "oracle.jdbc.OracleDriver" - }, - { - "name": "oracle.jdbc.driver.T4CDriverExtension", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "oracle.jdbc.pool.OracleDataSource", - "queryAllPublicMethods": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - }, - { - "name": "setConnectionProperties", - "parameterTypes": [ - "java.util.Properties" - ] - }, - { - "name": "setLoginTimeout", - "parameterTypes": [ - "int" - ] - }, - { - "name": "setPassword", - "parameterTypes": [ - "java.lang.String" - ] - }, - { - "name": "setURL", - "parameterTypes": [ - "java.lang.String" - ] - }, - { - "name": "setUser", - "parameterTypes": [ - "java.lang.String" - ] - } - ] - }, - { - "name": "oracle.net.ano.Ano", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "oracle.net.ano.AuthenticationService", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "oracle.net.ano.DataIntegrityService", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "oracle.net.ano.EncryptionService", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "oracle.net.ano.SupervisorService", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name":"oracle.jdbc.driver.DiagnosabilityMXBean", - "queryAllPublicMethods":true - }, - { - "name":"oracle.jdbc.driver.Message11", - "methods":[{"name":"","parameterTypes":[] }] - }, - { - "name":"oracle.jdbc.driver.OracleDiagnosabilityMBean", - "queryAllPublicConstructors":true - }, - { - "name":"oracle.jdbc.logging.annotations.Feature", - "methods":[{"name":"values","parameterTypes":[] }] - }, - { - "name":"oracle.jdbc.logging.annotations.Supports", - "queriedMethods":[{"name":"value","parameterTypes":[] }] - }, - { - "name":"oracle.jdbc.logging.runtime.TraceController", - "queryAllPublicMethods":true - }, - { - "name":"oracle.sql.AnyDataFactory" - }, - { - "name":"oracle.sql.TypeDescriptorFactory" - } + { + "name":"oracle.as.jmx.framework.PortableMBeanFactory" + }, + { + "name":"oracle.i18n.text.OraBoot" + }, + { + "name":"oracle.i18n.text.converter.CharacterConverterSJIS" + }, + { + "name":"oracle.jdbc.OracleDriver" + }, + { + "methods":[ + { + "name":"setConnectionProperties", + "parameterTypes":[ + "java.util.Properties" + ] + }, + { + "name":"setLoginTimeout", + "parameterTypes":[ + "int" + ] + }, + { + "name":"setPassword", + "parameterTypes":[ + "java.lang.String" + ] + }, + { + "name":"setURL", + "parameterTypes":[ + "java.lang.String" + ] + }, + { + "name":"setUser", + "parameterTypes":[ + "java.lang.String" + ] + } + ], + "name":"oracle.jdbc.datasource.impl.OracleDataSource" + }, + { + "name":"oracle.jdbc.diagnostics.DiagnosticsMXBean", + "queryAllPublicMethods":true + }, + { + "name":"oracle.jdbc.diagnostics.OracleDiagnosticsMXBean", + "queryAllPublicConstructors":true + }, + { + "methods":[ + { + "name":"", + "parameterTypes":[ + + ] + } + ], + "name":"oracle.jdbc.driver.LiveDMSFactory" + }, + { + "methods":[ + { + "name":"", + "parameterTypes":[ + + ] + } + ], + "name":"oracle.jdbc.driver.T4CDriverExtension" + }, + { + "methods":[ + { + "name":"", + "parameterTypes":[ + + ] + } + ], + "name":"oracle.jdbc.pool.OracleDataSource", + "queryAllPublicMethods":true + }, + { + "methods":[ + { + "name":"", + "parameterTypes":[ + + ] + } + ], + "name":"oracle.net.ano.AuthenticationService" + }, + { + "methods":[ + { + "name":"", + "parameterTypes":[ + + ] + } + ], + "name":"oracle.net.ano.DataIntegrityService" + }, + { + "methods":[ + { + "name":"", + "parameterTypes":[ + + ] + } + ], + "name":"oracle.net.ano.EncryptionService" + }, + { + "methods":[ + { + "name":"", + "parameterTypes":[ + + ] + } + ], + "name":"oracle.net.ano.SupervisorService" + }, + { + "name":"oracle.simplefan.FanManager" + }, + { + "allPublicFields":true, + "name":"oracle.sql.TypeDescriptor" + } ] diff --git a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/resource-config.json b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/resource-config.json index 7c434d7..d53ac83 100644 --- a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/resource-config.json +++ b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/oracledb.driver-native/resource-config.json @@ -1,34 +1,32 @@ { - "resources": { - "includes": [ + "bundles":[ { - "pattern": "\\Qoracle/sql/converter_xcharset/lx20002.glb\\E" - }, - { - "pattern":"\\Qoracle/jdbc/defaultConnectionProperties.properties\\E" - }, - { - "pattern":"\\Qoracle/jdbc/driver/errorMap.xml\\E" + "classNames":[ + "oracle.net.mesg.NetErrorMessages" + ], + "name":"oracle.net.mesg.NetErrorMessages" } - ] - }, - "bundles": [ - { - "name":"oracle.jdbc.driver.Messages", - "locales":[""] - }, - { - "name":"oracle.net.jdbc.nl.mesg.NLSR", - "classNames":[ - "oracle.net.jdbc.nl.mesg.NLSR", - "oracle.net.jdbc.nl.mesg.NLSR_en" - ] - }, - { - "name": "oracle.net.mesg.Message", - "locales": [ - "" + ], + "resources":{ + "includes":[ + { + "pattern":"\\Qoracle/jdbc/defaultConnectionProperties.properties\\E" + }, + { + "pattern":"\\Qoracle/sql/converter_xcharset/lx20001.glb\\E" + }, + { + "pattern":"\\Qoracle/sql/converter_xcharset/lx20002.glb\\E" + }, + { + "pattern":"\\Qoracle/sql/converter_xcharset/lx2001f.glb\\E" + }, + { + "pattern":"\\Qoracle/sql/converter_xcharset/lx2002e.glb\\E" + }, + { + "pattern":"\\Qoracle/sql/converter_xcharset/lx200b2.glb\\E" + } ] - } - ] + } }