diff options
| -rw-r--r-- | build.xml | 20 | ||||
| -rw-r--r-- | jenkins/create_jobs.groovy | 6 |
2 files changed, 23 insertions, 3 deletions
@@ -1782,6 +1782,26 @@ under the License. <echo>Broken links:</echo> <echo file="${build.site}/../tmp/brokenlinks.xml"/> + <!-- Apache Forrest is dead, so we cannot expect fixes there + however it does not handle "https" in "credits" currently + if the *.xml file is in a sub-directory, see Apache Forrest + code at main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl:350 + + So we need to replace the links afterwards to have a fully "https" + website and avoid browser warning about a "mixed content" + website --> + <echo>Fix https in ${build.site}</echo> + <replace dir="${build.site}" + token="http://www.apache.org/events/current-event-125x125.png" + value="https://www.apache.org/events/current-event-125x125.png" + summary="true" + includes="**/*.html"/> + <replace dir="${build.site}" + token="http://www.google.com/search" + value="https://www.google.com/search" + summary="true" + includes="**/*.html"/> + <fixcrlf srcdir="${build.site}" includes="**/*.html,**/*.css" eol="unix" eof="remove" /> <touch> diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index 062cba1e6d..40dcb9ea13 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -2,7 +2,7 @@ // Apache POI uses on the public Jenkins instance at https://builds.apache.org/view/P/view/POI/ // // See https://github.com/jenkinsci/job-dsl-plugin/wiki for information about the DSL, you can -// use http://job-dsl.herokuapp.com/ to validate the code before checkin +// use https://job-dsl.herokuapp.com/ to validate the code before checkin // def triggerSundays = ''' @@ -255,7 +255,7 @@ poijobs.each { poijob -> } else { svn(svnBase) { svnNode -> svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') / - url << 'http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN' + url << 'https://svn.apache.org/viewcvs.cgi/?root=Apache-SVN' } } } @@ -506,7 +506,7 @@ xmlbeansjobs.each { xjob -> scm { svn(xmlbeansSvnBase) { svnNode -> svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') / - url << 'http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN' + url << 'https://svn.apache.org/viewcvs.cgi/?root=Apache-SVN' } } checkoutRetryCount(3) |