offline-patch for 1.3.149

1.3.149-offline.patch (text/plain), 3.51 KB, created by Nils Andresen on 2011-01-18 11:56:45 UTC

--- h2/src/tools/org/h2/build/Build.java	2011-01-07 08:50:02.000000000 +0100
+++ h2/src/tools/org/h2/build/Build.java	2011-01-17 19:01:18.000000000 +0100
@@ -104,12 +104,12 @@
         String cp = "temp" + File.pathSeparator + "bin" +
             File.pathSeparator + "ext/emma-2.0.5312.jar" +
             File.pathSeparator + "ext/postgresql-8.3-603.jdbc3.jar" +
-            File.pathSeparator + "ext/servlet-api-2.4.jar" +
-            File.pathSeparator + "ext/" + getLuceneJar() +
+            File.pathSeparator + "ext/servlet-api.jar" +
+            File.pathSeparator + "ext/lucene-core.jar" +
             File.pathSeparator + "ext/h2mig_pagestore_addon.jar" +
             File.pathSeparator + "ext/org.osgi.core-1.2.0.jar" +
-            File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
-            File.pathSeparator + "ext/slf4j-nop-1.6.0.jar";
+            File.pathSeparator + "ext/slf4j-api.jar" +
+            File.pathSeparator + "ext/slf4j-nop.jar";
         exec("java", args("-Xmx128m", "-cp", cp, "emma", "run",
                 "-cp", "temp",
                 "-sp", "src/main",
@@ -147,9 +147,9 @@
         mkdir("temp");
         download();
         String classpath = "temp" +
-                File.pathSeparator + "ext/servlet-api-2.4.jar" +
-                File.pathSeparator + "ext/" + getLuceneJar() +
-                File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
+                File.pathSeparator + "ext/servlet-api.jar" +
+                File.pathSeparator + "ext/lucene-core.jar" +
+                File.pathSeparator + "ext/slf4j-api.jar" +
                 File.pathSeparator + "ext/org.osgi.core-1.2.0.jar" +
                 File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar";
         FileList files;
@@ -224,21 +224,6 @@
      * dependencies. The database can be used without any dependencies.
      */
     public void download() {
-        download("ext/servlet-api-2.4.jar",
-                "http://repo1.maven.org/maven2/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar",
-                "3fc542fe8bb8164e8d3e840fe7403bc0518053c0");
-        if (getLuceneVersion() == 3) {
-            download("ext/lucene-core-3.0.2.jar",
-                    "http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/3.0.2/lucene-core-3.0.2.jar",
-                    "c2b48995ab855c1b9ea13867a0f976c994e0105d");
-        } else {
-            download("ext/lucene-core-2.2.0.jar",
-                    "http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar",
-                    "47b6eee2e17bd68911e7045896a1c09de0b2dda8");
-        }
-        download("ext/slf4j-api-1.6.0.jar",
-                "http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.6.0/slf4j-api-1.6.0.jar",
-                "b353147a7d51fcfcd818d8aa6784839783db0915");
         download("ext/org.osgi.core-1.2.0.jar",
                 "http://repo1.maven.org/maven2/org/apache/felix/org.osgi.core/1.2.0/org.osgi.core-1.2.0.jar",
                 "3006beb1ca6a83449def6127dad3c060148a0209");
@@ -257,10 +242,6 @@
         download("ext/postgresql-8.3-603.jdbc3.jar",
                 "http://repo1.maven.org/maven2/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar",
                 "33d531c3c53055ddcbea3d88bfa093466ffef924");
-        // for TestTraceSystem
-        download("ext/slf4j-nop-1.6.0.jar",
-                "http://repo1.maven.org/maven2/org/slf4j/slf4j-nop/1.6.0/slf4j-nop-1.6.0.jar",
-                "4da67bb4a6eea5dc273f99c50ad2333eadb46f86");
     }
 
     private String getVersion() {