JDK 1.5 beta2 and generics

The recent JDK 1.5 beta2 is unable to compile the jdbc driver because it
modifies the interfaces that currently take a java.util.Map object to take
a specific type of Map.  This results in the existing classes not
implementing the interfaces anymore.  Any ideas on how to fix this
cleanly?  I don't want to see ant having to add/remove comments to all
of these files, but nothing else occurs to me.

Below are the actual compile errors and a link to one of the new method
signatures javadocs.

Kris Jurka

http://java.sun.com/j2se/1.5.0/docs/api/java/sql/Array.html#getArray(long,%20int,%20java.util.Map)

compile:
    [javac] Compiling 77 source files to
/home/jurka/cvs/pg/official/74/src/interfaces/jdbc/build
    [javac]
/home/jurka/cvs/pg/official/74/src/interfaces/jdbc/org/postgresql/jdbc2/Array.java:35:
org.postgresql.jdbc2.Array is not abstract and does not override abstract
method
getResultSet(long,int,java.util.Map<java.lang.String,java.lang.Class<?>>)
in java.sql.Array
    [javac] public class Array implements java.sql.Array
    [javac]        ^
    [javac]
/home/jurka/cvs/pg/official/74/src/interfaces/jdbc/org/postgresql/jdbc2/optional/PGObjectFactory.java:18:
org.postgresql.jdbc2.optional.PGObjectFactory is not abstract and does not
override abstract method
getObjectInstance(java.lang.Object,javax.naming.Name,javax.naming.Context,java.util.Hashtable<java.lang.String,?>)
in javax.naming.spi.ObjectFactory
    [javac] public class PGObjectFactory implements ObjectFactory
    [javac]        ^
    [javac]
/home/jurka/cvs/pg/official/74/src/interfaces/jdbc/org/postgresql/jdbc3/Jdbc3CallableStatement.java:10:
org.postgresql.jdbc3.Jdbc3CallableStatement is not abstract and does not
override abstract method
getObject(java.lang.String,java.util.Map<java.lang.String,java.lang.Class<?>>)
in java.sql.CallableStatement
    [javac] public class Jdbc3CallableStatement extends
org.postgresql.jdbc3.AbstractJdbc3Statement implements
java.sql.CallableStatement
    [javac]        ^
    [javac]
/home/jurka/cvs/pg/official/74/src/interfaces/jdbc/org/postgresql/jdbc3/Jdbc3Connection.java:11:
org.postgresql.jdbc3.Jdbc3Connection is not abstract and does not override
abstract method
setTypeMap(java.util.Map<java.lang.String,java.lang.Class<?>>) in
java.sql.Connection
    [javac] public class Jdbc3Connection extends
org.postgresql.jdbc3.AbstractJdbc3Connection implements
java.sql.Connection
    [javac]        ^
    [javac]
/home/jurka/cvs/pg/official/74/src/interfaces/jdbc/org/postgresql/jdbc3/Jdbc3ResultSet.java:14:
org.postgresql.jdbc3.Jdbc3ResultSet is not abstract and does not override
abstract method
getObject(java.lang.String,java.util.Map<java.lang.String,java.lang.Class<?>>)
in java.sql.ResultSet
    [javac] public class Jdbc3ResultSet extends
org.postgresql.jdbc3.AbstractJdbc3ResultSet implements java.sql.ResultSet
    [javac]        ^
    [javac] Note: * uses or overrides a deprecated API.
    [javac] Note: Recompile with -Xlint:deprecation for details.
    [javac] Note: Some input files use unchecked or unsafe operations.
    [javac] Note: Recompile with -Xlint:unchecked for details.
    [javac] 5 errors