You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2016/07/02 22:09:00 UTC

svn commit: r1751103 - in /poi: site/src/documentation/content/xdocs/download.xml site/src/documentation/content/xdocs/index.xml site/src/documentation/release-guide.txt trunk/build.xml

Author: kiwiwings
Date: Sat Jul  2 22:09:00 2016
New Revision: 1751103

URL: http://svn.apache.org/viewvc?rev=1751103&view=rev
Log:
announce POI 3.15-beta2
generate snipplet for download.xml

Modified:
    poi/site/src/documentation/content/xdocs/download.xml
    poi/site/src/documentation/content/xdocs/index.xml
    poi/site/src/documentation/release-guide.txt
    poi/trunk/build.xml

Modified: poi/site/src/documentation/content/xdocs/download.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/download.xml?rev=1751103&r1=1751102&r2=1751103&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/download.xml (original)
+++ poi/site/src/documentation/content/xdocs/download.xml Sat Jul  2 22:09:00 2016
@@ -33,7 +33,7 @@
        <link href="index.html">the project homepage</link>.
       </p>
       <ul>
-          <li><link href="download.html#POI-3.15-beta1">The latest beta release is Apache POI 3.15-beta1</link></li>
+          <li><link href="download.html#POI-3.15-beta2">The latest beta release is Apache POI 3.15-beta2</link></li>
           <li><link href="download.html#POI-3.14">The latest stable release is Apache POI 3.14</link></li>
           <li><link href="download.html#archive">Archives of all prior releases</link></li>
       </ul>
@@ -46,65 +46,65 @@
         of the files using the signatures and checksums available from this page.
       </p>
     </section>
-    <section id="POI-3.15-beta1"><title>15 April 2016 - POI 3.15-beta1 available</title>
-      <p>The Apache POI team is pleased to announce the release of 3.15-beta1. 
-         Featured are a handful of new areas of functionality - including basic support for
-         the XML Visio format - and numerous bug fixes.</p>
-      <p>A summary of changes is available in the 
+
+    <section id="POI-3.15-beta2"><title>02 July 2016 - POI 3.15-beta2 available</title>
+      <p>The Apache POI team is pleased to announce the release of 3.15-beta2.
+         Featured are a handful of new areas of functionality and numerous bug fixes.</p>
+      <p>A summary of changes is available in the
         <link href="http://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES.txt">Release Notes</link>.
-        A full list of changes is available in the <link href="changes.html">change log</link>. 
+        A full list of changes is available in the <link href="changes.html">change log</link>.
         People interested should also follow the <link href="mailinglists.html">dev list</link>
         to track progress.</p>
       <p>
-        The POI source release as well as the pre-built binary deployment packages are listed below. 
-        Pre-built versions of all <link href="index.html#components">POI components</link> 
-        are available in the central Maven repository under Group ID "org.apache.poi" and Version 
-        "3.15-beta1".
+        The POI source release as well as the pre-built binary deployment packages are listed below.
+        Pre-built versions of all <link href="index.html#components">POI components</link>
+        are available in the central Maven repository under Group ID "org.apache.poi" and Version
+        "3.15-beta2".
       </p>
       <section><title>Binary Distribution</title>
       <ul>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.15-beta1-20160409.tar.gz">poi-bin-3.15-beta1-20160409.tar.gz</link>
-          (19MB, <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta1-20160409.tar.gz.asc">signed</link>)
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.15-beta2-20160702.tar.gz">poi-bin-3.15-beta2-20160702.tar.gz</link>
+          (18.64 MB, <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta2-20160702.tar.gz.asc">signed</link>)
           <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta1-20160409.tar.gz.md5">
-          b45bfb302226db625229f0152ca201f5</link> 
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta2-20160702.tar.gz.md5">
+          b041ab3e28b248e5230fb281c10cae4b</link>
           <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta1-20160409.tar.gz.sha1">
-          f4eef5dafca029c00bfb1847e27ce72024317d1d</link> 
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta2-20160702.tar.gz.sha1">
+          0b79c75208c176d91c8639f8d2bdeca820c3027c</link>
         </li>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.15-beta1-20160409.zip">poi-bin-3.15-beta1-20160409.zip</link>
-          (28MB, <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta1-20160409.zip.asc">signed</link>)
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.15-beta2-20160702.zip">poi-bin-3.15-beta2-20160702.zip</link>
+          (26.92 MB, <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta2-20160702.zip.asc">signed</link>)
           <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta1-20160409.zip.md5">
-          303f0bed534b86ecb716b20ef12b8503</link> 
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta2-20160702.zip.md5">
+          1f7e911c2772813e5906f35b7d660b42</link>
           <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta1-20160409.zip.sha1">
-          c92db5b0678cd7e890f48669aafcd2e3540bec1b</link> 
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/bin/poi-bin-3.15-beta2-20160702.zip.sha1">
+          296b9e6c8ec25d10f6c07b96fd12779baa03c10c</link>
         </li>
       </ul>
       </section>
       <section><title>Source Distribution</title>
       <ul>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.15-beta1-20160409.tar.gz">poi-src-3.15-beta1-20160409.tar.gz</link>
-          (72MB, <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta1-20160409.tar.gz.asc">signed</link>)
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.15-beta2-20160702.tar.gz">poi-src-3.15-beta2-20160702.tar.gz</link>
+          (70.09 MB, <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta2-20160702.tar.gz.asc">signed</link>)
           <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta1-20160409.tar.gz.md5">
-          2ca0ce14b5aa14083a2184903d32eb6d</link> 
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta2-20160702.tar.gz.md5">
+          ededb01549b0974d97c35e876b007d94</link>
           <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta1-20160409.tar.gz.sha1">
-          0fa5363ac11b09680df1fb3c06f2eee59a3a4329</link> 
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta2-20160702.tar.gz.sha1">
+          f490796c954230c3f5c09255a8f4442ae90d8619</link>
         </li>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.15-beta1-20160409.zip">poi-src-3.15-beta1-20160409.zip</link>
-          (76MB, <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta1-20160409.zip.asc">signed</link>)
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.15-beta2-20160702.zip">poi-src-3.15-beta2-20160702.zip</link>
+          (74.05 MB, <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta2-20160702.zip.asc">signed</link>)
           <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta1-20160409.zip.md5">
-          0f7b27b6c35955ac3c8b45766fc84a27</link> 
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta2-20160702.zip.md5">
+          ff0558c3f028ce434e8b86144d7519cf</link>
           <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta1-20160409.zip.sha1">
-          1e765c6003e8ee602eeed125a58a2fc38fd035b8</link> 
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/dev/src/poi-src-3.15-beta2-20160702.zip.sha1">
+          508b70a2ae4343e920d8de2aaa66a503f33b97b9</link>
         </li>
       </ul>
-      </section>
+    </section>
     </section>
     <section id="POI-3.14"><title>05 March 2016 - POI 3.14 available</title>
       <p>This is the new stable release. Featured are a several new areas of

Modified: poi/site/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/index.xml?rev=1751103&r1=1751102&r2=1751103&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/index.xml (original)
+++ poi/site/src/documentation/content/xdocs/index.xml Sat Jul  2 22:09:00 2016
@@ -34,10 +34,9 @@
   <body>
     <section><title>Project News</title>
 
-      <section><title>15 April 2016 - POI 3.15-beta1 available</title>
+      <section><title>02 July 2016 - POI 3.15-beta2 available</title>
       <p>The Apache POI team is pleased to announce the release of 3.15-beta1. 
-         Featured are a handful of new areas of functionality - including basic support for
-         the XML Visio format - and numerous bug fixes.</p>
+         Featured are a handful of new areas of functionality and numerous bug fixes.</p>
       <p>A summary of changes is available in the 
         <link href="http://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES.txt">Release Notes</link>.
         A full list of changes is available in the <link href="changes.html">change log</link>. 

Modified: poi/site/src/documentation/release-guide.txt
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/release-guide.txt?rev=1751103&r1=1751102&r2=1751103&view=diff
==============================================================================
--- poi/site/src/documentation/release-guide.txt (original)
+++ poi/site/src/documentation/release-guide.txt Sat Jul  2 22:09:00 2016
@@ -221,6 +221,10 @@ the jars could be downloaded fine.
 
 5. Edit the website download page, and list the new release there. This should
    reference the checksums, so take care when updating
+{code}
+# the following generates a download-snipplet.xml to be copy&pasted in the download.xml
+ant update-download -Dversion.id="3.15-beta2" -Dreltype=dev -Drel_date="02 July 2016" -Dfile_date="20160702"
+{code}
 
 6. Build site using a recent version of Java 1.6 or 1.7 (must be after the fix
    for TA13-169A).

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1751103&r1=1751102&r2=1751103&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sat Jul  2 22:09:00 2016
@@ -93,7 +93,7 @@ under the License.
 	<!-- need to override POILogger property before commons logging works -->
     <property name="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.Log4JLogger"/>
 
-	
+
     <!-- Main: -->
     <property name="main.resource1.dir" value="src/resources/main"/>
     <property name="main.src" location="src/java"/>
@@ -300,7 +300,7 @@ under the License.
     	<propertyref name="org.apache.commons.logging.Log"/>
         <propertyref name="java.locale.providers"/>		<!-- required for Java 9 compilation -->
     </propertyset>
-    
+
     <!-- this can be overwriten to empty when running with Java 9 -->
     <property name="maxpermsize" value="-XX:MaxPermSize=256m"/>
 
@@ -2124,8 +2124,8 @@ under the License.
             <sourcePath path="src/ooxml/java" />
             <sourcePath path="src/scratchpad/src" />
         </findbugs>
-    	
-    	<!-- instead of calling findbugs again, we simply transform the xml --> 
+
+    	<!-- instead of calling findbugs again, we simply transform the xml -->
     	<makeurl file="${findbugs.home}/lib/findbugs.jar" property="findbugs.jarurl"/>
         <!-- although there's a findbugs history task too, it doesn't make much sense to provide it, -->
         <!-- as the build directory (i.e. the old findbugs.xml) is deleted regularly -->
@@ -2402,12 +2402,15 @@ under the License.
         <ant dir="build/release" inheritAll="false" inheritRefs="false" useNativeBasedir="true">
             <property name="DSTAMP" value="${DSTAMP}"/>
             <target name="dist" />
-            <target name="dist-nexus" />
         </ant>
     </target>
 
     <target name="release-prep3" depends="-init-svn" description="write the dist to the release candidate repo - needs Java7+">
-        <svn refid="svn.settings">
+        <ant dir="build/release" inheritAll="false" inheritRefs="false" useNativeBasedir="true">
+            <target name="dist-nexus" />
+        </ant>
+
+    	<svn refid="svn.settings">
             <import path="build/release/build/dist"
                 url="https://dist.apache.org/repos/dist/dev/poi"
                 newEntry="${version.id}-${release.rc}"
@@ -2451,4 +2454,149 @@ under the License.
             <mapper><filtermapper><replacestring from="secring" to="pubring"/></filtermapper></mapper>
         </pathconvert>
     </target>
+
+	<macrodef name="loadChecksum">
+		<attribute name="url"/>
+		<attribute name="property"/>
+		<sequential>
+	        <loadresource property="@{property}">
+	            <url url="@{url}"/>
+	            <filterchain>
+	            	<striplinebreaks/>
+	                <replaceregex pattern=" .*" replace=""/>
+	            </filterchain>
+	        </loadresource>			
+		</sequential>
+	</macrodef>
+
+    <scriptdef name="bytes2mega" language="javascript"
+        description="Convert size in bytes to megabytes">
+        <attribute name="property"/>
+        <attribute name="bytes"/>
+    	var bytes = Number(attributes.get("bytes"));
+    	var mega = String((bytes/(1024.0*1024.0)).toFixed(2));
+        project.setProperty(attributes.get("property"), mega);
+    </scriptdef>
+	
+    <macrodef name="loadFilesize">
+        <attribute name="url"/>
+        <attribute name="property"/>
+        <sequential>
+        	<local name="entityProperty"/>
+        	<delete file="build/loadFilesize.txt"/>
+        	<record name="build/loadFilesize.txt" action="start" loglevel="verbose" append="false"/>
+        	<http entityProperty="entityProperty" url="@{url}" method="HEAD" expected="200" printrequestheaders="false" printresponseheaders="false"/>
+        	<record name="build/loadFilesize.txt" action="stop"/>
+        	<local name="fileSize"/>
+        	<loadfile property="fileSize" srcFile="build/loadFilesize.txt">
+        		<filterchain>
+        			<tokenfilter>
+        			    <containsstring contains="Content-Length"/>
+        				<replaceregex pattern=".* ([0-9]+)$" replace="\1" flags="gi"/>
+			    	</tokenfilter>
+        		</filterchain>
+    		</loadfile>
+    		<bytes2mega property="@{property}" bytes="${fileSize}"/>
+        </sequential>
+    </macrodef>
+
+	<!-- TODO: currently this only saves a copy and paste snipplet to a file ...
+	     would be nice if it really changes status.xml and download.xml --> 
+	<target name="update-download">
+        <downloadfile src="http://missing-link.googlecode.com/files/ml-ant-http-1.1.3.zip" dest="${compile.lib}/ml-ant-http-1.1.3.zip"/>
+        <unzip src="${compile.lib}/ml-ant-http-1.1.3.zip" dest="${compile.lib}">
+            <patternset>
+                <include name="ml-ant-http-1.1.3.jar"/>
+            </patternset>
+    	</unzip>
+        <taskdef name="http" classname="org.missinglink.ant.task.http.HttpClientTask">
+            <classpath>
+                <path location="${compile.lib}/ml-ant-http-1.1.3.jar"/>
+            </classpath>
+        </taskdef>
+		
+		<tstamp>
+			<format property="rel_date" pattern="dd MMMM yyyy" locale="US"/>
+			<format property="file_date" pattern="yyyyMMdd" locale="US"/>
+		</tstamp>
+        <!-- TODO: change reltype (dev/release), depending on BETA / FINAL -->
+		<property name="reltype" value="dev"/>
+		<property name="baseurl" value="http://www.apache.org/dist/poi/${reltype}"/>
+
+        <loadChecksum property="bin-tar-md5" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.md5"/>
+        <loadChecksum property="bin-tar-sha1" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha1"/>
+        <loadChecksum property="bin-zip-md5" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip.md5"/>
+        <loadChecksum property="bin-zip-sha1" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip.sha1"/>
+        <loadChecksum property="src-tar-md5" url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz.md5"/>
+        <loadChecksum property="src-tar-sha1" url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz.sha1"/>
+        <loadChecksum property="src-zip-md5" url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip.md5"/>
+        <loadChecksum property="src-zip-sha1" url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip.sha1"/>
+
+		<loadFilesize property="bin-tar-size" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz"/>
+        <loadFilesize property="bin-zip-size" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip"/>
+        <loadFilesize property="src-tar-size" url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz"/>
+        <loadFilesize property="src-zip-size" url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip"/>
+
+		<echo file="download-snipplet.xml"><![CDATA[
+    <section id="POI-${version.id}"><title>${rel_date} - POI ${version.id} available</title>
+      <p>The Apache POI team is pleased to announce the release of ${version.id}.
+         Featured are a handful of new areas of functionality and numerous bug fixes.</p>
+      <p>A summary of changes is available in the
+        <link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/RELEASE-NOTES.txt">Release Notes</link>.
+        A full list of changes is available in the <link href="changes.html">change log</link>.
+        People interested should also follow the <link href="mailinglists.html">dev list</link>
+        to track progress.</p>
+      <p>
+        The POI source release as well as the pre-built binary deployment packages are listed below.
+        Pre-built versions of all <link href="index.html#components">POI components</link>
+        are available in the central Maven repository under Group ID "org.apache.poi" and Version
+        "${version.id}".
+      </p>
+      <section><title>Binary Distribution</title>
+      <ul>
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz">poi-bin-${version.id}-${file_date}.tar.gz</link>
+          (${bin-tar-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.asc">signed</link>)
+          <br/>
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.md5">
+          ${bin-tar-md5}</link>
+          <br/>
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha1">
+          ${bin-tar-sha1}</link>
+        </li>
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip">poi-bin-${version.id}-${file_date}.zip</link>
+          (${bin-zip-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.asc">signed</link>)
+          <br/>
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.md5">
+	      ${bin-zip-md5}</link>
+          <br/>
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.sha1">
+	      ${bin-zip-sha1}</link>
+        </li>
+      </ul>
+      </section>
+      <section><title>Source Distribution</title>
+      <ul>
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz">poi-src-${version.id}-${file_date}.tar.gz</link>
+          (${src-tar-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.asc">signed</link>)
+          <br/>
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.md5">
+          ${src-tar-md5}</link>
+          <br/>
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.sha1">
+	      ${src-tar-sha1}</link>
+        </li>
+        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip">poi-src-${version.id}-${file_date}.zip</link>
+          (${src-zip-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.asc">signed</link>)
+          <br/>
+          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.md5">
+	      ${src-zip-md5}</link>
+          <br/>
+          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.sha1">
+	      ${src-zip-sha1}</link>
+        </li>
+      </ul>
+      </section>
+    </section>
+]]></echo>
+	</target>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org