Corrected contents of i2p.jar router.jar utility.jar

core/build.gradle

@@ -5,6 +5,10 @@ sourceSets {
         java {
             srcDir 'java/src'
         }
+        resources {
+            srcDir 'java/src'
+            include 'gnu/getopt/*.properties'
+        }
     }
     test {
         java {

installer/build.gradle

@@ -10,3 +10,13 @@ dependencies {
     compile project(':core')
     runtime files('lib/wrapper/all/wrapper.jar')
 }
+
+jar {
+    baseName 'utility'
+    from project(':core').sourceSets.main.output
+    include 'net/i2p/installer/**'
+    include 'net/i2p/util/FileUtil.class'
+    manifest {
+        attributes 'Main-Class': 'net.i2p.installer.Main'
+    }
+}

router/build.gradle

@@ -15,3 +15,10 @@ dependencies {
     compile project(':core')
     testCompile project(path: ':core', configuration: 'tests')
 }
+
+jar {
+    manifest {
+        // so people with very old wrapper.config files will still work with Jetty 6
+        attributes 'Class-Path': 'jetty-i2p.jar jetty-java5-threadpool.jar jetty-rewrite-handler.jar jetty-sslengine.jar jetty-start.jar jetty-util.jar'
+    }
+}