Bladeren bron

Bump versions to 5.0.1-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1885616 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_5_1_0
Andreas Beeker 3 jaren geleden
bovenliggende
commit
fd29c485ef
6 gewijzigde bestanden met toevoegingen van 23 en 14 verwijderingen
  1. 2
    2
      build.gradle
  2. 2
    2
      build.xml
  3. 11
    4
      doap_POI.rdf
  4. 1
    1
      osgi/pom.xml
  5. 2
    2
      src/examples/groovy/build.gradle
  6. 5
    3
      src/excelant/poi-ant-contrib/NextRelease.java

+ 2
- 2
build.gradle Bestand weergeven

@@ -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'

+ 2
- 2
build.xml Bestand weergeven

@@ -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}[^&lt;]+" replace="version>${version.id}"/>
<replaceregexp file="doap_POI.rdf" match="&lt;release&gt;" replace="&lt;release&gt;&#10; &lt;Version&gt;&#10; &lt;name&gt;Apache POI ${rel_prev}&lt;/name&gt;&#10; &lt;created&gt;${file_date_iso}&lt;/created&gt;&#10; &lt;revision&gt;${rel_prev}&lt;/revision&gt;&#10; &lt;/Version&gt;&#10; &lt;/release&gt;&#10; &lt;release&gt;"/>

<replaceregexp match="(&lt;version&gt;)[^&lt;]+" replace="\1${version.id}">

+ 11
- 4
doap_POI.rdf Bestand weergeven

@@ -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.
@@ -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 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>

+ 1
- 1
osgi/pom.xml Bestand weergeven

@@ -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>

+ 2
- 2
src/examples/groovy/build.gradle Bestand weergeven

@@ -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

+ 5
- 3
src/excelant/poi-ant-contrib/NextRelease.java Bestand weergeven

@@ -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));
}
}
}

Laden…
Annuleren
Opslaan