poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cen...@apache.org
Subject svn commit: r1874982 - in /poi/trunk: build.xml jenkins/create_jobs.groovy
Date Sun, 08 Mar 2020 20:17:12 GMT
Author: centic
Date: Sun Mar  8 20:17:11 2020
New Revision: 1874982

URL: http://svn.apache.org/viewvc?rev=1874982&view=rev
Log:
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.

Modified:
    poi/trunk/build.xml
    poi/trunk/jenkins/create_jobs.groovy

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1874982&r1=1874981&r2=1874982&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Mar  8 20:17:11 2020
@@ -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>

Modified: poi/trunk/jenkins/create_jobs.groovy
URL: http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1874982&r1=1874981&r2=1874982&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Sun Mar  8 20:17:11 2020
@@ -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)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message