diff options
author | Andreas Beeker <kiwiwings@apache.org> | 2020-02-13 23:26:54 +0000 |
---|---|---|
committer | Andreas Beeker <kiwiwings@apache.org> | 2020-02-13 23:26:54 +0000 |
commit | e9c5c2b90e59aa206b30eb968fab26357d9bd519 (patch) | |
tree | e88702ee3a4913569957a76c0a9e7d1f6aa0ff7f | |
parent | 75c45cfdf4256419b551cdf93d8c259288b57858 (diff) | |
download | poi-e9c5c2b90e59aa206b30eb968fab26357d9bd519.tar.gz poi-e9c5c2b90e59aa206b30eb968fab26357d9bd519.zip |
update references to 4.1.2
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1873995 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | build.gradle | 20 | ||||
-rw-r--r-- | doap_POI.rdf | 7 | ||||
-rw-r--r-- | osgi/build.xml | 4 | ||||
-rw-r--r-- | src/examples/groovy/build.gradle | 4 | ||||
-rw-r--r-- | src/examples/scala/build.sbt | 6 |
5 files changed, 24 insertions, 17 deletions
diff --git a/build.gradle b/build.gradle index 5c9487d40b..738da0bd29 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ wrapper.finalizedBy adjustWrapperPropertiesFile /** -Define properties for all projects, including this one +Define properties for all projects, including this one */ allprojects { @@ -87,12 +87,12 @@ subprojects { apply plugin: 'java' apply plugin: 'jacoco' - // See https://github.com/melix/japicmp-gradle-plugin + // See https://github.com/melix/japicmp-gradle-plugin apply plugin: 'me.champeau.gradle.japicmp' - - version = '4.1.2-SNAPSHOT' + + version = '4.1.3-SNAPSHOT' ext { - japicmpversion = '4.1.0' + japicmpversion = '4.1.2' } tasks.withType(JavaCompile) { @@ -131,15 +131,15 @@ subprojects { // Specifying the local via system properties did not work, so we set them this way jvmArgs '-Duser.language=en -Duser.country=US' - + // show standard out and standard error of the test JVM(s) on the console //testLogging.showStandardStreams = true // http://forums.gradle.org/gradle/topics/jacoco_related_failure_in_multiproject_build systemProperties['user.dir'] = workingDir - + systemProperties['POI.testdata.path'] = '../../test-data' - + // this is necessary for JDK 9+ to keep formatting dates the same way as in previous JDK-versions systemProperties['java.locale.providers'] = 'JRE,CLDR' } @@ -147,7 +147,7 @@ subprojects { jacoco { toolVersion = '0.8.5' } - + // ensure the build-dir exists projectDir.mkdirs() @@ -217,7 +217,7 @@ project('main') { } project('ooxml') { - + sourceSets.main.java.srcDirs = ['../../src/ooxml/java'] sourceSets.main.resources.srcDirs = ['../../src/ooxml/resources', '../../src/resources/ooxml'] sourceSets.test.java.srcDirs = ['../../src/ooxml/testcases'] diff --git a/doap_POI.rdf b/doap_POI.rdf index 79bbd86bb7..2178f992e3 100644 --- a/doap_POI.rdf +++ b/doap_POI.rdf @@ -37,6 +37,13 @@ <category rdf:resource="https://projects.apache.org/category/library" /> <release> <Version> + <name>Apache POI 4.1.2</name> + <created>2020-02-14</created> + <revision>4.1.2</revision> + </Version> + </release> + <release> + <Version> <name>Apache POI 4.1.1</name> <created>2019-10-20</created> <revision>4.1.1</revision> diff --git a/osgi/build.xml b/osgi/build.xml index 317672257d..bce1434f92 100644 --- a/osgi/build.xml +++ b/osgi/build.xml @@ -19,14 +19,14 @@ under the License. --> <!-- POI OSGi Bundle System --> -<project name="POI OSGi Bundle" default="bundle" basedir=".." xmlns:mvn="antlib:org.apache.maven.artifact.ant"> +<project name="POI OSGi Bundle" default="bundle" basedir=".."> <description>The Apache POI OSGi Bundle System.</description> <property name="bundle.lib" location="osgi/lib"/> <!-- TODO Import these from the parent build file --> <property name="repository.m2" value="https://repo1.maven.org"/> - <property name="version.id" value="4.1.2-SNAPSHOT"/> + <property name="version.id" value="4.1.3-SNAPSHOT"/> <property name="dist.dir" value="build/dist"/> <!-- jars in the /lib directory, see the fetch-bundle-jars target--> diff --git a/src/examples/groovy/build.gradle b/src/examples/groovy/build.gradle index b7047e3bd5..0abc2578e9 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:4.1.0' - compile 'org.apache.poi:poi-ooxml:4.1.0' + compile 'org.apache.poi:poi:4.1.2' + compile 'org.apache.poi:poi-ooxml:4.1.2' } // Our files are in the current directory diff --git a/src/examples/scala/build.sbt b/src/examples/scala/build.sbt index d290595161..a9b3ce45c1 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" % "4.1.0", - "org.apache.poi" % "poi-ooxml" % "4.1.0", - "org.apache.poi" % "poi-ooxml-schemas" "4.1.0", + "org.apache.poi" % "poi" % "4.1.2", + "org.apache.poi" % "poi-ooxml" % "4.1.2", + "org.apache.poi" % "poi-ooxml-schemas" "4.1.2", ) |