mirror of https://github.com/apache/poi.git
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 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1840318 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker
parent
8726e046a0
commit
ea65344fd1
|
|
@ -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) {
|
||||
|
|
|
|||
83
build.xml
83
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="<release>" replace="<release> <Version> <name>Apache POI ${rel_prev}</name> <created>${file_date_iso}</created> <revision>${rel_prev}</revision> </Version> </release> <release>"/>
|
||||
|
||||
<replaceregexp match="(<version>)[^<]+" replace="\1${version.id}">
|
||||
<fileset dir="sonar" includes="**/pom.xml"/>
|
||||
</replaceregexp>
|
||||
</target>
|
||||
|
||||
|
||||
|
||||
<target name="-update-build.xml">
|
||||
<replaceregexp byline="true">
|
||||
<regexp pattern="(<property name="version.id" value=")[^"]+("/>)"/>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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-->
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue