update 3.17 leftovers and provide a new build target to update those in the next...

remove final / beta tags, as we (try to) use semver now

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

diff --git a/build.gradle b/build.gradle
index ae379bdd4fd1c1a32980e13bd904759813845d17..7be56849f506ec395f12b624eff9d2e1a03dcdbb 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -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) {

diff --git a/build.xml b/build.xml
index 3583982de37a78dfd2432cc6e5f58b286e2b0a1d..e0f0d0df0bcdad747fc78c13bb75442e0636aed8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@ under the License.
 
     <description>The Apache POI project Ant build.</description>
 
-    <property name="version.id" value="4.0.1-beta1"/>
+    <property name="version.id" value="4.0.1-SNAPSHOT"/>
     <property name="release.rc" value="RC1"/>
 
     <property environment="env"/>
@@ -552,7 +552,6 @@ under the License.
 
         <scriptdef name="release_tag" language="javascript">
             var rel = ("REL_"+project.getProperty("version.id")).toUpperCase().replace(/\W/g,"_");
-            if (rel.search(/BETA/) == -1) rel += "_FINAL";
             project.setProperty("RELEASE_TAG", rel);
         </scriptdef>
         <release_tag/>
@@ -2545,7 +2544,6 @@ under the License.
         <scriptdef name="getnextrel" language="javascript">
             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);
         </scriptdef>
         <getnextrel/>
@@ -2591,7 +2589,7 @@ under the License.
                 message="tag r${svn_version2} as ${version.id}"/>
         </svn>
 
-        <!-- update build.xml to the next beta version -->
+        <!-- update build.xml to the next snapshot version -->
         <antcall target="-update-build.xml">
             <param name="version_id" value="${rel_next}"/>
         </antcall>
@@ -2605,7 +2603,7 @@ under the License.
             </fileset>
         </replaceregexp>
 
-        <!-- unpin documentation and commit next beta version -->
+        <!-- unpin documentation and commit next snapshot version -->
         <svn refid="svn.settings">
             <update dir="." recurse="true"/>
             <propset path="src" name="svn:externals" value="documentation https://svn.apache.org/repos/asf/poi/site/src/documentation"/>
@@ -2656,6 +2654,45 @@ under the License.
         </svn>
     </target>
 
+    <target name="release-finish" description="write the dist to the release candidate repo - needs Java7+">
+        <!--svn refid="svn.settings">
+            <update dir="." recurse="true"/>
+        </svn-->
+        <local name="rel_prev"/>
+        <local name="file_date"/>
+        <local name="file_date_iso"/>
+
+        <tstamp>
+            <!-- usually overwritten by a command line argument -->
+            <!-- for convience this is kept in the same format as in the release-prep call  -->
+            <format property="file_date" pattern="yyyyMMdd" locale="US"/>
+        </tstamp>
+
+
+        <scriptdef name="getnextrel" language="javascript">
+            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);
+        </scriptdef>
+        <getnextrel/>
+
+        <replaceregexp file="build.gradle" match="( +version += +)'[^']+'" replace="\1'${version.id}'"/>
+        <replaceregexp file="build.gradle" match="(japicmpversion += +)'[^']+'" replace="\1'${rel_prev}'"/>
+        <replaceregexp file="src/examples/groovy/build.gradle" match="( *compile 'org.apache.poi:[^0-9]+)([0-9.]+)'" replace="\1${rel_prev}'" byline="true"/>
+        <replaceregexp file="src/examples/scala/build.sbt" match='( *org.apache.poi.* ")[0-9.]+(.+)' replace="\1${rel_prev}\2" byline="true"/>
+        <replaceregexp file="osgi/build.xml" match='(name="version.id" value=")[^"]+' replace="\1${version.id}"/>
+        <replaceregexp file="doap_POI.rdf" match="&lt;release&gt;" replace="&lt;release&gt;&#10;      &lt;Version&gt;&#10;        &lt;name&gt;Apache POI ${rel_prev}&lt;/name&gt;&#10;        &lt;created&gt;${file_date_iso}&lt;/created&gt;&#10;        &lt;revision&gt;${rel_prev}&lt;/revision&gt;&#10;      &lt;/Version&gt;&#10;    &lt;/release&gt;&#10;    &lt;release&gt;"/>
+
+        <replaceregexp match="(&lt;version&gt;)[^&lt;]+" replace="\1${version.id}">
+            <fileset dir="sonar" includes="**/pom.xml"/>
+        </replaceregexp>
+    </target>
+
+
+
     <target name="-update-build.xml">
         <replaceregexp byline="true">
             <regexp pattern="(&lt;property name=&quot;version.id&quot; value=&quot;)[^&quot;]+(&quot;/>)"/>
@@ -2758,9 +2795,7 @@ under the License.
             <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="https://www.apache.org/dist/poi/${reltype}"/>
+        <property name="baseurl" value="https://www.apache.org/dist/poi/release"/>
 
         <loadChecksum property="bin-tar-sha256" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha256"/>
         <loadChecksum property="bin-tar-sha512" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha512"/>
@@ -2793,44 +2828,44 @@ under the License.
       </p>
       <section id="POI-${version.id}-bin"><title>Binary Distribution</title>
       <ul>
-        <li><a href="https://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</a>
-          (${bin-tar-size} MB, <a href="https://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.asc">signature (.asc)</a>)
+        <li><a href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz">poi-bin-${version.id}-${file_date}.tar.gz</a>
+          (${bin-tar-size} MB, <a href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz.asc">signature (.asc)</a>)
           <br/>
-          SHA256 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha256">
+          SHA256 checksum: <a href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha256">
           ${bin-tar-sha256}</a>
           <br/>
-          SHA512 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha512">
+          SHA512 checksum: <a href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha512">
           ${bin-tar-sha512}</a>
         </li>
-        <li><a href="https://www.apache.org/dyn/closer.lua/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip">poi-bin-${version.id}-${file_date}.zip</a>
-          (${bin-zip-size} MB, <a href="https://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.asc">signature (.asc)</a>)
+        <li><a href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-${version.id}-${file_date}.zip">poi-bin-${version.id}-${file_date}.zip</a>
+          (${bin-zip-size} MB, <a href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.zip.asc">signature (.asc)</a>)
           <br/>
-          SHA256 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.sha256">
+          SHA256 checksum: <a href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.zip.sha256">
           ${bin-zip-sha256}</a>
           <br/>
-          SHA512 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.sha512">
+          SHA512 checksum: <a href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.zip.sha512">
           ${bin-zip-sha512}</a>
         </li>
       </ul>
       </section>
       <section id="POI-${version.id}-src"><title>Source Distribution</title>
       <ul>
-        <li><a href="https://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</a>
-          (${src-tar-size} MB, <a href="https://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.asc">signature (.asc)</a>)
+        <li><a href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz">poi-src-${version.id}-${file_date}.tar.gz</a>
+          (${src-tar-size} MB, <a href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz.asc">signature (.asc)</a>)
           <br/>
-          SHA256 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.sha256">
+          SHA256 checksum: <a href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz.sha256">
           ${src-tar-sha256}</a>
           <br/>
-          SHA512 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.sha512">
+          SHA512 checksum: <a href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz.sha512">
           ${src-tar-sha512}</a>
         </li>
-        <li><a href="https://www.apache.org/dyn/closer.lua/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip">poi-src-${version.id}-${file_date}.zip</a>
-          (${src-zip-size} MB, <a href="https://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.asc">signature (.asc)</a>)
+        <li><a href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-${version.id}-${file_date}.zip">poi-src-${version.id}-${file_date}.zip</a>
+          (${src-zip-size} MB, <a href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.zip.asc">signature (.asc)</a>)
           <br/>
-          SHA256 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.sha256">
+          SHA256 checksum: <a href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.zip.sha256">
           ${src-zip-sha256}</a>
           <br/>
-          SHA512 checksum: <a href="https://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.sha512">
+          SHA512 checksum: <a href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.zip.sha512">
           ${src-zip-sha512}</a>
         </li>
       </ul>

diff --git a/doap_POI.rdf b/doap_POI.rdf
index 3ef8383eeda0f4edd41c61ebc7d65a6f68aa6628..f1d21a8ceeee6ec28d36568b5b33a20817a90827 100644 (file)
--- a/doap_POI.rdf
+++ b/doap_POI.rdf
@@ -35,6 +35,13 @@
     <programming-language>Java</programming-language>
     <category rdf:resource="https://projects.apache.org/category/content" />
     <category rdf:resource="https://projects.apache.org/category/library" />
+    <release>
+      <Version>
+        <name>Apache POI 4.0.0</name>
+        <created>2018-09-07</created>
+        <revision>4.0.0</revision>
+      </Version>
+    </release>
     <release>
       <Version>
         <name>Apache POI 3.17</name>

diff --git a/osgi/build.xml b/osgi/build.xml
index aa195a5e68ec9bf30b8e00f3bbeb7c2c13826169..1ffbe594f33faf9eb1e29f9e82699dd2d01a2bea 100644 (file)
--- a/osgi/build.xml
+++ b/osgi/build.xml
@@ -26,7 +26,7 @@ under the License.
 
     <!-- TODO Import these from the parent build file -->
     <property name="repository.m2" value="http://repo1.maven.org"/>
-    <property name="version.id" value="4.0.0-SNAPSHOT"/>
+    <property name="version.id" value="4.0.1-SNAPSHOT"/>
     <property name="dist.dir" value="build/dist"/>
 
     <!-- jars in the /lib directory, see the fetch-bundle-jars target-->

diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 3b5190b316c096b18b0c975d532af30d590e72c4..441dfad7a9aeac104c2aa1680d9249b63ea5a989 100644 (file)
--- a/sonar/examples/pom.xml
+++ b/sonar/examples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-examples</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index ec6c0b266dfb31c20f8f1709c2ffe94c93c813a7..b9814037f3b79905ffa62e5d8f92f3c563b4c5f5 100644 (file)
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-excelant</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index ef3e0905fdfca3be05cce6d21fd9341651d57214..d188c14f560ba8e1e2f4e3d14f47558d5527f5ea 100644 (file)
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-main</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml
index e10597207997c7c502926ca28dacbb7a0c83c698..5b2489a7beb3e735d94660af81d2972934d55ba4 100644 (file)
--- a/sonar/ooxml-schema-encryption/pom.xml
+++ b/sonar/ooxml-schema-encryption/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-encryption</artifactId>

diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml
index c4e5d098eb1e96deded57c567b8985aba57e122b..d872d9b59a77788d81c7aa8d122c1f4d9dfebad3 100644 (file)
--- a/sonar/ooxml-schema-security/pom.xml
+++ b/sonar/ooxml-schema-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-security</artifactId>

diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index 435bb5100edcfc74f6cac91c95e32e8b9eaf9cdc..92c2e264af44604607c506e156557b0216b6ae55 100644 (file)
--- a/sonar/ooxml-schema/pom.xml
+++ b/sonar/ooxml-schema/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema</artifactId>

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 46ce80793fc4483253f0ef15955deadb5eb1347f..e4685680727b506f08b9bdae3958633204a2729c 100644 (file)
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-ooxml</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/pom.xml b/sonar/pom.xml
index 3060b4c8952b890b554947d59b791c79d119ed53..9a184a138a10452aeb709d46db81486c77a99dae 100644 (file)
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.apache.poi</groupId>
     <artifactId>poi-parent</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.1-beta1-SNAPSHOT</version>
+    <version>4.0.1-SNAPSHOT</version>
     <name>Apache POI - the Java API for Microsoft Documents</name>
     <description>Maven build of Apache POI for Sonar checks</description>
     <url>http://poi.apache.org/</url>

diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index 0c930ec375f399dc76c0f8bb4f562e8884d7f207..e7ef7303a49b02d061d1618ee0afa50cf6fdae42 100644 (file)
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>4.0.1-beta1-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-scratchpad</artifactId>
     <packaging>jar</packaging>

diff --git a/src/examples/groovy/build.gradle b/src/examples/groovy/build.gradle
index 8ca896c75b79bc1797f4b7cdd921d9b23c533d33..d6c3eb9bd6b23f0340f323bc373b113df3a83ace 100644 (file)
--- a/src/examples/groovy/build.gradle
+++ b/src/examples/groovy/build.gradle
@@ -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

diff --git a/src/examples/scala/build.sbt b/src/examples/scala/build.sbt
index f2e51f58fac6550984af223dc74cb32636d8f3c8..ed267dbccc6ea2b36143e8b32ad728e4194eb887 100644 (file)
--- a/src/examples/scala/build.sbt
+++ b/src/examples/scala/build.sbt
@@ -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",
 )