From commits-return-11631-apmail-poi-commits-archive=poi.apache.org@poi.apache.org Fri Sep 7 19:25:04 2018 Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2DA7620CD0 for ; Fri, 7 Sep 2018 19:25:04 +0000 (UTC) Received: (qmail 19609 invoked by uid 500); 7 Sep 2018 19:25:04 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 19569 invoked by uid 500); 7 Sep 2018 19:25:04 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 19560 invoked by uid 99); 7 Sep 2018 19:25:04 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2018 19:25:04 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 68A7F3A0116 for ; Fri, 7 Sep 2018 19:25:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1840318 - in /poi: site/src/documentation/ site/src/documentation/content/xdocs/ trunk/ trunk/osgi/ trunk/sonar/ trunk/sonar/examples/ trunk/sonar/excelant/ trunk/sonar/main/ trunk/sonar/ooxml-schema-encryption/ trunk/sonar/ooxml-schema-se... Date: Fri, 07 Sep 2018 19:25:02 -0000 To: commits@poi.apache.org From: kiwiwings@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180907192503.68A7F3A0116@svn01-us-west.apache.org> Author: kiwiwings Date: Fri Sep 7 19:25:02 2018 New Revision: 1840318 URL: http://svn.apache.org/viewvc?rev=1840318&view=rev Log: update 3.17 leftovers and provide a new build target to update those in the next release remove final / beta tags, as we (try to) use semver now Modified: poi/site/src/documentation/content/xdocs/download.xml poi/site/src/documentation/release-guide.txt poi/trunk/build.gradle poi/trunk/build.xml poi/trunk/doap_POI.rdf poi/trunk/osgi/build.xml poi/trunk/sonar/examples/pom.xml poi/trunk/sonar/excelant/pom.xml poi/trunk/sonar/main/pom.xml poi/trunk/sonar/ooxml-schema-encryption/pom.xml poi/trunk/sonar/ooxml-schema-security/pom.xml poi/trunk/sonar/ooxml-schema/pom.xml poi/trunk/sonar/ooxml/pom.xml poi/trunk/sonar/pom.xml poi/trunk/sonar/scratchpad/pom.xml poi/trunk/src/examples/groovy/build.gradle poi/trunk/src/examples/scala/build.sbt Modified: poi/site/src/documentation/content/xdocs/download.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/download.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/site/src/documentation/content/xdocs/download.xml (original) +++ poi/site/src/documentation/content/xdocs/download.xml Fri Sep 7 19:25:02 2018 @@ -181,9 +181,6 @@ sub 4096g/7B45A98A 2007-06-18 [expires Modified: poi/site/src/documentation/release-guide.txt URL: http://svn.apache.org/viewvc/poi/site/src/documentation/release-guide.txt?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/site/src/documentation/release-guide.txt (original) +++ poi/site/src/documentation/release-guide.txt Fri Sep 7 19:25:02 2018 @@ -119,8 +119,7 @@ svn pd 'svn:executable' $(find -name .sv 1. The following command will update the documentation and create/download the tag (needs a Java7+ environment) using your Apache credentials stored in ~/.m2/settings.xml. {code:sh} - ant -Dversion.id=FIXME3.15-beta2 release-prep1 (beta release) - ant -Dversion.id=FIXME3.15 release-prep1 (final release) + ant -Dversion.id=FIXME3.15 release-prep1 {code} 2. Compile the dist (needs a JDK6 environment, sudo update-alternatives --config java) @@ -130,9 +129,9 @@ svn pd 'svn:executable' $(find -name .sv 3. Upload to the nexus repo and to the svn release candidate repo (needs a Java7+ environment) The nexus repo is located at https://repository.apache.org/ - The release candidate repo is located at https://dist.apache.org/repos/dist/dev/poi/(3.15-beta2-RC1) + The release candidate repo is located at https://dist.apache.org/repos/dist/dev/poi/(4.0.0-RC1) {code:sh} - ant -Dversion.id=FIXME3.15-beta2 -Drelease.rc=RC1 release-prep3 + ant -Dversion.id=FIXME3.15 -Drelease.rc=RC1 release-prep3 {code} 4. Summarise key changes, and any backwards incompatible ones, @@ -163,30 +162,11 @@ find . -name "*.asc" -exec gpg --no-secm Deploy the artifacts from the staging area (https://dist.apache.org/repos/dist/dev/poi/) to the release area of the dist repo: - https://dist.apache.org/repos/dist/release/poi/release/ (FINAL) - https://dist.apache.org/repos/dist/release/poi/dev/ (Beta) + https://dist.apache.org/repos/dist/release/poi/release/ -Perform a sparse checkout of the dist repo to move artifacts in the staging area to the beta or final release area -In the following example, replace FIXME3.16-beta2-RC1 or FIXME3.16-beta2 with the version you are releasing +Perform a sparse checkout of the dist repo to move artifacts in the staging area to the release area +In the following example, replace FIXME3.16-RC1 or FIXME3.16 with the version you are releasing -For a beta release: -{code:sh} -svn checkout https://dist.apache.org/repos/dist/ --depth immediates -svn update --set-depth immediates dist/dev/poi/ -svn update --set-depth infinity dist/dev/poi/FIXME3.16-beta2-RC1/ -svn update --set-depth infinity dist/release/poi/ -svn rm dist/release/poi/dev/src/* dist/release/poi/dev/bin/* dist/release/poi/dev/maven/ -svn mv dist/dev/poi/FIXME3.16-beta2-RC1/poi-src-* dist/release/poi/dev/src/ -svn mv dist/dev/poi/FIXME3.16-beta2-RC1/poi-bin-* dist/release/poi/dev/bin/ -svn mv dist/dev/poi/FIXME3.16-beta2-RC1/maven/ dist/release/poi/dev/ -svn mv dist/dev/poi/FIXME3.16-beta2-RC1/RELEASE-NOTES.txt dist/release/poi/dev/RELEASE-NOTES-FIXME3.16-beta2.txt -# regular (non-svn) copy so that these text files retain their revision history -cp dist/release/poi/dev/RELEASE-NOTES-FIXME3.16-beta2.txt dist/release/poi/dev/RELEASE-NOTES.txt -cp dist/dev/poi/KEYS dist/release/poi/KEYS -svn ci dist/ -m "deploy 3.16-beta2 release artifacts from staging area" -{code} - -For a final release: {code:sh} svn checkout https://dist.apache.org/repos/dist/ --depth immediates svn update --set-depth immediates dist/dev/poi/ @@ -208,7 +188,7 @@ And remove any old releases from the sta Staging area: https://dist.apache.org/repos/dist/dev/poi/ {code:sh} -svn rm https://dist.apache.org/repos/dist/dev/poi/FIXME3.16-beta1-RC1 -m "remove old release from staging area" +svn rm https://dist.apache.org/repos/dist/dev/poi/FIXME3.16-RC1 -m "remove old release from staging area" {code:sh} You should get an email from the Apache Reporter Service (no-reply@reporter.apache.org) @@ -242,12 +222,12 @@ edit pom.xml and add the release artefac org.apache.poi poi-ooxml - 3.11-beta1 + 4.0.0 org.apache.poi poi-scratchpad - 3.11-beta1 + 4.0.0 {code} @@ -270,21 +250,25 @@ the jars could be downloaded fine. 4. Edit the website homepage and list the new release there. https://poi.apache.org/index.html https://poi.apache.org/changes.html - If a final release: - remove older final releases and all beta releases. - If a beta release: - keep the last final release, and replace any other beta releases. + remove older releases. 5. Edit the website download page, and list the new release there. This should reference the checksums, so take care when updating https://poi.apache.org/download.html {code:sh} # 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" +ant update-download -Dversion.id="3.15" -Dreltype=dev -Drel_date="02 July 2016" -Dfile_date="20160702" {code} And copy the contents from the output, download-snipplet.xml, to the appropriate section in poi/site/src/documentation/content/xdocs/download.xml. + Additionally there are some further files to be updated ... check the results and commit them: +{code:sh} +# the following updates various references from the previous release to the current release +ant release-finish -Dfile_date="20160702" +{code} + + 6. Build site using a recent version of Java 1.8 Commit the site changes to svn, and publish live @@ -293,10 +277,10 @@ ant update-download -Dversion.id="3.15-b 8. Send announcements: From: your @apache.org e-mail address To: user@poi.apache.org, dev@poi.apache.org, general@poi.apache.org, and announce@apache.org -Subject: [ANNOUNCE] Apache POI FIXME3.16-beta2 released +Subject: [ANNOUNCE] Apache POI FIXME3.16 released Body: """ -The Apache POI PMC is pleased to announce the release of Apache POI FIXME3.16 beta 2. +The Apache POI PMC is pleased to announce the release of Apache POI FIXME3.16. Apache POI is a Java library for reading and writing Microsoft Office files. @@ -307,21 +291,20 @@ Thank you to all our contributors for ma On behalf of the Apache POI PMC, Your Name -[1] Release notes: https://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES-FIXME3.16-beta1.txt -[2] Changelog: https://poi.apache.org/changes.html#FIXME3.16-beta2 +[1] Release notes: https://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES-FIXME3.16.txt +[2] Changelog: https://poi.apache.org/changes.html#FIXME3.16 """ Note, announcements should be sent from your @apache.org e-mail address. -9. If this is a final release, in Bugzilla, add a new -FINAL version and the - next -dev version. Also close the n-2 -dev version to new bugs. +9. In Bugzilla, add a new version and the next "...-dev" version. Also close the n-2 -dev version to new bugs. -10. If this is a final release, add it to the DOAP file too +10. Add the version to the DOAP file too https://svn.apache.org/repos/asf/poi/trunk/doap_POI.rdf 11. Delete directory that held RC. e.g. {code:sh} -svn delete -m "delete empty RC directory for 3.10-beta2" https://dist.apache.org/repos/dist/dev/poi/3.10-beta2-RC1 +svn delete -m "delete empty RC directory for 4.0.0" https://dist.apache.org/repos/dist/dev/poi/4.0.0-RC1 {code} Modified: poi/trunk/build.gradle URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/build.gradle (original) +++ poi/trunk/build.gradle Fri Sep 7 19:25:02 2018 @@ -91,9 +91,9 @@ subprojects { // See https://github.com/melix/japicmp-gradle-plugin apply plugin: 'me.champeau.gradle.japicmp' - version = '4.0.0-SNAPSHOT' + version = '4.0.1-SNAPSHOT' ext { - japicmpversion = '3.17' + japicmpversion = '4.0.0' } tasks.withType(JavaCompile) { Modified: poi/trunk/build.xml URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/build.xml (original) +++ poi/trunk/build.xml Fri Sep 7 19:25:02 2018 @@ -42,7 +42,7 @@ under the License. The Apache POI project Ant build. - + @@ -552,7 +552,6 @@ under the License. var rel = ("REL_"+project.getProperty("version.id")).toUpperCase().replace(/\W/g,"_"); - if (rel.search(/BETA/) == -1) rel += "_FINAL"; project.setProperty("RELEASE_TAG", rel); @@ -2545,7 +2544,6 @@ under the License. var relCurr = new String(project.getProperty("version.id")); var relNext = relCurr.replace(/[0-9]+$/, function(lastNum){ return new String(new Number(lastNum)+1); }); - if (relNext.search(/beta/i) == -1) relNext += "-beta1"; project.setProperty("rel_next", relNext); @@ -2591,7 +2589,7 @@ under the License. message="tag r${svn_version2} as ${version.id}"/> - + @@ -2605,7 +2603,7 @@ under the License. - + @@ -2656,6 +2654,45 @@ under the License. + + + + + + + + + + + + + + + var relPrev = new String(project.getProperty("version.id")) + .replace(/([0-9]+)[^0-9]*$/, function(all,lastNum){ return new String(new Number(lastNum)-1); }); + project.setProperty("rel_prev", relPrev); + var fileDateIso = new String(project.getProperty("file_date")) + .replace(/([0-9]{4})([0-9]{2})([0-9]{2})/, "$1-$2-$3"); + project.setProperty("file_date_iso", fileDateIso); + + + + + + + + + + + + + + + + + @@ -2758,9 +2795,7 @@ under the License. - - - + @@ -2793,44 +2828,44 @@ under the License.

Binary Distribution
Source Distribution Modified: poi/trunk/doap_POI.rdf URL: http://svn.apache.org/viewvc/poi/trunk/doap_POI.rdf?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/doap_POI.rdf (original) +++ poi/trunk/doap_POI.rdf Fri Sep 7 19:25:02 2018 @@ -37,6 +37,13 @@ + Apache POI 4.0.0 + 2018-09-07 + 4.0.0 + + + + Apache POI 3.17 2017-09-15 3.17 Modified: poi/trunk/osgi/build.xml URL: http://svn.apache.org/viewvc/poi/trunk/osgi/build.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/osgi/build.xml (original) +++ poi/trunk/osgi/build.xml Fri Sep 7 19:25:02 2018 @@ -26,7 +26,7 @@ under the License. - + Modified: poi/trunk/sonar/examples/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/examples/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/examples/pom.xml (original) +++ poi/trunk/sonar/examples/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-examples jar Modified: poi/trunk/sonar/excelant/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/excelant/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/excelant/pom.xml (original) +++ poi/trunk/sonar/excelant/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-excelant jar Modified: poi/trunk/sonar/main/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/main/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/main/pom.xml (original) +++ poi/trunk/sonar/main/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-main jar Modified: poi/trunk/sonar/ooxml-schema-encryption/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-schema-encryption/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/ooxml-schema-encryption/pom.xml (original) +++ poi/trunk/sonar/ooxml-schema-encryption/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT .. poi-ooxml-schema-encryption Modified: poi/trunk/sonar/ooxml-schema-security/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-schema-security/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/ooxml-schema-security/pom.xml (original) +++ poi/trunk/sonar/ooxml-schema-security/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT .. poi-ooxml-schema-security Modified: poi/trunk/sonar/ooxml-schema/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-schema/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/ooxml-schema/pom.xml (original) +++ poi/trunk/sonar/ooxml-schema/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT .. poi-ooxml-schema Modified: poi/trunk/sonar/ooxml/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/ooxml/pom.xml (original) +++ poi/trunk/sonar/ooxml/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-ooxml jar Modified: poi/trunk/sonar/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/pom.xml (original) +++ poi/trunk/sonar/pom.xml Fri Sep 7 19:25:02 2018 @@ -4,7 +4,7 @@ org.apache.poi poi-parent pom - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT Apache POI - the Java API for Microsoft Documents Maven build of Apache POI for Sonar checks http://poi.apache.org/ Modified: poi/trunk/sonar/scratchpad/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/scratchpad/pom.xml?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/sonar/scratchpad/pom.xml (original) +++ poi/trunk/sonar/scratchpad/pom.xml Fri Sep 7 19:25:02 2018 @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-scratchpad jar Modified: poi/trunk/src/examples/groovy/build.gradle URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/groovy/build.gradle?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/src/examples/groovy/build.gradle (original) +++ poi/trunk/src/examples/groovy/build.gradle Fri Sep 7 19:25:02 2018 @@ -23,8 +23,8 @@ repositories { } dependencies { compile 'org.codehaus.groovy:groovy-all:2.4.13' - compile 'org.apache.poi:poi:3.17' - compile 'org.apache.poi:poi-ooxml:3.17' + compile 'org.apache.poi:poi:4.0.0' + compile 'org.apache.poi:poi-ooxml:4.0.0' } // Our files are in the current directory Modified: poi/trunk/src/examples/scala/build.sbt URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/scala/build.sbt?rev=1840318&r1=1840317&r2=1840318&view=diff ============================================================================== --- poi/trunk/src/examples/scala/build.sbt (original) +++ poi/trunk/src/examples/scala/build.sbt Fri Sep 7 19:25:02 2018 @@ -17,7 +17,7 @@ // Add the POI core and OOXML support dependencies into your build.sbt libraryDependencies ++= Seq( - "org.apache.poi" % "poi" % "3.17", - "org.apache.poi" % "poi-ooxml" % "3.17", - "org.apache.poi" % "poi-ooxml-schemas" "3.17", + "org.apache.poi" % "poi" % "4.0.0", + "org.apache.poi" % "poi-ooxml" % "4.0.0", + "org.apache.poi" % "poi-ooxml-schemas" "4.0.0", ) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org