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 1123e4790f8a276258b01e3c3574ae6000279c45..8c671456ec2218eb5bff6e5466be24f6c36989f8 100644 (file)
--- 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 5bcaa245684dcebde6084d9a18ef7c17919cc07d..1a6c761bfacdaed6166ab60665bdbc92e7d3778f 100644 (file)
--- 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 d6e8c3d833365b4a61f4d1e578cf5f44c87546c2..24a068870a9160fe3584b79dd19b0673ae09f576 100644 (file)
--- 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-->