Changeset: 816650cda8d0 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=816650cda8d0
Modified Files:
ChangeLog
build.xml
Branch: default
Log Message:
Include the java version in the jar files for clarity to users on which minimum
Java version to use.
diffs (57 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
# This file is updated with Maddlog
* Wed Sep 4 2019 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
+- The jar files are now named according to Java version compatibility.
+ For example, the monetdb-jdbc-2.29.jre7.jar file should be used with
+ Java 7 (or higher).
- Corrected JdbcClient program: the dumping of a view DDL was incorrect when
the view creation statement was not starting with "create view ", such as
when it was created using "CREATE VIEW" or "create or replace view". It now
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -33,17 +33,6 @@ Copyright 1997 - July 2008 CWI, August 2
<property file="build.local.properties" />
<property file="build.properties" />
- <property name="jdbc-jar"
- value="${jardir}/monetdb-jdbc-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
- <property name="jdbcclient-jar"
- value="${jardir}/jdbcclient.jar" />
- <property name="jmonetdb-jar"
- value="${jardir}/jmonetdb.jar" />
- <property name="mcl-jar"
- value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.jar" />
- <property name="mero-control-jar"
- value="${jardir}/merocontrol.jar" />
-
<!--
Cross-compile for JVM 1.5 ("Java 5"). This allows the driver to work with
older java installations.
@@ -56,8 +45,20 @@ Copyright 1997 - July 2008 CWI, August 2
2015-07-16, sjo...@acm.org
-->
- <property name="jvm.version" value="1.7" />
- <property name="javac.flags" value="-Xlint:-options" />
+ <property name="jvm.version" value="1.7" />
+ <property name="jre.version" value="jre7" />
+ <property name="javac.flags" value="-Xlint:-options" />
+
+ <property name="jdbc-jar"
+
value="${jardir}/monetdb-jdbc-${JDBC_MAJOR}.${JDBC_MINOR}.${jre.version}.jar" />
+ <property name="jdbcclient-jar"
+ value="${jardir}/jdbcclient.${jre.version}.jar" />
+ <property name="jmonetdb-jar"
+ value="${jardir}/jmonetdb.${jre.version}.jar" />
+ <property name="mcl-jar"
+ value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.${jre.version}.jar"
/>
+ <property name="mero-control-jar"
+ value="${jardir}/merocontrol.${jre.version}.jar" />
<!-- full target -->
<target name="all">
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
