Try to make dependency on "svn" optional to allow to build on more CI nodes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1857476 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2019-04-13 13:06:43 +00:00
parent 924b2c546b
commit b652fc664f
1 changed files with 3 additions and 4 deletions

View File

@ -97,8 +97,7 @@ def defaultEmail = 'dev@poi.apache.org'
def defaultAnt = 'Ant 1.9.9'
// currently a lot of H?? slaves don't have Ant installed ... H21 seems to have a SVN problem
// H35 fails with ImageIO create cache file errors, although the java.io.tmpdir is writable
def defaultSlaves = '(ubuntu||beam)&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4&&!H21&&!H35' +
'&&!apache-beam-jenkins-8'
def defaultSlaves = '(ubuntu||beam)&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4&&!H21&&!H35'
def jdkMapping = [
'1.6': 'JDK 1.6 (latest)',
@ -153,7 +152,7 @@ def sonarDesc = '''
def shellCmdsUnix =
'''# show which files are currently modified in the working copy
svn status
svn status || true
# print out information about which exact version of java we are using
echo Java-Home: $JAVA_HOME
@ -598,7 +597,7 @@ Unfortunately we often see builds break because of changes/new machines...''')
runner('DontRun')
steps {
shell(
'''which svn
'''which svn || true
which javac
javac -version
echo '<?xml version="1.0"?><project name="POI Build" default="test"><target name="test"><echo>Using Ant: ${ant.version} from ${ant.home}</echo></target></project>' > build.xml