diff -r ef38580e4e37 build.xml
--- a/build.xml	Sat Dec 24 05:33:17 2016 +0100
+++ b/build.xml	Mon Jan 16 00:18:25 2017 +0100
@@ -556,6 +556,48 @@
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-1.4.jar"/>
         <jarjar destfile="${dist.dir}/${jython.deploy.jar}">
             <zipfileset src="${dist.dir}/${jython.dev.jar}"/>
+            <!-- these stub jars are pre-built in https://github.com/jnr/jffi/tree/master/archive
+                and rarely if ever change -->
+            <zipfileset src="extlibs/jffi-arm-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-Darwin.jar"/>
+            <zipfileset src="extlibs/jffi-i386-FreeBSD.jar"/>
+            <zipfileset src="extlibs/jffi-i386-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-i386-OpenBSD.jar"/>
+            <zipfileset src="extlibs/jffi-i386-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-i386-Windows.jar"/>
+            <zipfileset src="extlibs/jffi-ppc-AIX.jar"/>
+            <zipfileset src="extlibs/jffi-ppc-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-ppc64-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-s390x-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-sparc-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-sparcv9-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-FreeBSD.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-OpenBSD.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-Windows.jar"/>
+            <manifest>
+                <attribute name="Main-Class" value="org.python.util.jython" />
+                <attribute name="Built-By" value="${user.name}" />
+                <!-- info section. ATTN: no blanks, no '.' in the names -->
+                <section name="Build-Info">
+                    <attribute name="version" value="${jython.version}" />
+                    <attribute name="oracle" value="${oracle.present}" />
+                    <attribute name="informix" value="${informix.present}" />
+                    <attribute name="build-compiler" value="${build.compiler}" />
+                    <attribute name="jdk-target-version" value="${jdk.target.version}" />
+                    <attribute name="debug" value="${debug}" />
+                </section>
+            </manifest>
+        </jarjar>
+    </target>
+
+    <target name="jar-standalone" depends="jar-complete">
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-1.4.jar"/>
+        <jarjar destfile="${dist.dir}/${jython.standalone.jar}">
+            <zipfileset src="${dist.dir}/${jython.deploy.jar}"/>
+            <fileset dir="${dist.dir}" includes="Lib/**" excludes="Lib/test/**" />
+
             <!-- pin to Antlr 3.1.3 until we upgrade parsing -->
             <zipfileset src="extlibs/antlr-runtime-3.1.3.jar"/>
             <rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/>
@@ -588,26 +630,6 @@
             <rule pattern="io.netty.**" result="org.python.netty.@1"/>
             <zipfileset src="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
             <rule pattern="com.carrotsearch.sizeof.**" result="org.python.sizeof.@1"/>
-            <!-- these stub jars are pre-built in https://github.com/jnr/jffi/tree/master/archive
-                and rarely if ever change -->
-            <zipfileset src="extlibs/jffi-arm-Linux.jar"/>
-            <zipfileset src="extlibs/jffi-Darwin.jar"/>
-            <zipfileset src="extlibs/jffi-i386-FreeBSD.jar"/>
-            <zipfileset src="extlibs/jffi-i386-Linux.jar"/>
-            <zipfileset src="extlibs/jffi-i386-OpenBSD.jar"/>
-            <zipfileset src="extlibs/jffi-i386-SunOS.jar"/>
-            <zipfileset src="extlibs/jffi-i386-Windows.jar"/>
-            <zipfileset src="extlibs/jffi-ppc-AIX.jar"/>
-            <zipfileset src="extlibs/jffi-ppc-Linux.jar"/>
-            <zipfileset src="extlibs/jffi-ppc64-Linux.jar"/>
-            <zipfileset src="extlibs/jffi-s390x-Linux.jar"/>
-            <zipfileset src="extlibs/jffi-sparc-SunOS.jar"/>
-            <zipfileset src="extlibs/jffi-sparcv9-SunOS.jar"/>
-            <zipfileset src="extlibs/jffi-x86_64-FreeBSD.jar"/>
-            <zipfileset src="extlibs/jffi-x86_64-Linux.jar"/>
-            <zipfileset src="extlibs/jffi-x86_64-OpenBSD.jar"/>
-            <zipfileset src="extlibs/jffi-x86_64-SunOS.jar"/>
-            <zipfileset src="extlibs/jffi-x86_64-Windows.jar"/>
             <!-- remainder of JNR, JFFI -->
             <zipfileset src="extlibs/jffi-1.2.13.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-ffi-2.1.0.jar"/>
@@ -621,27 +643,7 @@
             <rule pattern="org.apache.html.**" result="org.python.apache.html.@1"/>
             <zipfileset src="extlibs/jline-2.14.2.jar"/>
             <rule pattern="jline.**" result="org.python.jline.@1"/>
-            <manifest>
-                <attribute name="Main-Class" value="org.python.util.jython" />
-                <attribute name="Built-By" value="${user.name}" />
-                <!-- info section. ATTN: no blanks, no '.' in the names -->
-                <section name="Build-Info">
-                    <attribute name="version" value="${jython.version}" />
-                    <attribute name="oracle" value="${oracle.present}" />
-                    <attribute name="informix" value="${informix.present}" />
-                    <attribute name="build-compiler" value="${build.compiler}" />
-                    <attribute name="jdk-target-version" value="${jdk.target.version}" />
-                    <attribute name="debug" value="${debug}" />
-                </section>
-            </manifest>
-        </jarjar>
-    </target>
 
-    <target name="jar-standalone" depends="jar-complete">
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-1.4.jar"/>
-        <jar destfile="${dist.dir}/${jython.standalone.jar}">
-            <zipfileset src="${dist.dir}/${jython.deploy.jar}"/>
-            <fileset dir="${dist.dir}" includes="Lib/**" excludes="Lib/test/**" />
             <manifest>
                 <attribute name="Main-Class" value="org.python.util.jython" />
                 <attribute name="Built-By" value="${user.name}" />
@@ -656,7 +658,7 @@
                     <attribute name="debug" value="${debug}" />
                 </section>
             </manifest>
-        </jar>
+        </jarjar>
     </target>
 
     <target name="jar" depends="compile,expose">
diff -r ef38580e4e37 maven/pom-template.xml
--- a/maven/pom-template.xml	Sat Dec 24 05:33:17 2016 +0100
+++ b/maven/pom-template.xml	Mon Jan 16 00:18:25 2017 +0100
@@ -34,4 +34,138 @@
             <name>Frank Wierzbicki</name>
         </developer>
     </developers>
+
+    <properties>
+        <asm.version>5.0.4</asm.version>
+        <bouncycastle.version>1.54</bouncycastle.version>
+        <netty.version>4.1.6.Final</netty.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr-runtime</artifactId>
+            <version>3.1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-util</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>${bouncycastle.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>${bouncycastle.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>20.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>58.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.carrotsearch</groupId>
+            <artifactId>java-sizeof</artifactId>
+            <version>0.0.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>2.14.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-ffi</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-netdb</artifactId>
+            <version>1.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-posix</artifactId>
+            <version>3.0.31</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-constants</artifactId>
+            <version>0.9.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jffi</artifactId>
+            <version>1.2.13</version>
+        </dependency>
+    </dependencies>
 </project>