From: Dominik Stadler <centic@apache.org>
Date: Sat, 26 Oct 2019 05:26:47 +0000 (+0000)
Subject: Sync version in more places and use -SNAPSHOT everywhere during development
X-Git-Tag: REL_4_1_2~163
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=04e85aa22d57e76c8d50c89db5fa7dedcb14b092;p=poi.git

Sync version in more places and use -SNAPSHOT everywhere during development

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1868981 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.gradle b/build.gradle
index 1123e4790f..8c671456ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,7 +91,7 @@ subprojects {
     // See https://github.com/melix/japicmp-gradle-plugin 
     apply plugin: 'me.champeau.gradle.japicmp'
         
-    version = '4.1.1-SNAPSHOT'
+    version = '4.1.2-SNAPSHOT'
     ext {
         japicmpversion = '4.1.0'
     }
diff --git a/build.xml b/build.xml
index 5bcaa24568..1a6c761bfa 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@ under the License.
 
     <description>The Apache POI project Ant build.</description>
 
-    <property name="version.id" value="4.1.2"/>
+    <property name="version.id" value="4.1.2-SNAPSHOT"/>
     <property name="release.rc" value="RC1"/>
 
     <property environment="env"/>
@@ -2870,6 +2870,13 @@ under the License.
 			<fileset dir=".">
 				<include name="build.gradle"/>
 			</fileset>
+        </replaceregexp>
+		<replaceregexp
+               match="version.id&quot; value=&quot;[0-9.]+(?:-SNAPSHOT)?&quot;/>"
+               replace="version.id&quot; value=&quot;${version.id}&quot;/>">
+			<fileset dir=".">
+				<include name="osgi/build.xml"/>
+			</fileset>
         </replaceregexp>
 	</target>
 </project>
diff --git a/osgi/build.xml b/osgi/build.xml
index d6e8c3d833..24a068870a 100644
--- a/osgi/build.xml
+++ b/osgi/build.xml
@@ -26,7 +26,7 @@ under the License.
 
     <!-- TODO Import these from the parent build file -->
     <property name="repository.m2" value="http://repo1.maven.org"/>
-    <property name="version.id" value="4.1.1-SNAPSHOT"/>
+    <property name="version.id" value="4.1.2-SNAPSHOT"/>
     <property name="dist.dir" value="build/dist"/>
 
     <!-- jars in the /lib directory, see the fetch-bundle-jars target-->