Upgrade to JavaMail 1.5.4, make it a remote dependency
This commit is contained in:
str4d
47
build.xml
47
build.xml
@ -17,6 +17,11 @@
|
||||
<property name="jmock.archive" value="jmock-2.6.0-jars.zip"/>
|
||||
<property name="jmockcp" value="${lib}/jmock-2.6.0.jar:${lib}/hamcrest-core-1.3.jar:${lib}/hamcrest-library-1.3.jar:${lib}/jmock-legacy-2.6.0.jar:${lib}/cglib-nodep-2.2.3.jar:${lib}/objenesis-1.0.jar"/>
|
||||
<property name="jmock.url" value="http://jmock.org/downloads/${jmock.archive}"/>
|
||||
|
||||
<!-- Dependencies -->
|
||||
<!-- JavaMail -->
|
||||
<property name="mailapi.filename" value="mailapi-1.5.4.jar"/>
|
||||
<property name="mailapi.url" value="https://maven.java.net/content/repositories/releases/com/sun/mail/mailapi/1.5.4/mailapi-1.5.4.jar"/>
|
||||
<!-- BouncyCastle Provider -->
|
||||
<property name="bcprov.filename" value="bcprov-jdk15on-152.jar"/>
|
||||
<property name="bcprov.url" value="http://downloads.bouncycastle.org/java/bcprov-jdk15on-152.jar"/>
|
||||
@ -32,6 +37,7 @@
|
||||
<property name="subetha.filename" value="subethasmtp-3.1.7.jar"/>
|
||||
<property name="subetha.archive" value="subethasmtp-3.1.7.zip"/>
|
||||
<property name="subetha.url" value="http://subethasmtp.googlecode.com/files/subethasmtp-3.1.7.zip"/>
|
||||
|
||||
<!-- the following are only used by win32installer -->
|
||||
<property name="i2p.mtn" value="../i2p.mtn"/>
|
||||
<property name="win32launcherurl" value="http://dist.codehaus.org/izpack/native-launcher/izpack-launcher-1.3.zip"/>
|
||||
@ -75,7 +81,7 @@
|
||||
<pathelement location="${i2plib}/commons-el.jar" />
|
||||
<pathelement location="${i2plib}/jstl.jar" />
|
||||
<pathelement location="${i2plib}/standard.jar" />
|
||||
<pathelement location="${lib}/mailapi.jar" />
|
||||
<pathelement location="${lib}/${mailapi.filename}" />
|
||||
<pathelement location="${lib}/${bcprov.filename}" />
|
||||
<pathelement location="${lib}/ntruenc-1.2.jar" />
|
||||
<pathelement location="${lib}/scrypt-1.4.0.jar" />
|
||||
@ -126,6 +132,8 @@
|
||||
|
||||
<!-- compiles everything under src/main/java, but not src/test/ or src/build/ -->
|
||||
<target name="compile" depends="checki2pbase">
|
||||
<available property="mailapiexists" file="${lib}/${mailapi.filename}" type="file"/>
|
||||
<ant target="downloadmailapi"/>
|
||||
<available property="bcprovexists" file="${lib}/${bcprov.filename}" type="file"/>
|
||||
<ant target="downloadbcprov"/>
|
||||
<available property="jamesexists" file="${lib}/${james.filename}" type="file"/>
|
||||
@ -190,7 +198,7 @@
|
||||
<fileset dir="src/main/webapp/" includes="*.xml"/>
|
||||
<webinf dir="src/main/webapp/WEB-INF/tlds" includes="*.tld"/>
|
||||
<lib file="${lib}/i2pbote.jar"/>
|
||||
<lib file="${lib}/mailapi.jar"/>
|
||||
<lib file="${lib}/${mailapi.filename}"/>
|
||||
<lib file="${lib}/${bcprov.filename}"/>
|
||||
<lib file="${lib}/ntruenc-1.2.jar"/>
|
||||
<lib file="${lib}/scrypt-1.4.0.jar"/>
|
||||
@ -224,7 +232,6 @@
|
||||
<!--
|
||||
- Make two plugins, one for initial installs and one for updates.
|
||||
- Only the initial install includes mailapi.jar.
|
||||
- - XXX Not the case for 0.2.10, mailapi.jar was updated.
|
||||
- Neither includes jstl.jar or standard.jar, as any i2p version that has
|
||||
- plugin support has these two jars pulled out of susidns.war and put in
|
||||
- $I2P/lib. We set the classpath in webapps.config to find them.
|
||||
@ -251,14 +258,6 @@
|
||||
<arg value="plugin/plugin.tmp/lib/i2pbote.jar.pack"/>
|
||||
<arg value="${lib}/i2pbote.jar"/>
|
||||
</exec>
|
||||
<!-- XXX Pack mailapi.jar here for 0.2.10 -->
|
||||
<exec executable="pack200" failonerror="true">
|
||||
<arg value="--no-gzip"/>
|
||||
<arg value="--effort=9"/>
|
||||
<arg value="--modification-time=latest"/>
|
||||
<arg value="plugin/plugin.tmp/lib/mailapi.jar.pack"/>
|
||||
<arg value="${lib}/mailapi.jar"/>
|
||||
</exec>
|
||||
<exec executable="pack200" failonerror="true">
|
||||
<arg value="--no-gzip"/>
|
||||
<arg value="--effort=9"/>
|
||||
@ -335,10 +334,8 @@
|
||||
<copy file="src/main/scripts/decrypt.bat" todir="plugin/plugin.tmp/lib"/>
|
||||
<copy file="src/main/scripts/fileinfo.bat" todir="plugin/plugin.tmp/lib"/>
|
||||
|
||||
<!-- XXX Don't delete mailapi.jar from updater for 0.2.10
|
||||
<delete file="plugin/plugin.tmp/lib/mailapi.jar" />
|
||||
<delete file="plugin/plugin.tmp/lib/mailapi.jar.pack" />
|
||||
-->
|
||||
<delete file="plugin/plugin.tmp/lib/${mailapi.filename}" />
|
||||
<delete file="plugin/plugin.tmp/lib/${mailapi.filename}.pack" />
|
||||
|
||||
<!-- get build number -->
|
||||
<buildnumber file="plugin/build.number" />
|
||||
@ -364,7 +361,13 @@
|
||||
<move file="i2pbote.su3" tofile="i2pbote-update.su3" />
|
||||
|
||||
<!-- make the install xpi2p -->
|
||||
<!-- XXX Don't pack mailapi.jar here for 0.2.10 -->
|
||||
<exec executable="pack200" failonerror="true">
|
||||
<arg value="--no-gzip"/>
|
||||
<arg value="--effort=9"/>
|
||||
<arg value="--modification-time=latest"/>
|
||||
<arg value="plugin/plugin.tmp/lib/${mailapi.filename}.pack"/>
|
||||
<arg value="${lib}/${mailapi.filename}"/>
|
||||
</exec>
|
||||
<copy file="plugin/plugin.config" todir="plugin/plugin.tmp" overwrite="true" />
|
||||
<exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.tmp/plugin.config" append="true">
|
||||
<arg value="version=${version}-b${build.number}" />
|
||||
@ -443,7 +446,7 @@
|
||||
<copy file="i2pbote-plugin.war" tofile="${i2pinstallerplugindir}/console/webapps/i2pbote.war"/>
|
||||
<copy file="plugin/webapps.config" todir="${i2pinstallerplugindir}/console"/>
|
||||
<copy file="${lib}/i2pbote.jar" todir="${i2pinstallerplugindir}/lib"/>
|
||||
<copy file="${lib}/mailapi.jar" todir="${i2pinstallerplugindir}/lib"/>
|
||||
<copy file="${lib}/${mailapi.filename}" todir="${i2pinstallerplugindir}/lib"/>
|
||||
<copy file="${lib}/${bcprov.filename}" todir="${i2pinstallerplugindir}/lib"/>
|
||||
<copy file="${lib}/ntruenc-1.2.jar" todir="${i2pinstallerplugindir}/lib"/>
|
||||
<copy file="${lib}/scrypt-1.4.0.jar" todir="${i2pinstallerplugindir}/lib"/>
|
||||
@ -584,6 +587,16 @@
|
||||
<delete file="${lib}/${jmock.archive}"/>
|
||||
</target>
|
||||
|
||||
<target name="downloadmailapi" unless="mailapiexists">
|
||||
<input message="JavaMail not found, download now?" validargs="y,n" addproperty="userinput.mailapi"/>
|
||||
<fail message="OK, aborting build.">
|
||||
<condition>
|
||||
<equals arg1="${userinput.mailapi}" arg2="n"/>
|
||||
</condition>
|
||||
</fail>
|
||||
<get src="${mailapi.url}" verbose="true" dest="${lib}/${mailapi.filename}"/>
|
||||
</target>
|
||||
|
||||
<target name="downloadbcprov" unless="bcprovexists">
|
||||
<input message="BouncyCastle Provider not found, download now?" validargs="y,n" addproperty="userinput.bcprov"/>
|
||||
<fail message="OK, aborting build.">
|
||||
|
||||
@ -591,7 +591,7 @@ Here is a simplified diagram of how a Relay Return Packet is sent from one hop t
|
||||
6.2. Included .jar files and third-party source code
|
||||
|
||||
bcprov-jdk15on-152.jar The BouncyCastle library and SecurityProvider.
|
||||
mailapi.jar Part of JavaMail 1.5.1
|
||||
mailapi-1.5.4.jar Part of JavaMail 1.5.4
|
||||
lzma-9.20.jar An LZMA implementation from http://www.7-zip.org/sdk.html
|
||||
ntruenc-1.2.jar An NTRU implementation from http://sf.net/projects/ntru/
|
||||
(only the NTRUEncrypt part, not NTRUSign)
|
||||
|
||||
BIN
lib/mailapi.jar
BIN
lib/mailapi.jar
Binary file not shown.
@ -1 +1 @@
|
||||
webapps.i2pbote.classpath=$I2P/lib/jstl.jar,$I2P/lib/standard.jar,$PLUGIN/lib/i2pbote.jar,$PLUGIN/lib/mailapi.jar,$PLUGIN/lib/bcprov-jdk15on-152.jar,$PLUGIN/lib/flexi-gmss-1.7p1.jar,$PLUGIN/lib/ntruenc-1.2.jar,$PLUGIN/lib/scrypt-1.4.0.jar,$PLUGIN/lib/lzma-9.20.jar,$PLUGIN/lib/apache-james-mailbox-api-0.6-20150508.040939-710.jar,$PLUGIN/lib/apache-james-mailbox-store-0.6-20150508.041003-704.jar,$PLUGIN/lib/apache-mime4j-core-0.8.0-20150617.024907-738.jar,$PLUGIN/lib/commons-codec-1.7.jar,$PLUGIN/lib/commons-collections-3.2.1.jar,$PLUGIN/lib/commons-configuration-1.9.jar,$PLUGIN/lib/commons-io-2.4.jar,$PLUGIN/lib/commons-lang-2.6.jar,$PLUGIN/lib/james-server-filesystem-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-lifecycle-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-imap4-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-library-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-util-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/jcommon-1.0.23.jar,$PLUGIN/lib/jfreechart-1.0.19.jar,$PLUGIN/lib/jutf7-1.0.0.jar,$PLUGIN/lib/log4j-1.2.17.jar,$PLUGIN/lib/netty-3.3.1.Final.jar,$PLUGIN/lib/protocols-api-1.6.4-20150617.121129-1080.jar,$PLUGIN/lib/protocols-imap-1.6.4-20150617.121245-927.jar,$PLUGIN/lib/protocols-netty-1.6.4-20150617.121137-1044.jar,$PLUGIN/lib/slf4j-api-1.7.2.jar,$PLUGIN/lib/slf4j-log4j12-1.7.2.jar,$PLUGIN/lib/subethasmtp-3.1.7.jar
|
||||
webapps.i2pbote.classpath=$I2P/lib/jstl.jar,$I2P/lib/standard.jar,$PLUGIN/lib/i2pbote.jar,$PLUGIN/lib/mailapi-1.5.4.jar,$PLUGIN/lib/bcprov-jdk15on-152.jar,$PLUGIN/lib/flexi-gmss-1.7p1.jar,$PLUGIN/lib/ntruenc-1.2.jar,$PLUGIN/lib/scrypt-1.4.0.jar,$PLUGIN/lib/lzma-9.20.jar,$PLUGIN/lib/apache-james-mailbox-api-0.6-20150508.040939-710.jar,$PLUGIN/lib/apache-james-mailbox-store-0.6-20150508.041003-704.jar,$PLUGIN/lib/apache-mime4j-core-0.8.0-20150617.024907-738.jar,$PLUGIN/lib/commons-codec-1.7.jar,$PLUGIN/lib/commons-collections-3.2.1.jar,$PLUGIN/lib/commons-configuration-1.9.jar,$PLUGIN/lib/commons-io-2.4.jar,$PLUGIN/lib/commons-lang-2.6.jar,$PLUGIN/lib/james-server-filesystem-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-lifecycle-api-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-imap4-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-protocols-library-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/james-server-util-3.0.0-beta5-SNAPSHOT.jar,$PLUGIN/lib/jcommon-1.0.23.jar,$PLUGIN/lib/jfreechart-1.0.19.jar,$PLUGIN/lib/jutf7-1.0.0.jar,$PLUGIN/lib/log4j-1.2.17.jar,$PLUGIN/lib/netty-3.3.1.Final.jar,$PLUGIN/lib/protocols-api-1.6.4-20150617.121129-1080.jar,$PLUGIN/lib/protocols-imap-1.6.4-20150617.121245-927.jar,$PLUGIN/lib/protocols-netty-1.6.4-20150617.121137-1044.jar,$PLUGIN/lib/slf4j-api-1.7.2.jar,$PLUGIN/lib/slf4j-log4j12-1.7.2.jar,$PLUGIN/lib/subethasmtp-3.1.7.jar
|
||||
|
||||
Reference in New Issue
Block a user