propagate from branch 'i2p.i2p.zzz.i2pcontrol' (head 1334d424003d201aa352cf57a6ba2f61241ef363)

to branch 'i2p.i2p' (head fe8a90fdbdd491e16040e3ed91a35faa72fd78f2)
2019-01-28 15:10:30 +00:00
parent 0a8ab44139 3fca0f6f99
commit 8c9ce56837
129 changed files with 51913 additions and 42676 deletions
--- a/build.xml
+++ b/build.xml
@@ -819,6 +819,7 @@
        <mkdir dir="./build" />
        <mkdir dir="./build/javadoc" />
        <javadoc access="package"
+            source="${javac.version}"
            destdir="./build/javadoc"
            packagenames="*"
            use="true"
@@ -1374,6 +1375,7 @@
                <istrue value="${with-libtomcat6-java}" />
                <istrue value="${with-libtomcat7-java}" />
                <istrue value="${with-libtomcat8-java}" />
+                <istrue value="${with-libtomcat9-java}" />
            </or>
        </condition>
    </target>