Author: centic
Date: Sun Apr 7 07:17:58 2019
New Revision: 1857070
URL: http://svn.apache.org/viewvc?rev=1857070&view=rev
Log:
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
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1857070&r1=1857069&r2=1857070&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Apr 7 07:17:58 2019
@@ -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'
}
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1857070&r1=1857069&r2=1857070&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Apr 7 07:17:58 2019
@@ -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*<version>)[0-9.]+(?:-SNAPSHOT)?"
+ replace="\1${version.id}">
+ <fileset dir="sonar">
+ <include name="**/pom.xml"/>
+ </fileset>
+ </replaceregexp>
+ <replaceregexp
+
match="(poi-parent</artifactId>\n\s*<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
