Set version to 4.1.1-SNAPSHOT everywhere to not mix intermediate packages with the future final ones, add a helper target to set the version from the build.xml everywhere

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1857070 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2019-04-07 07:17:58 +00:00
parent 56c0209780
commit 836b9abdc6
2 changed files with 27 additions and 3 deletions

View File

@ -91,7 +91,7 @@ subprojects {
// See https://github.com/melix/japicmp-gradle-plugin
apply plugin: 'me.champeau.gradle.japicmp'
version = '4.1.0-SNAPSHOT'
version = '4.1.1-SNAPSHOT'
ext {
japicmpversion = '4.0.0'
}

View File

@ -42,7 +42,7 @@ under the License.
<description>The Apache POI project Ant build.</description>
<property name="version.id" value="4.1.1"/>
<property name="version.id" value="4.1.1-SNAPSHOT"/>
<property name="release.rc" value="RC1"/>
<property environment="env"/>
@ -2133,7 +2133,7 @@ under the License.
<!-- continuous integration targets -->
<target name="jenkins"
depends="compile, test-all, jar, javadocs, assemble, findbugs, release-notes, rat-check, forbidden-apis-check, integration-test-jar, help, fetch-svn-jars, maven-poms, maventask, mvn-install"
depends="replaceVersion, compile, test-all, jar, javadocs, assemble, findbugs, release-notes, rat-check, forbidden-apis-check, integration-test-jar, help, fetch-svn-jars, maven-poms, maventask, mvn-install"
description="Target run by Jenkins on a continuous basis. Builds and tests POI, generates artifacts and documentation, and searches for problems."/>
<target name="maventask" depends="init">
@ -2854,4 +2854,28 @@ under the License.
<target name="test-env" description="tests if ant is available on the jenkins slave">
<echo>Using Ant: ${ant.version} from ${ant.home}</echo>
</target>
<target name="replaceVersion" description="Apply the version from build.xml in all other places">
<replaceregexp
match="(packaging>\n\s*&lt;version>)[0-9.]+(?:-SNAPSHOT)?"
replace="\1${version.id}">
<fileset dir="sonar">
<include name="**/pom.xml"/>
</fileset>
</replaceregexp>
<replaceregexp
match="(poi-parent&lt;/artifactId>\n\s*&lt;version>)[0-9.]+(?:-SNAPSHOT)?"
replace="\1${version.id}">
<fileset dir="sonar">
<include name="**/pom.xml"/>
</fileset>
</replaceregexp>
<replaceregexp
match=" version = '[0-9.]+(?:-SNAPSHOT)?'"
replace=" version = '${version.id}'">
<fileset dir=".">
<include name="build.gradle"/>
</fileset>
</replaceregexp>
</target>
</project>