Mercurial > hg > monetdb-java
changeset 662:ee1f3b3ff5fd
Remove MCL_MAJOR and MCL_MINOR references now we no longer distribute monetdb-mcl-1.##.jre8.jar file.
The references in files: version.sh and build.properties will be removed later after alignement with Sjoerd.
| author | Martin van Dinther <martin.van.dinther@monetdbsolutions.com> |
|---|---|
| date | Thu, 13 Oct 2022 17:20:22 +0200 (2022-10-13) |
| parents | c8f7781a414e |
| children | 3c40f672174c |
| files | Makefile release.txt src/main/java/org/monetdb/jdbc/MonetDriver.java.in |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all: src/main/java/org/monetdb/jdbc/Mone cd tests; ant -f build.xml jar_jdbctests src/main/java/org/monetdb/jdbc/MonetDriver.java: build.properties src/main/java/org/monetdb/jdbc/MonetDriver.java.in - . ./build.properties; sed -e "s/@MCL_MAJOR@/$$MCL_MAJOR/g;s/@MCL_MINOR@/$$MCL_MINOR/g;s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX $$buildno/g;s/@JDBC_DEF_PORT@/$$JDBC_DEF_PORT/g" src/main/java/org/monetdb/jdbc/MonetDriver.java.in > src/main/java/org/monetdb/jdbc/MonetDriver.java + . ./build.properties; sed -e "s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX $$buildno/g;s/@JDBC_DEF_PORT@/$$JDBC_DEF_PORT/g" src/main/java/org/monetdb/jdbc/MonetDriver.java.in > src/main/java/org/monetdb/jdbc/MonetDriver.java doc: ant -f build.xml doc
--- a/release.txt +++ b/release.txt @@ -1,5 +1,5 @@ RELEASE NOTES -MonetDB JDBC driver version 3.2 (Liberica/MCL-1.21) +MonetDB JDBC driver version 3.2 (Liberica) Release date: 2022-01-27 The Java Database Connectivity (JDBC) API provides universal data access from @@ -265,8 +265,8 @@ Notes and Tips for Java Programmers usin See also the example Java JDBC program on: https://www.monetdb.org/Documentation/SQLreference/Programming/JDBC -Warning: - The current implementation of the MonetDB JDBC driver is *not* +WARNING: + The current implementation of the MonetDB JDBC driver is *NOT* multi-thread safe. If your program uses multiple threads concurrently on the same Connection (so one MapiSocket), this may lead to incorrect behavior and results (due to race conditions). @@ -276,4 +276,4 @@ Warning: Note: as of Febr 2021 (monetdb-jdbc-3.0.jre8.jar) we compile all the java sources to target: Java SE 8 (profile compact2), so you need a JRE/JDK JVM of version 8 or higher to use it. - +
--- a/src/main/java/org/monetdb/jdbc/MonetDriver.java.in +++ b/src/main/java/org/monetdb/jdbc/MonetDriver.java.in @@ -38,7 +38,7 @@ import java.util.Properties; *</pre> * * @author Fabian Groffen - * @version @JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@) based on MCL v@MCL_MAJOR@.@MCL_MINOR@" + * @version @JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@) */ public class MonetDriver implements Driver { /* cannot (yet) be final as nl.cwi.monetdb.jdbc.MonetDriver extends this class */ // the url kind will be jdbc:monetdb://<host>[:<port>]/<database> @@ -318,7 +318,7 @@ public class MonetDriver implements Driv * @return the version string */ public static final String getDriverVersion() { - return "@JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@ based on MCL v@MCL_MAJOR@.@MCL_MINOR@)"; + return "@JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@)"; } /** A static Map containing the mapping between MonetDB types and Java SQL types */