Bump versions to 5.0.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1885616 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.gradle b/build.gradle
index 1fbd71d..50caebf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,13 +108,13 @@
// See https://github.com/melix/japicmp-gradle-plugin
apply plugin: 'me.champeau.gradle.japicmp'
- version = '5.0.0-SNAPSHOT'
+ version = '5.0.1-SNAPSHOT'
ext {
bouncyCastleVersion = '1.67'
commonsCodecVersion = '1.15'
commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1'
- japicmpversion = '4.1.2'
+ japicmpversion = '5.0.0'
junitVersion = '5.7.0'
mockitoVersion = '3.6.0'
hamcrestVersion = '2.2'
diff --git a/build.xml b/build.xml
index e606f9f..7fd9124 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@
<description>The Apache POI project Ant build.</description>
- <property name="version.id" value="5.0.1"/>
+ <property name="version.id" value="5.0.1-SNAPSHOT"/>
<property name="release.rc" value="RC1"/>
<property environment="env"/>
@@ -2954,7 +2954,7 @@
<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="osgi/pom.xml" match="version>${rel_prev}[^<]+" replace="version>${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}">
diff --git a/doap_POI.rdf b/doap_POI.rdf
index 2178f99..b2324ca 100644
--- a/doap_POI.rdf
+++ b/doap_POI.rdf
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
@@ -12,9 +12,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,6 +37,13 @@
<category rdf:resource="https://projects.apache.org/category/library" />
<release>
<Version>
+ <name>Apache POI 5.0.0</name>
+ <created>2021-01-17</created>
+ <revision>5.0.0</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
<name>Apache POI 4.1.2</name>
<created>2020-02-14</created>
<revision>4.1.2</revision>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index ce11df9..4b97d09 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-bundle</artifactId>
<packaging>bundle</packaging>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
<name>Apache POI OSGi bundle</name>
<properties>
diff --git a/src/examples/groovy/build.gradle b/src/examples/groovy/build.gradle
index 0abc257..79bccbc 100644
--- a/src/examples/groovy/build.gradle
+++ b/src/examples/groovy/build.gradle
@@ -23,8 +23,8 @@
}
dependencies {
compile 'org.codehaus.groovy:groovy-all:2.4.13'
- compile 'org.apache.poi:poi:4.1.2'
- compile 'org.apache.poi:poi-ooxml:4.1.2'
+ compile 'org.apache.poi:poi:5.0.0'
+ compile 'org.apache.poi:poi-ooxml:5.0.0'
}
// Our files are in the current directory
diff --git a/src/excelant/poi-ant-contrib/NextRelease.java b/src/excelant/poi-ant-contrib/NextRelease.java
index bd21b0e..c0b6b3d 100644
--- a/src/excelant/poi-ant-contrib/NextRelease.java
+++ b/src/excelant/poi-ant-contrib/NextRelease.java
@@ -21,6 +21,7 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+@SuppressWarnings("unused")
public class NextRelease extends Task {
private final Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+).*");
private String property;
@@ -30,7 +31,7 @@
this.property = property;
}
- public void increment(int increment) {
+ public void setIncrement(int increment) {
this.increment = increment;
}
@@ -38,7 +39,8 @@
Project project = getProject();
String relCurr = project.getProperty("version.id");
Matcher m = pattern.matcher(relCurr);
- m.find();
- project.setProperty(property, m.group(1)+"."+m.group(2)+"."+(Integer.parseInt(m.group(3))+increment));
+ if (m.find()) {
+ project.setProperty(property, m.group(1) + "." + m.group(2) + "." + (Integer.parseInt(m.group(3)) + increment));
+ }
}
}
