diff options
| author | David North <dnorth@apache.org> | 2016-08-21 21:43:38 +0000 |
|---|---|---|
| committer | David North <dnorth@apache.org> | 2016-08-21 21:43:38 +0000 |
| commit | a79189a8cdcc728243f8a4a2b9dc45927ba3786c (patch) | |
| tree | dbf70fa6382f26b024beff3241f91b7906d86161 | |
| parent | 88f785780a9d43232d40f4b2aab91f3d1860434d (diff) | |
| download | poi-a79189a8cdcc728243f8a4a2b9dc45927ba3786c.tar.gz poi-a79189a8cdcc728243f8a4a2b9dc45927ba3786c.zip | |
Svn commit via calling the binary. Doing it via ant fails every single time for me on two different environments with:
svn: E200007: Commit failed (details follow): svn: E200007: CHECKOUT can only be performed on a version resource [at this time].
more investigation required.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1757089 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.xml | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -2390,17 +2390,19 @@ under the License. <!-- can't combine updating and pinning of the documentation ... so we need two commits --> <!-- (revision)properties can't be set and read within one svn block --> <echo message="updating build.xml and status.xml"/> + <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'release prepare for ${version.id} - updating build.xml and status.xml' build.xml src/documentation/content/xdocs/status.xml"/> <svn refid="svn.settings"> - <commit message="release prepare for ${version.id} - updating build.xml and status.xml" recurse="false"> + <!--<commit message="release prepare for ${version.id} - updating build.xml and status.xml" recurse="false"> <fileset dir="." includes="build.xml,src/documentation/content/xdocs/status.xml"/> - </commit> + </commit>--> <update dir="." recurse="true"/> <status path="." revisionProperty="svn_version1"/> </svn> <echo message="pin documentation - release ${svn_version1}"/> + <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'release prepare for ${version.id} - pin documentation' src"/> <svn refid="svn.settings"> <propset path="src" name="svn:externals" value="documentation -r${svn_version1} https://svn.apache.org/repos/asf/poi/site/src/documentation"/> - <commit message="release prepare for ${version.id} - pin documentation" dir="src" recurse="false"/> +<!-- <commit message="release prepare for ${version.id} - pin documentation" dir="src" recurse="false"/>--> <update dir="." recurse="true"/> <status path="." revisionProperty="svn_version2"/> </svn> @@ -2430,12 +2432,13 @@ under the License. <svn refid="svn.settings"> <update dir="." recurse="true"/> <propset path="src" name="svn:externals" value="documentation https://svn.apache.org/repos/asf/poi/site/src/documentation"/> - <commit message="prepare for ${rel_next}" recurse="false"> + <!--<commit message="prepare for ${rel_next}" recurse="false"> <fileset dir="." includes="build.xml"/> <fileset dir="sonar" includes="**/pom.xml"/> <dirset dir="src"/> - </commit> + </commit>--> </svn> + <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'prepare for ${rel_next}' build.xml sonar src"/> <mkdir dir="build/release"/> |