Index: external_deps.lst
===================================================================
--- external_deps.lst	(revisione 1497991)
+++ external_deps.lst	(copia locale)
@@ -60,10 +60,9 @@
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA == TRUE)
-    MD5 = 17410483b5b5f267aa18b7e00b65e6e0
+    MD5 = d54bda6913099b1f1e953f920bf1f5c5
     name = hsqldb_1_8_0.zip
-    URL1 = http://sourceforge.net/projects/hsqldb/files/hsqldb/hsqldb_1_8_0/hsqldb_1_8_0_10.zip/download
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
     MD5 = 1756c4fa6c616ae15973c104cd8cb256
Index: hsqldb/makefile.mk
===================================================================
--- hsqldb/makefile.mk	(revisione 1497991)
+++ hsqldb/makefile.mk	(copia locale)
@@ -41,7 +41,7 @@
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
-TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0
+TARFILE_MD5=d54bda6913099b1f1e953f920bf1f5c5
 
 TARFILE_ROOTDIR=hsqldb
 
@@ -50,9 +50,7 @@
 			src$/org$/hsqldb$/Library.java
 
 PATCH_FILES=patches$/i96823.patch \
-			patches$/i97032.patch \
-			patches$/i103528.patch \
-			patches$/i104901.patch
+			patches$/i97032.patch
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
Index: hsqldb/patches/i104901.patch
===================================================================
--- hsqldb/patches/i104901.patch	(revisione 1497991)
+++ hsqldb/patches/i104901.patch	(copia locale)
@@ -1,27 +0,0 @@
---- misc/hsqldb/src/org/hsqldb/Table.java	2007-10-19 23:59:07.000000000 +0200
-+++ misc/build/hsqldb/src/org/hsqldb/Table.java	2009-09-11 13:45:42.939231519 +0200
-@@ -149,10 +149,10 @@
-     Constraint[]      constraintList;                 // constrainst for the table
-     HsqlArrayList[]   triggerLists;                   // array of trigger lists
-     private int[]     colTypes;                       // fredt - types of columns
--    private int[]     colSizes;                       // fredt - copy of SIZE values for columns
-+    int[]     	      colSizes;                       // fredt - copy of SIZE values for columns
-     private int[]     colScales;                      // fredt - copy of SCALE values for columns
-     private boolean[] colNullable;                    // fredt - modified copy of isNullable() values
--    private Expression[] colDefaults;                 // fredt - expressions of DEFAULT values
-+    Expression[] 	  colDefaults;                 // fredt - expressions of DEFAULT values
-     private int[]        defaultColumnMap;            // fred - holding 0,1,2,3,...
-     private boolean      hasDefaultValues;            //fredt - shortcut for above
-     boolean              sqlEnforceSize;              // inherited from the database -
---- misc/hsqldb/src/org/hsqldb/TableWorks.java	2007-01-14 06:48:16.000000000 +0100
-+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java	2009-09-11 13:47:50.328667463 +0200
-@@ -670,7 +670,8 @@
-             // default expressions can change
-             oldCol.setType(newCol);
-             oldCol.setDefaultExpression(newCol.getDefaultExpression());
--            table.setColumnTypeVars(colIndex);
-+			table.colSizes[colIndex]    = oldCol.getSize();
-+            table.colDefaults[colIndex] = oldCol.getDefaultExpression();
-             table.resetDefaultsFlag();
- 
-             return;
Index: hsqldb/patches/i103528.patch
===================================================================
--- hsqldb/patches/i103528.patch	(revisione 1497991)
+++ hsqldb/patches/i103528.patch	(copia locale)
@@ -1,11 +0,0 @@
---- misc/hsqldb/src/org/hsqldb/Library.java
-+++ misc/build/hsqldb/src/org/hsqldb/Library.java
-@@ -1957,7 +1957,7 @@
-         functionMap.put("bitand", bitand);
-         functionMap.put("bitlength", bitLength);
-         functionMap.put("bitor", bitor);
--        functionMap.put("bitxor", bitor);
-+        functionMap.put("bitxor", bitxor);
-         functionMap.put("character", character);
-         functionMap.put("concat", concat);
-         functionMap.put("cot", cot);