diff options
| author | Yegor Kozlov <yegor@apache.org> | 2009-12-07 14:20:10 +0000 |
|---|---|---|
| committer | Yegor Kozlov <yegor@apache.org> | 2009-12-07 14:20:10 +0000 |
| commit | 5984c5d57cb1aee6bea1b32723e3ad825a3b6a6a (patch) | |
| tree | 306851df6a21204aeffecd7af1a59351730f5587 | |
| parent | 3246c57b68cc05b892a417d6b1dfb7bcd54d1a3f (diff) | |
| download | poi-5984c5d57cb1aee6bea1b32723e3ad825a3b6a6a.tar.gz poi-5984c5d57cb1aee6bea1b32723e3ad825a3b6a6a.zip | |
updated current version on status.xml, also some misc post-release improvements in mvn-deploy.sh and build.xml
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@887930 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.xml | 10 | ||||
| -rwxr-xr-x | maven/mvn-deploy.sh | 6 | ||||
| -rw-r--r-- | src/documentation/content/xdocs/status.xml | 4 |
3 files changed, 11 insertions, 9 deletions
@@ -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 0670a4c1b9..507656b19f 100755 --- 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 c949c66e96..8d36b3bfe3 100644 --- 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> |