diff --git a/build.gradle b/build.gradle index ae379bdd4f..7be56849f5 100644 --- 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 3583982de3..e0f0d0df0b 100644 --- a/build.xml +++ b/build.xml @@ -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 diff --git a/doap_POI.rdf b/doap_POI.rdf index 3ef8383eed..f1d21a8cee 100644 --- a/doap_POI.rdf +++ b/doap_POI.rdf @@ -35,6 +35,13 @@ Java + + + Apache POI 4.0.0 + 2018-09-07 + 4.0.0 + + Apache POI 3.17 diff --git a/osgi/build.xml b/osgi/build.xml index aa195a5e68..1ffbe594f3 100644 --- a/osgi/build.xml +++ b/osgi/build.xml @@ -26,7 +26,7 @@ under the License. - + diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml index 3b5190b316..441dfad7a9 100644 --- a/sonar/examples/pom.xml +++ b/sonar/examples/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-examples jar diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml index ec6c0b266d..b9814037f3 100644 --- a/sonar/excelant/pom.xml +++ b/sonar/excelant/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-excelant jar diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml index ef3e0905fd..d188c14f56 100644 --- a/sonar/main/pom.xml +++ b/sonar/main/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-main jar diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml index e105972079..5b2489a7be 100644 --- a/sonar/ooxml-schema-encryption/pom.xml +++ b/sonar/ooxml-schema-encryption/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT .. poi-ooxml-schema-encryption diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml index c4e5d098eb..d872d9b59a 100644 --- a/sonar/ooxml-schema-security/pom.xml +++ b/sonar/ooxml-schema-security/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT .. poi-ooxml-schema-security diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml index 435bb5100e..92c2e264af 100644 --- a/sonar/ooxml-schema/pom.xml +++ b/sonar/ooxml-schema/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT .. poi-ooxml-schema diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 46ce80793f..e468568072 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-ooxml jar diff --git a/sonar/pom.xml b/sonar/pom.xml index 3060b4c895..9a184a138a 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -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/ diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml index 0c930ec375..e7ef7303a4 100644 --- a/sonar/scratchpad/pom.xml +++ b/sonar/scratchpad/pom.xml @@ -6,7 +6,7 @@ org.apache.poi poi-parent - 4.0.1-beta1-SNAPSHOT + 4.0.1-SNAPSHOT poi-scratchpad jar diff --git a/src/examples/groovy/build.gradle b/src/examples/groovy/build.gradle index 8ca896c75b..d6c3eb9bd6 100644 --- 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 f2e51f58fa..ed267dbccc 100644 --- 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", )