diff --git a/briar-core/.classpath b/briar-core/.classpath index a8e4532ebdc64ec05ff570149ab9c13fbf556e84..813d60b9724f5f4fbc18c7b4a133dbb21335c445 100644 --- a/briar-core/.classpath +++ b/briar-core/.classpath @@ -3,10 +3,10 @@ <classpathentry kind="src" path="src"/> <classpathentry combineaccessrules="false" kind="src" path="/briar-api"/> <classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/> - <classpathentry kind="lib" path="libs/h2small-1.3.170.jar"/> <classpathentry kind="lib" path="libs/javax.inject.jar"/> <classpathentry kind="lib" path="libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/sc-light-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/> <classpathentry kind="lib" path="libs/weupnp-0.1.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="lib" path="libs/h2small-1.3.174.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/briar-core/libs/h2small-1.3.170.jar b/briar-core/libs/h2small-1.3.170.jar deleted file mode 100644 index 0309737008578415b2d03e4c0b8d7fabd8d87af3..0000000000000000000000000000000000000000 Binary files a/briar-core/libs/h2small-1.3.170.jar and /dev/null differ diff --git a/briar-core/libs/h2small-1.3.174.jar b/briar-core/libs/h2small-1.3.174.jar new file mode 100644 index 0000000000000000000000000000000000000000..54e7b44b669691cd50c2c53b9c6d2951c3a662d4 Binary files /dev/null and b/briar-core/libs/h2small-1.3.174.jar differ diff --git a/h2-1.3.170.patch b/h2-1.3.170.patch deleted file mode 100644 index 34afd658a79fb99a0cad1640e8d271c9a234dc6e..0000000000000000000000000000000000000000 --- a/h2-1.3.170.patch +++ /dev/null @@ -1,34 +0,0 @@ -Binary files h2-1.3.170/h2/bin/org/h2/build/Build$1.class and h2-1.3.170-briar/h2/bin/org/h2/build/Build$1.class differ -Binary files h2-1.3.170/h2/bin/org/h2/build/Build$2.class and h2-1.3.170-briar/h2/bin/org/h2/build/Build$2.class differ -Binary files h2-1.3.170/h2/bin/org/h2/build/BuildBase.class and h2-1.3.170-briar/h2/bin/org/h2/build/BuildBase.class differ -Binary files h2-1.3.170/h2/bin/org/h2/build/Build.class and h2-1.3.170-briar/h2/bin/org/h2/build/Build.class differ -diff -Bbur h2-1.3.170/h2/src/tools/org/h2/build/BuildBase.java h2-1.3.170-briar/h2/src/tools/org/h2/build/BuildBase.java ---- h2-1.3.170/h2/src/tools/org/h2/build/BuildBase.java 2013-06-19 15:56:33.000000000 +0100 -+++ h2-1.3.170-briar/h2/src/tools/org/h2/build/BuildBase.java 2013-06-19 16:03:20.000000000 +0100 -@@ -838,6 +838,9 @@ - */ - protected void javac(StringList args, FileList files) { - println("Compiling " + files.size() + " classes"); -+ print("Args:"); -+ for(String arg : args) print(" " + arg); -+ println(""); - StringList params = new StringList(); - params.addAll(args); - params.addAll(getPaths(files.keep(".java"))); -diff -Bbur h2-1.3.170/h2/src/tools/org/h2/build/Build.java h2-1.3.170-briar/h2/src/tools/org/h2/build/Build.java ---- h2-1.3.170/h2/src/tools/org/h2/build/Build.java 2013-06-19 15:56:33.000000000 +0100 -+++ h2-1.3.170-briar/h2/src/tools/org/h2/build/Build.java 2013-06-19 16:05:10.000000000 +0100 -@@ -166,10 +166,11 @@ - files = files("src/main"); - } - StringList args = args(); -- if (System.getProperty("version") != null) { -+ String version = System.getProperty("version"); - String bcp = System.getProperty("bcp"); - // /System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/classes.jar -- args = args.plus("-source", "1.5", "-target", "jsr14", "-bootclasspath", bcp); -+ if (version != null && bcp != null) { -+ args = args.plus("-source", "1.5", "-target", version, "-bootclasspath", bcp); - } - if (debugInfo) { - args = args.plus("-Xlint:unchecked", "-d", "temp", "-sourcepath", "src/main", "-classpath", classpath);