Skip to content

Commit

Permalink
[APIS-933] Can't import java.sql or javax.sql on JDK 9 or higher. (JD…
Browse files Browse the repository at this point in the history
…BC 11.1.0.0027) (#37)

http://jira.cubrid.org/browse/APIS-933

- modify build.xml for ANT Project and error should be resolved.
 * Removed support for build  jdk 1.5 or lower.
 * The root path for source has been changed in 'jdbc...cubrid-src.jar'
 * Duplicate version files in 'jdbc...src.jar'
- update patch version (11.1.0 -> 11.1.1)
  • Loading branch information
hwany7seo authored Aug 16, 2022
1 parent cacc69e commit e5f1ed0
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 293 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11.1.0
11.1.1
72 changes: 19 additions & 53 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE project>

<project default="dist-cubrid" name="CUBRID JDBC Driver">
<property name="output" value="output"/>
<property name="output" value="${basedir}/output"/>
<property file="${output}/build.properties" />
<property name="cubrid-jar-file" value="${basedir}/JDBC-${version}-cubrid.jar"/>
<property name="cubrid-src-jar-file" value="${basedir}/JDBC-${version}-cubrid-src.jar"/>
Expand All @@ -11,36 +11,6 @@
<property name="src" value="${basedir}/src"/>

<target name="init">
<available property="jdk1.3+" classname="java.lang.StrictMath"/>
<available property="jdk1.4+" classname="java.lang.CharSequence"/>
<available property="jdk1.5+" classname="java.lang.Readable"/>
<available property="jdk1.6+" classname="java.sql.NClob"/>

<condition property="isUnderJDK6">
<not>
<equals arg1="${jdk1.6+}" arg2="true" />
</not>
</condition>

<condition property="isJDK6">
<equals arg1="${ant.java.version}" arg2="1.6" />
</condition>

<mkdir dir="src"/>
<copy todir="src">
<fileset dir="${src}">
<include name="cubrid/**/*.java"/>
</fileset>
</copy>
</target>

<target name="init-jdk6" depends="init" if="isUnderJDK6">
<copy todir="src">
<fileset dir="${src}">
<include name="java/**/*.java"/>
<include name="javax/**/*.java"/>
</fileset>
</copy>
</target>

<target name="clean">
Expand All @@ -53,31 +23,12 @@
</delete>
</target>

<target name="dist-cubrid" depends="build-cubrid">
<jar jarfile="${cubrid-jar-file}">
<fileset dir="${bin-cubrid}"/>
<fileset file="${src}/jdbc/sql-error-codes.xml"/>
<fileset file="${output}/CUBRID-JDBC-${version}"/>
<service type="java.sql.Driver" provider="cubrid.jdbc.driver.CUBRIDDriver"/>
</jar>
</target>

<target name="build-cubrid" depends="compile-cubrid">
</target>

<target name="compile-cubrid" depends="src-cubrid">
<javac destdir="${bin-cubrid}" source="1.5" target="1.5" encoding="EUC-KR" debug="true" debuglevel="lines,source,vars" deprecation="off" includeantruntime="no">
<src path="${src-cubrid}"/>
<include name="**/*.java"/>
</javac>
</target>

<target name="src-cubrid" depends="clean,init-jdk6">
<target name="src-jar-cubrid" depends="clean">
<mkdir dir="${bin-cubrid}"/>
<mkdir dir="${src-cubrid}"/>
<copy file="${output}/CUBRID-JDBC-${version}" tofile="${src-cubrid}/CUBRID-JDBC-${version}"/>
<copy todir="${src-cubrid}" filtering="true">
<fileset dir="src">
<fileset dir="${src}/jdbc">
<include name="**/*.java"/>
</fileset>
<filterset>
Expand All @@ -86,10 +37,25 @@
</copy>
<jar jarfile="${cubrid-src-jar-file}">
<fileset dir="${src-cubrid}"/>
<fileset file="${src}/sql-error-codes.xml"/>
<fileset file="${src}/jdbc/sql-error-codes.xml"/>
<service type="java.sql.Driver" provider="cubrid.jdbc.driver.CUBRIDDriver"/>
</jar>
</target>

<target name="compile-cubrid" depends="src-jar-cubrid">
<javac destdir="${bin-cubrid}" source="1.6" target="1.6" encoding="EUC-KR" debug="true" debuglevel="lines,source,vars" deprecation="off" includeantruntime="no">
<src path="${src-cubrid}"/>
</javac>
</target>

<target name="dist-cubrid" depends="compile-cubrid">
<jar jarfile="${cubrid-jar-file}">
<fileset dir="${bin-cubrid}"/>
<fileset file="${src}/jdbc/sql-error-codes.xml"/>
<fileset file="${output}/CUBRID-JDBC-${version}"/>
<service type="java.sql.Driver" provider="cubrid.jdbc.driver.CUBRIDDriver"/>
</jar>
</target>


</project>
34 changes: 0 additions & 34 deletions src/jdbc/java/sql/ClientInfoStatus.java

This file was deleted.

34 changes: 0 additions & 34 deletions src/jdbc/java/sql/NClob.java

This file was deleted.

34 changes: 0 additions & 34 deletions src/jdbc/java/sql/RowId.java

This file was deleted.

34 changes: 0 additions & 34 deletions src/jdbc/java/sql/RowIdLifetime.java

This file was deleted.

35 changes: 0 additions & 35 deletions src/jdbc/java/sql/SQLClientInfoException.java

This file was deleted.

34 changes: 0 additions & 34 deletions src/jdbc/java/sql/SQLXML.java

This file was deleted.

34 changes: 0 additions & 34 deletions src/jdbc/javax/sql/StatementEventListener.java

This file was deleted.

0 comments on commit e5f1ed0

Please sign in to comment.