Adjust some more places to use https instead of http, need a workaround for a bug in Apache Forrest

See comment in build.xml for why this replacement is needed.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1874982 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2020-03-08 20:17:11 +00:00
parent 77fbcb788d
commit 7c2dfd9930
2 changed files with 23 additions and 3 deletions

View File

@ -1782,6 +1782,26 @@ under the License.
<echo>Broken links:</echo> <echo>Broken links:</echo>
<echo file="${build.site}/../tmp/brokenlinks.xml"/> <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" /> <fixcrlf srcdir="${build.site}" includes="**/*.html,**/*.css" eol="unix" eof="remove" />
<touch> <touch>

View File

@ -2,7 +2,7 @@
// Apache POI uses on the public Jenkins instance at https://builds.apache.org/view/P/view/POI/ // 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 // 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 = ''' def triggerSundays = '''
@ -255,7 +255,7 @@ poijobs.each { poijob ->
} else { } else {
svn(svnBase) { svnNode -> svn(svnBase) { svnNode ->
svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') / 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 { scm {
svn(xmlbeansSvnBase) { svnNode -> svn(xmlbeansSvnBase) { svnNode ->
svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') / 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) checkoutRetryCount(3)