You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/01/17 18:24:31 UTC
svn commit: r1885616 - in /poi/trunk: build.gradle build.xml doap_POI.rdf
osgi/pom.xml src/examples/groovy/build.gradle
src/excelant/poi-ant-contrib/NextRelease.java
Author: kiwiwings
Date: Sun Jan 17 18:24:31 2021
New Revision: 1885616
URL: http://svn.apache.org/viewvc?rev=1885616&view=rev
Log:
Bump versions to 5.0.1-SNAPSHOT
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/doap_POI.rdf
poi/trunk/osgi/pom.xml
poi/trunk/src/examples/groovy/build.gradle
poi/trunk/src/excelant/poi-ant-contrib/NextRelease.java
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1885616&r1=1885615&r2=1885616&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Jan 17 18:24:31 2021
@@ -108,13 +108,13 @@ subprojects {
// 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'
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1885616&r1=1885615&r2=1885616&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Jan 17 18:24:31 2021
@@ -42,7 +42,7 @@ under the License.
<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 @@ under the License.
<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}">
Modified: poi/trunk/doap_POI.rdf
URL: http://svn.apache.org/viewvc/poi/trunk/doap_POI.rdf?rev=1885616&r1=1885615&r2=1885616&view=diff
==============================================================================
--- poi/trunk/doap_POI.rdf (original)
+++ poi/trunk/doap_POI.rdf Sun Jan 17 18:24:31 2021
@@ -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>
Modified: poi/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/osgi/pom.xml?rev=1885616&r1=1885615&r2=1885616&view=diff
==============================================================================
--- poi/trunk/osgi/pom.xml (original)
+++ poi/trunk/osgi/pom.xml Sun Jan 17 18:24:31 2021
@@ -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>
Modified: poi/trunk/src/examples/groovy/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/groovy/build.gradle?rev=1885616&r1=1885615&r2=1885616&view=diff
==============================================================================
--- poi/trunk/src/examples/groovy/build.gradle (original)
+++ poi/trunk/src/examples/groovy/build.gradle Sun Jan 17 18:24:31 2021
@@ -23,8 +23,8 @@ repositories {
}
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
Modified: poi/trunk/src/excelant/poi-ant-contrib/NextRelease.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/excelant/poi-ant-contrib/NextRelease.java?rev=1885616&r1=1885615&r2=1885616&view=diff
==============================================================================
--- poi/trunk/src/excelant/poi-ant-contrib/NextRelease.java (original)
+++ poi/trunk/src/excelant/poi-ant-contrib/NextRelease.java Sun Jan 17 18:24:31 2021
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
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 @@ public class NextRelease extends Task {
this.property = property;
}
- public void increment(int increment) {
+ public void setIncrement(int increment) {
this.increment = increment;
}
@@ -38,7 +39,8 @@ public class NextRelease extends Task {
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));
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org