[jmeter] 02/02: Revert "Don't call initSvn in ant run as we don't have subversion anymore."

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit b11e8b2ccd9859042c6a9fd164d96ea6045d2584
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Jul 14 14:55:43 2019 +0200

    Revert "Don't call initSvn in ant run as we don't have subversion anymore."
    
    This reverts commit 6a5ad8e59d0141b6cef0f97c394d5d468780d59b.
    
    We need the version to be initialized for the nightly builds. As init-svnVersion
    will not work on git, we have to add -Ddisable-svnCheck=true to the nightly
    build workers and rely.
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 135d132..fcb52f3 100644
--- a/build.xml
+++ b/build.xml
@@ -1639,7 +1639,7 @@ run JMeter unless all the JMeter jars are added.
     </target>
     <target
         name="nightly"
-        depends="ant-version,nightly-setup,install,docs-printable,docs-api,test,_distribution"
+        depends="ant-version,nightly-setup,init-svnVersion,install,docs-printable,docs-api,test,_distribution"
         description="Build JMeter for nightly distribution (include docs)"/>
 
     <target name="_eolcheck">
@@ -3926,7 +3926,7 @@ run JMeter unless all the JMeter jars are added.
 
   <target name="sonar" depends="compile, install, coverage, _sonar" />
 
-  <target name="nightlysonar" depends="_coverage.prepare, nightly, _coverage.report, _sonar, complete-junit" />
+  <target name="nightlysonar" depends="_coverage.prepare, nightly, init-svnVersion, _coverage.report, _sonar, complete-junit" />
 
   <target name="setproxy" if="${proxy.use}">
     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"