updated current version on status.xml, also some misc post-release improvements in...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@887930 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 0f4635f830dae7a44be347d414c65465c85e76cc..6617686e52e3d1364cb75f715f0e51094b763e8e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -914,27 +914,27 @@ under the License.
     </target>
 
     <target name="jar-src" description="Sources for Maven">
-        <jar destfile="${dist.dir}/${jar.name}-${version.id}-sources.jar"
+        <jar destfile="${dist.dir}/${jar.name}-${version.id}-sources-${DSTAMP}.jar"
              manifest="build/poi-manifest.mf">
             <fileset dir="${main.src}"/>
             <metainf dir="legal/"/>
         </jar>
-        <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-sources.jar"
+        <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-sources-${DSTAMP}.jar"
              manifest="build/poi-manifest.mf">
             <fileset dir="${scratchpad.src}"/>
             <metainf dir="legal/"/>
         </jar>
-        <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-sources.jar"
+        <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-sources-${DSTAMP}.jar"
              manifest="build/poi-manifest.mf">
             <fileset dir="${contrib.src}"/>
             <metainf dir="legal/"/>
         </jar>
-        <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-sources.jar"
+        <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-sources-${DSTAMP}.jar"
              manifest="build/poi-manifest.mf">
             <fileset dir="${ooxml.src}"/>
             <metainf dir="legal/"/>
         </jar>
-        <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}-sources.jar"
+        <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}-sources-${DSTAMP}.jar"
              manifest="build/poi-manifest.mf">
             <fileset dir="${examples.src}"/>
             <metainf dir="legal/"/>

diff --git a/maven/mvn-deploy.sh b/maven/mvn-deploy.sh
index 0670a4c1b92a2da61b5abe8c3da41a8c0f4db777..507656b19f18385334c5ebfdb4394aeddf118901 100755 (executable)
--- a/maven/mvn-deploy.sh
+++ b/maven/mvn-deploy.sh
@@ -54,10 +54,10 @@ do
   #The maven sign-and-deploy-file command does NOT sign POM files, so we have to upload the POM's .asc manually
   scp $artifactId-$VERSION.pom.asc $M2_SCP/org/apache/poi/$artifactId/$VERSION/
 
-  if [ -r $artifactId-$VERSION-sources.jar ]; then
+  if [ -r $artifactId-$VERSION-sources-$DSTAMP.jar ]; then
     mvn deploy:deploy-file -DrepositoryId=apache-releases -P apache-releases \
       -Durl=$M2_REPOSITORY -DgeneratePom=false -Dpackaging=java-source \
-      -Dfile=$artifactId-$VERSION-sources.jar -DpomFile=$artifactId-$VERSION.pom
-    scp $artifactId-$VERSION-sources.jar.asc $M2_SCP/org/apache/poi/$artifactId/$VERSION/
+      -Dfile=$artifactId-$VERSION-sources-$DSTAMP.jar -DpomFile=$artifactId-$VERSION.pom
+    scp $artifactId-$VERSION-sources-$DSTAMP.jar.asc $M2_SCP/org/apache/poi/$artifactId/$VERSION/$artifactId-$VERSION-sources.jar.asc
   fi
 done

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index c949c66e96f3107fd059cec607c1850cb779a387..8d36b3bfe3b5935da86353d29e2cea59cba92f09 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -33,7 +33,9 @@
     </developers>
 
     <changes>
-        <release version="3.6-beta1" date="2009-??-??">
+        <release version="3.7-SNAPSHOT" date="2010-??-??">
+        </release>
+        <release version="3.6" date="2009-12-14">
            <action dev="POI-DEVELOPERS" type="fix">48332 - fixed XSSFSheet autoSizeColumn() to tolerate empty RichTextString</action>
            <action dev="POI-DEVELOPERS" type="fix">48332 - fixed ColumnInfoRecord to tolerate missing reserved field</action>
            <action dev="POI-DEVELOPERS" type="fix">47701 - fixed RecordFormatException when reading list subrecords (LbsDataSubRecord)</action>