Changeset: ce1fc98015a5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce1fc98015a5 Modified Files: java/configure.ag Branch: default Log Message:
Merged from Jun2010 diffs (26 lines): diff -r 5c69faba35f2 -r ce1fc98015a5 java/ChangeLog.Jun2010 --- a/java/ChangeLog.Jun2010 Tue Jul 20 21:48:51 2010 +0200 +++ b/java/ChangeLog.Jun2010 Wed Jul 21 10:09:00 2010 +0200 @@ -1,6 +1,10 @@ # ChangeLog file for java # This file is updated with mchangelog (Gentoo echangelog bastard script) + 21 Jul 2010; Fabian Groffen <fab...@cwi.nl> configure.ag: + merocontrol Java library requires Java 2 Platform 1.5 and up, due to enum + and boxing/unboxing. Bug #2627 + 20 Jul 2010; Fabian Groffen <fab...@cwi.nl> Makefile.ag, NT/rules.msc, build.properties, release.txt, +src/nl/cwi/monetdb/jdbc/MonetBlob.java, src/nl/cwi/monetdb/jdbc/MonetResultSet.java: diff -r 5c69faba35f2 -r ce1fc98015a5 java/configure.ag --- a/java/configure.ag Tue Jul 20 21:48:51 2010 +0200 +++ b/java/configure.ag Wed Jul 21 10:09:00 2010 +0200 @@ -106,7 +106,7 @@ have_java_control=no if test "x$enable_control" != xno; then - req_java_ver_min=1.4 # >= $req_java_ver_min required + req_java_ver_min=1.5 # >= $req_java_ver_min required unset req_java_ver_max # < $req_java_ver_max required AM_MONETDB_ANT_JAVA($req_java_ver_min, $req_java_ver_max) if test "x$have_java" = xno; then _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list