Author: markt Date: Mon Jul 7 12:30:26 2014 New Revision: 1608428 URL: http://svn.apache.org/r1608428 Log: Update to Tomcat Native Library version 1.1.31 to pick up the Windows binaries that are based on OpenSSL 1.0.1h.
Modified: tomcat/trunk/build.properties.default tomcat/trunk/build.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1608428&r1=1608427&r2=1608428&view=diff ============================================================================== --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Mon Jul 7 12:30:26 2014 @@ -143,9 +143,11 @@ npn.jar=${npn.home}/npn-${npn.version}.j npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar # ----- Tomcat native library ----- -tomcat-native.version=1.1.30 +tomcat-native.version=1.1.31 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version} tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz +# Required due to packaging error in 1.1.31 - remove once fixed +tomcat-native.win.path=tomcat-native-${tomcat-native.version}-win32-bin tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1608428&r1=1608427&r2=1608428&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Mon Jul 7 12:30:26 2014 @@ -1821,7 +1821,7 @@ tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" /> <!-- tc native --> <copy todir="${tomcat.dist}/bin"> - <fileset dir="${tomcat-native.home}/bin"> + <fileset dir="${tomcat-native.home}/${tomcat-native.win.path}/bin"> <include name="*.dll"/> <include name="**/*.dll"/> </fileset> @@ -2737,7 +2737,7 @@ Apache Tomcat ${version} native binaries <antcall target="downloadzip-2"> <param name="sourcefile.1" value="${tomcat-native.win.1}"/> <param name="sourcefile.2" value="${tomcat-native.win.2}"/> - <param name="destfile" value="${tomcat-native.home}/LICENSE"/> + <param name="destfile" value="${tomcat-native.home}/${tomcat-native.win.path}/LICENSE"/> <param name="destdir" value="${tomcat-native.home}"/> </antcall> Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1608428&r1=1608427&r2=1608428&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 7 12:30:26 2014 @@ -187,6 +187,10 @@ <update> Update optional Checkstyle library to 5.7. (kkolinko) </update> + <update> + Update to Tomcat Native Library version 1.1.31 to pick up the Windows + binaries that are based on OpenSSL 1.0.1h. (markt) + </update> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org