reproducible builds with Gradle

apps/addressbook/build.gradle

@@ -1,3 +1,5 @@
+apply plugin:'war'
+
 sourceSets {
     main {
         java {
@@ -7,6 +9,14 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':core')
-    compile project(':apps:jetty')
+    providedCompile project(':core')
+    providedCompile project(':apps:jetty')
+}
+
+war {
+    rootSpec.exclude('**/*.class')
+}
+
+artifacts {
+    archives war
 }

apps/i2pcontrol/build.gradle

@@ -20,3 +20,7 @@ war {
     archiveName 'jsonrpc.war'
     webXml = file('web.xml')
 }
+
+artifacts {
+    archives war
+}

apps/i2psnark/build.gradle

@@ -32,7 +32,7 @@ task i2psnarkJar(type: Jar) {
 // TODO: standalone jar.  This is rather involved!
 
 artifacts {
-    archives i2psnarkJar
+    archives i2psnarkJar,war
 }
 
 // Create the java files from the po files. The jar task will compile them.

apps/i2ptunnel/build.gradle

@@ -22,6 +22,9 @@ dependencies {
     providedCompile project(':apps:ministreaming')
     compile 'gnu.getopt:java-getopt:1.0.13'
     providedCompile project(':apps:jetty')
+
+    implementation 'org.apache.ant:ant:1.10.10'
+    implementation fileTree("../jetty/apache-tomacat-${tomcatVersion}")
 }
 
 // Create the java files from the po files. The jar task will compile them.
@@ -62,8 +65,73 @@ task i2ptunnelJar(type: Jar) {
         into "net/i2p/i2ptunnel/resources"
     })
 }
+
+task helpersJar(type: Jar) {
+    from sourceSets.main.output
+    include '**/EditBean.class'
+    include '**/IndexBean.class'
+    include 'net/i2p/i2ptunnel/ui/**'
+    include 'net/i2p/i2ptunnel/web/SSLHelper.class'
+    archiveBaseName='i2pTunnelHelpers'
+}
+
+task precompileJsp(type : JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'net.i2p.servlet.util.JspC'
+
+    jvmArgs "-Dtomcat.util.scan.StandardJarScanFilter.jarsToSkip=commons-collections.jar,junit.jar,junit4.jar"
+    jvmArgs "-Dbuild.reproducible=true"
+
+    args "-d"
+    args "jsp/WEB-INF/classes"
+    args "-v"
+    args "-p"
+    args "net.i2p.i2ptunnel.jsp"
+    args "-webinc"
+    args "$buildDir/web-fragment.xml"
+    args "-webapp"
+    args "jsp"
+    doLast {
+        def output = new File("$buildDir/compiledJsps")
+        output.mkdirs()
+        ant.javac(srcDir: "jsp/WEB-INF/classes",
+                    classpath: sourceSets.main.runtimeClasspath.asPath,
+                    debug : true,
+                    includeAntRuntime : false,
+                    deprecation : "on",
+                    source: project.sourceCompatibility,
+                    target: project.targetCompatibility,
+                    destDir:file("$buildDir/compiledJsps"))
+
+        def fragment = file("$buildDir/web-fragment.xml").text
+        def templateXML = file("jsp/web.xml").text
+        def webXML = templateXML.replace("<!-- precompiled servlets -->", fragment)
+
+        def multipart = "<multipart-config>" +
+                        "<max-file-size>134217728</max-file-size>" +
+                        "<max-request-size>134217728</max-request-size>" +
+                        "<file-size-threshold>262144</file-size-threshold>" +
+                        "</multipart-config>"
+
+        def multipartServlets = ["register"]
+
+
+        multipartServlets = multipartServlets.collect {
+            "<servlet-class>net.i2p.i2ptunnel.jsp.${it}_jsp</servlet-class>"
+        }
+
+        multipartServlets.each {
+            webXML = webXML.replace(it, it + multipart)
+        }
+
+        file("$buildDir/web.xml").text = webXML
+    }
+
+
+}
+
 i2ptunnelJar.dependsOn bundleProxy
-war.dependsOn bundle
+war.dependsOn bundle,precompileJsp
 
 // not needed unless we're building for both android and regular
 task tempBeansJar(type: Jar) {
@@ -85,14 +153,19 @@ task uiJar(type: Jar) {
 }
 
 artifacts {
-    archives i2ptunnelJar   //, tempBeansJar, uiJar
+    archives i2ptunnelJar,war   //, tempBeansJar, uiJar
 }
 
 war {
     include '**/EditBean.class'
     include '**/ui/*.class'
     include '**/IndexBean.class'
     from 'jsp'
+    from ("$buildDir/compiledJsps") {
+        include '**/*.class'
+        into "WEB-INF/classes"
+    }
+    rootSpec.exclude('**/*.jar')
     rootSpec.exclude('/net/i2p/i2ptunnel/*.class')
     rootSpec.exclude('/net/i2p/i2ptunnel/access')
     rootSpec.exclude('/net/i2p/i2ptunnel/irc')
@@ -102,9 +175,11 @@ war {
     rootSpec.exclude('/net/i2p/i2ptunnel/streamr')
     rootSpec.exclude('/net/i2p/i2ptunnel/udp')
     rootSpec.exclude('/net/i2p/i2ptunnel/udpTunnel')
-    exclude 'jsp/web.xml'
-    exclude '*.jsi'
-    exclude '*.jsp'
-    webXml = file('jsp/web.xml')
+    from("jsp") {
+        exclude 'web.xml'
+        exclude '*.jsi'
+        exclude '*.jsp'
+    }
+    webXml = file("$buildDir/web.xml")
 }
 

apps/imagegen/build.gradle

@@ -14,7 +14,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':core')
+    providedCompile project(':core')
     providedCompile project(':apps:jetty')
 }
 
@@ -23,3 +23,7 @@ war {
     from 'imagegen/webapp/src/main/webapp/index.html'
     webXml = file('imagegen/webapp/src/main/webapp/WEB-INF/web.xml')
 }
+
+artifacts {
+    archives war
+}

apps/jetty/build.gradle

@@ -10,7 +10,7 @@ sourceSets {
 
 dependencies {
     ext.jettyVersion = '9.3.29.v20201019'
-    ext.tomcatVersion = '9.0.40'
+    ext.tomcatVersion = "${tomcatVersion}"
     compile project(':core')
     compile 'org.eclipse.jetty:jetty-http:' + ext.jettyVersion
     compile 'org.eclipse.jetty:jetty-io:' + ext.jettyVersion

apps/routerconsole/build.gradle

@@ -18,11 +18,15 @@ dependencies {
     compile project(':core')
     compile project(':router')
     compile project(':installer')
+
+    // below were providedCompile
     providedCompile project(':apps:desktopgui')
     providedCompile project(':apps:systray')
     providedCompile project(':apps:jetty')
     providedCompile project(':apps:jrobin')
 
+    implementation 'org.apache.ant:ant:1.10.10'
+    implementation fileTree("../jetty/apache-tomacat-${tomcatVersion}")
     testCompile "org.scala-lang:scala-library:2.12.4"
     testCompile 'org.scalatest:scalatest_2.12:3.0.4'
 }
@@ -77,26 +81,96 @@ task consoleJar(type: Jar) {
         into "net/i2p/router/news/resources"
     })
 }
-consoleJar.dependsOn bundleJar
-war.dependsOn bundle
 
-artifacts {
-    archives consoleJar
+task helpersJar(type: Jar) {
+    from sourceSets.main.output
+    include 'net/i2p/router/web/helpers/**'
+    archiveBaseName = 'consoleHelpers'
+}
+
+
+task precompileJsp(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'net.i2p.servlet.util.JspC'
+
+    jvmArgs "-Dtomcat.util.scan.StandardJarScanFilter.jarsToSkip=commons-collections.jar,junit.jar,junit4.jar"
+    jvmArgs "-Dbuild.reproducible=true"
+
+    args "-d"
+    args "jsp/WEB-INF/classes"
+    args "-v"
+    args "-p"
+    args "net.i2p.router.web.jsp"
+    args "-webinc"
+    args "$buildDir/web-fragment.xml"
+    args "-webapp"
+    args "jsp"
+    doLast {
+        def output = new File("$buildDir/compiledJsps")
+        output.mkdirs()
+        ant.javac(srcDir: "jsp/WEB-INF/classes",
+                    classpath: sourceSets.main.runtimeClasspath.asPath,
+                    debug : true,
+                    includeAntRuntime : false,
+                    deprecation : "on",
+                    source: project.sourceCompatibility,
+                    target: project.targetCompatibility,
+                    destDir:file("$buildDir/compiledJsps"))
+
+        def fragment = file("$buildDir/web-fragment.xml").text
+        def templateXML = file("jsp/web.xml").text
+        def webXML = templateXML.replace("<!-- precompiled servlets -->", fragment)
+
+        def multipart = "<multipart-config>" +
+                        "<max-file-size>134217728</max-file-size>" +
+                        "<max-request-size>134217728</max-request-size>" +
+                        "<file-size-threshold>262144</file-size-threshold>" +
+                        "</multipart-config>"
+
+        def multipartServlets = ["configplugins",
+                                "configfamily",
+                                "configreseed"]
+
+        multipartServlets = multipartServlets.collect {
+            "<servlet-class>net.i2p.router.web.jsp.${it}_jsp</servlet-class>"
+        }
+
+        multipartServlets.each {
+            webXML = webXML.replace(it, it + multipart)
+        }
+
+        file("$buildDir/web.xml").text = webXML
+    }
+
 }
 
+consoleJar.dependsOn bundleJar
+war.dependsOn(bundle,precompileJsp)
+
+
 war {
+    rootSpec.exclude('**/*.jar')
     rootSpec.exclude('/com/vuze/**/*')
     rootSpec.exclude('/edu/internet2/**/*')
     rootSpec.exclude('/net/i2p/router/news/*')
     rootSpec.exclude('/net/i2p/router/sybil/*')
     rootSpec.exclude('/net/i2p/router/update/*')
     rootSpec.exclude('/net/i2p/router/web/*.class')
-    from 'jsp'
-    exclude 'jsp/web.xml'
-    exclude '*.jsi'
-    exclude '*.jsp'
-    webXml = file('jsp/web.xml')
+    from ("$buildDir/compiledJsps") {
+        into "WEB-INF/classes"
+    }
+    from ('jsp') {
+        exclude 'web.xml'
+        exclude '*.jsi'
+        exclude '*.jsp'
+    }
+    webXml = file("$buildDir/web.xml")
     from ('resources', {
         into "WEB-INF/classes/net/i2p/router/web/resources"
     })
 }
+
+artifacts {
+    archives war,consoleJar
+}
+