From 24264548a6e0f31aa6a124a9a179b9e84c29d677 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 1 Jun 2010 14:01:21 +0000
Subject: [PATCH]     * Installer: Disable pack200 in updater again, doesn't
 work       on Java 1.5     * Remove jetty from updater - it's been in for a
 few       releases, and i2psnark now has its own listHTML method

---
 build.xml                                         | 12 ++++++++++--
 history.txt                                       |  9 +++++++++
 installer/install.xml                             |  5 ++++-
 router/java/src/net/i2p/router/RouterVersion.java |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 5cfe3aa03..9cb1ba223 100644
--- a/build.xml
+++ b/build.xml
@@ -255,8 +255,7 @@
 	<defaultexcludes default="true"/>
     </target>
 
-    <!-- A few reeleases only, then back to updater. Jetty fix for snark in 0.7.14 -->
-    <target name="pkg" depends="distclean, updaterWithJettyFixes, preppkg, installer" />
+    <target name="pkg" depends="distclean, updater, preppkg, installer" />
 
     <target name="pkgclean" depends="deletepkg-temp">
         <delete>
@@ -582,6 +581,15 @@
         <jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
             <manifest><attribute name="Main-Class" value="net.i2p.util.Exec" /></manifest>
         </jar>
+        <!--
+          Force 1.5 pack200 output
+          Doesnt work!
+          http://jira.codehaus.org/browse/IZPACK-404
+          http://forums.sun.com/thread.jspa?threadID=773439
+          http://bfo.co.uk/blog/2010/05/13/combining_ant_jar_signatures_and_pack200.html
+        <property name="com.sun.java.util.jar.pack.package.majver" value="150" />
+        <property name="com.sun.java.util.jar.pack.package.minver" value="7" />
+        -->
         <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
 
         <ant target="installerexe" />
diff --git a/history.txt b/history.txt
index b5de3e81c..36759ac0c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2010-06-01 zzz
+    * i2psnark:
+      - More listing fixes
+      - Revert choker change
+    * Installer: Disable pack200 in updater again, doesn't work
+      on Java 1.5
+    * Remove jetty from updater - it's been in for a few
+      releases, and i2psnark now has its own listHTML method
+
 2010-05-27 zzz
     * Translate: Add GNU ngettext (plurals) support
 
diff --git a/installer/install.xml b/installer/install.xml
index ea5234838..37fe5fce1 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -9,11 +9,14 @@
             <author name="I2P" email="http://forum.i2p2.de/"/>
         </authors>
         <url>http://www.i2p2.de/</url>
+        <javaversion>1.5</javaversion>
 
         <!-- use pack200 compression, saves about 33%
              see http://java.sun.com/j2se/1.5.0/docs/guide/deployment/deployment-guide/pack200.html
-         -->
+             Unpack fails on java 1.5
+             see http://jira.codehaus.org/browse/IZPACK-404
              <pack200 />
+         -->
 
         <!-- adding this element will make the installer attempt to launch itself with administrator permissions,
              but see http://www.nabble.com/Classpath-security-issues-on-Vista-td22456230.html
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f4edb975..31c35f8c3 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";