diff --git a/src/main/resources/build-config/ant/build.properties b/src/main/resources/build-config/ant/build.properties index 1942781..f14046e 100644 --- a/src/main/resources/build-config/ant/build.properties +++ b/src/main/resources/build-config/ant/build.properties @@ -17,12 +17,6 @@ on_sql_error=continue db.encoding=utf-8 -#Set path of some JDBC connectors -hsqldb.connector.jar.path=../lib/hsqldb-2.3.4.jar -mysql.connector.jar.path=../lib/mysql-connector-java-8.0.26.jar -oracle.connector.jar.path=../lib/ojdbc14-10.2.0.3.0.jar -postgresql.connector.jar.path=../lib/postgresql-9.4.1211.jar - #Replacement rules for specific DBMS # Format is : # regexp.${dbms}.list : list of index for each replacement rule, separated by comma diff --git a/src/main/resources/build-config/ant/build.xml b/src/main/resources/build-config/ant/build.xml index 703ed9b..15c207b 100644 --- a/src/main/resources/build-config/ant/build.xml +++ b/src/main/resources/build-config/ant/build.xml @@ -5,7 +5,6 @@ - - - - - - - - - @@ -166,9 +160,6 @@ - - - @@ -254,7 +244,6 @@ sql.url="${portal.url}" sql.userid="${portal.user}" sql.password="${portal.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.core.files"/> diff --git a/src/main/resources/build-config/ant/includes/build-all.xml b/src/main/resources/build-config/ant/includes/build-all.xml index a84613c..041041b 100644 --- a/src/main/resources/build-config/ant/includes/build-all.xml +++ b/src/main/resources/build-config/ant/includes/build-all.xml @@ -32,7 +32,6 @@ sql.url="${baseUrlPlugins}" sql.userid="${plugins.user}" sql.password="${plugins.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.db.create" /> @@ -54,7 +53,6 @@ sql.url="${plugins.url}" sql.userid="${plugins.user}" sql.password="${plugins.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.plugin.files" /> @@ -62,7 +60,6 @@ sql.url="${portal.url}" sql.userid="${portal.user}" sql.password="${portal.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.plugin.files" /> diff --git a/src/main/resources/build-config/ant/includes/build-oldstructure.xml b/src/main/resources/build-config/ant/includes/build-oldstructure.xml index 81b0ce8..3284772 100644 --- a/src/main/resources/build-config/ant/includes/build-oldstructure.xml +++ b/src/main/resources/build-config/ant/includes/build-oldstructure.xml @@ -14,7 +14,6 @@ sql.url="${portal.url}" sql.userid="${portal.user}" sql.password="${portal.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.plugin.files" /> diff --git a/src/main/resources/build-config/ant/includes/build-specific.xml b/src/main/resources/build-config/ant/includes/build-specific.xml index d72c427..e6901dc 100644 --- a/src/main/resources/build-config/ant/includes/build-specific.xml +++ b/src/main/resources/build-config/ant/includes/build-specific.xml @@ -70,7 +70,6 @@ sql.url="${baseUrl.pool}" sql.userid="${@{pool}.user}" sql.password="${@{pool}.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.db.create" /> @@ -81,7 +80,6 @@ sql.url="${@{pool}.url}" sql.userid="${@{pool}.user}" sql.password="${@{pool}.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.plugin.files" /> @@ -97,7 +95,6 @@ sql.url="${portal.url}" sql.userid="${portal.user}" sql.password="${portal.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.plugin.files"/> diff --git a/src/main/resources/build-config/ant/includes/build-update.xml b/src/main/resources/build-config/ant/includes/build-update.xml index 7f11a0c..d68e085 100644 --- a/src/main/resources/build-config/ant/includes/build-update.xml +++ b/src/main/resources/build-config/ant/includes/build-update.xml @@ -62,7 +62,6 @@ sql.url="${@{pool}.url}" sql.userid="${@{pool}.user}" sql.password="${@{spool}.password}" - sql.classpath="${db.connector.path}" sql.fileset.refid="sql.plugin.files" /> @@ -78,7 +77,6 @@ sql.url="${portal.url}" sql.userid="${portal.user}" sql.password="${portal.password}" - sql.connector.path="${db.connector.path}" sql.fileset.refid="sql.plugin.files"/>