From: Dominik Stadler <centic@apache.org>
Date: Fri, 22 Sep 2017 20:06:31 +0000 (+0000)
Subject: Remove Jobs for JDK 1.6/1.7, this should also make the findbugs-hacks obsolete here
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4e76b65b171427323dbc956c498c9eda325be76e;p=poi.git

Remove Jobs for JDK 1.6/1.7, this should also make the findbugs-hacks obsolete here
The jobs still need to manually removed in Jenkins, though!

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

diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 6873a302c2..70d3f18d4e 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -10,20 +10,10 @@ def triggerSundays = '''
 H H * * 0
 '''
 
-def findbugs2Url = 'http://downloads.sourceforge.net/project/findbugs/findbugs/2.0.3/findbugs-noUpdateChecks-2.0.3.zip?download='
-def findbugs2Lib = 'lib/findbugs-noUpdateChecks-2.0.3.zip'
-def findbugs3Url = 'http://downloads.sourceforge.net/project/findbugs/findbugs/3.0.1/findbugs-noUpdateChecks-3.0.1.zip?download='
-def findbugs3Lib = 'lib/findbugs-noUpdateChecks-3.0.1.zip'
 def xercesUrl = 'http://repo1.maven.org/maven2/xerces/xercesImpl/2.6.1/xercesImpl-2.6.1.jar'
 def xercesLib = 'compile-lib/xercesImpl-2.6.1.jar'
 
 def poijobs = [
-        [ name: 'POI-DSL-1.6', jdk: '1.6',
-          // workaround as Sourceforge does not accept any of the SSL ciphers in JDK 6 any more and thus we cannot download this jar
-          // as part of the Ant build
-          addShell: "wget -O ${findbugs2Lib} ${findbugs2Url}",
-          disabled: true
-        ],
         [ name: 'POI-DSL-1.8', trigger: 'H */12 * * *'
         ],
         [ name: 'POI-DSL-OpenJDK', jdk: 'OpenJDK', trigger: 'H */12 * * *',
@@ -54,10 +44,7 @@ def poijobs = [
         [ name: 'POI-DSL-old-Xerces', trigger: triggerSundays,
           shell: "mkdir -p compile-lib && test -f ${xercesLib} || wget -O ${xercesLib} ${xercesUrl}\n",
           // the property triggers using Xerces as XML Parser and previously showed some exception that can occur
-          properties: ["-Dadditionaljar=${xercesLib}"],
-          // workaround as Sourceforge does not accept any of the SSL ciphers in JDK 6 any more and thus we cannot download this jar
-          // as part of the Ant build
-          addShell: "wget -O ${findbugs2Lib} ${findbugs2Url}"
+          properties: ["-Dadditionaljar=${xercesLib}"]
         ],
         [ name: 'POI-DSL-Maven', trigger: 'H */4 * * *', maven: true
         ],
@@ -76,14 +63,6 @@ def poijobs = [
         ],
         [ name: 'POI-DSL-SonarQube-Gradle', trigger: 'H 9 * * *', gradle: true, sonar: true, skipcigame: true
         ],
-        [ name: 'POI-DSL-Windows-1.6', jdk: '1.6', trigger: 'H */12 * * *', windows: true, slaves: 'Windows',
-          addShell: "@if not exist ${findbugs2Lib} powershell -Command wget -Uri \"${findbugs2Url}\" -OutFile ${findbugs2Lib} -UserAgent [Microsoft.PowerShell.Commands.PSUsergAgent]::Chrome",
-          disabled: true
-        ],
-        [ name: 'POI-DSL-Windows-1.7', jdk: '1.7', trigger: 'H */12 * * *', windows: true, slaves: 'Windows',
-          addShell: "@if not exist ${findbugs3Lib} powershell -Command wget -Uri \"${findbugs3Url}\" -OutFile ${findbugs3Lib} -UserAgent [Microsoft.PowerShell.Commands.PSUsergAgent]::Chrome",
-          disabled: true
-        ],
         [ name: 'POI-DSL-Windows-1.8', trigger: 'H */12 * * *', windows: true, slaves: 'Windows'
         ],
 ]
@@ -97,8 +76,6 @@ def defaultAnt = 'Ant 1.9.9'
 def defaultSlaves = 'ubuntu&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4&&!H21'
 
 def jdkMapping = [
-        '1.6': 'JDK 1.6 (latest)',
-        '1.7': 'JDK 1.7 (latest)',
         '1.8': 'JDK 1.8 (latest)',
         '1.9': 'JDK 1.9 (latest)',
         'OpenJDK': 'OpenJDK 8 (on Ubuntu only) ',   // blank is required here until the name in the Jenkins instance is fixed!