From eb91cfad9315932b2b922a213291f762fb43ac79 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 7 Jul 2025 22:51:00 +0100 Subject: [PATCH] Update create_jobs.groovy --- jenkins/create_jobs.groovy | 66 ++++---------------------------------- 1 file changed, 7 insertions(+), 59 deletions(-) diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index d8b5aff6a9..8118431e2d 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -132,7 +132,7 @@ def xmlbeansjobs = [ ] def gitBase = 'https://github.com/apache/poi.git' -def xmlbeansSvnBase = 'https://svn.apache.org/repos/asf/xmlbeans/trunk' +def xmlbeansGitBase = 'https://github.com/apache/xmlbeans.git' def defaultJdk = '1.8' def defaultTrigger = 'H/15 * * * *' // check SCM every 60/15 = 4 minutes @@ -253,60 +253,6 @@ POIJOBSHELL :: ignore any error message exit /b 0''' -def xbShellCmdsUnix = - '''# remove some outdated directories that should not be there any more -rm -rf examples excelant integrationtest main ooxml ooxml-schema scratchpad build.javacheck.xml - -# show which files are currently modified in the working copy -svn status || true -# make sure no changed module-class-files or ooxml-lite-report-files are lingering on -svn revert . -R || true - -# print out information about which exact version of java we are using -echo Java-Home: $JAVA_HOME -ls -al $JAVA_HOME/ -ls -al $JAVA_HOME/bin -$JAVA_HOME/bin/java -version - -echo which java -which java -java -version - -echo which javac -which javac -javac -version - -echo Ant-Home: $ANT_HOME -ls -al $ANT_HOME -echo which ant -which ant || true -ant -version - -echo 'Java ${ant.java.version}/${java.version}' > build.javacheck.xml -ant -f build.javacheck.xml -v - -POIJOBSHELL - -# ignore any error message -exit 0''' - -def xbShellCmdsWin = - '''@echo off -:: show which files are currently modified in the working copy -svn status -:: make sure no changed module-class-files are lingering on -svn revert . -R - -:: print out information about which exact version of java we are using -echo Java-Home: %JAVA_HOME% -dir "%JAVA_HOME:\\\\=\\%" -"%JAVA_HOME%/bin/java" -version - -POIJOBSHELL - -:: ignore any error message -exit /b 0''' - poijobs.each { poijob -> def jdkKey = poijob.jdk ?: defaultJdk def trigger = poijob.trigger ?: defaultTrigger @@ -574,9 +520,11 @@ xmlbeansjobs.each { xjob -> } jdk(jdkMapping.get(jdkKey).jenkinsJdk) scm { - svn(xmlbeansSvnBase) { svnNode -> - svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') / - url << 'https://svn.apache.org/viewcvs.cgi/?root=Apache-SVN' + git { + remote { + url(xmlbeansGitBase) + } + branch('*/trunk') } } checkoutRetryCount(3) @@ -585,7 +533,7 @@ xmlbeansjobs.each { xjob -> scm(trigger) } - def shellcmds = (xjob.windows ? xbShellCmdsWin : xbShellCmdsUnix).replace('POIJOBSHELL', xjob.shell ?: '') + def shellcmds = (xjob.windows ? shellCmdsWin : shellCmdsUnix).replace('POIJOBSHELL', xjob.shell ?: '') // Create steps and publishers depending on the type of Job that is selected steps {