RAT-210: Adapt to new CD/CI
* Use new logo and move it to the left of the page.
* Let links be SSL.
git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1727657 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e83084f..568f9ce 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@
We've integrated Rat into the ASF Jenkins to ensure continuous builds with various JDK versions.
">
+ <action issue="RAT-210" type="fix" dev="pottlinger">
+ Adapt layout of Creadur project pages to use the new ASF logo. Change links to SSL.
+ </action>
<action issue="RAT-163" type="fix" dev="jochen">
Removing the Gradle Plugin from the Rat Core project, so that building
with Java 5 works again.
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 3342ae7..77235ee 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -49,9 +49,9 @@
Apache Rat ${project.version} ships with tooling for
- * {{{http://ant.apache.org/} Apache Ant}},
+ * {{{https://ant.apache.org/} Apache Ant}},
- * {{{http://maven.apache.org}Apache Maven}},
+ * {{{https://maven.apache.org}Apache Maven}},
* {{{https://gradle.org}Gradle}} and
@@ -68,11 +68,11 @@
** Who Develops Rat?
- Apache Rat is part of the {{{http://creadur.apache.org}Apache Creadur}}
+ Apache Rat is part of the {{{https://creadur.apache.org}Apache Creadur}}
language- and build-agnostic suite of tools for auditing and comprehending
software distributions. Our community develops
{{{http://www.opensource.org/} open source software}} the
- {{{http://www.apache.org/foundation/how-it-works.html} Apache way}}.
+ {{{https://www.apache.org/foundation/how-it-works.html} Apache way}}.
Please feel free to contribute a
{{{./issue-tracking.html}patch}},
@@ -96,13 +96,13 @@
** Apache Ant
- Use the task library for {{{http://ant.apache.org/} Apache Ant 1.7}} or later
+ Use the task library for {{{https://ant.apache.org/} Apache Ant 1.7}} or later
Read more {{{./apache-rat-tasks/index.html} here}}.
** Apache Maven
- Use the plugin for {{{http://maven.apache.org}Apache Maven ${mavenVersion}}} or later.
+ Use the plugin for {{{https://maven.apache.org}Apache Maven ${mavenVersion}}} or later.
+------------------------------------------+
<plugin>
@@ -114,7 +114,7 @@
Read more {{{./apache-rat-plugin/index.html} here}}.
-** Gradle
+** Gradle (not yet officially supported)
Use the plugin for {{{https://gradle.org}Gradle}}.
@@ -138,7 +138,7 @@
* Building Rat
- Build Rat with {{{http://maven.apache.org/} Apache Maven}}
+ Build Rat with {{{https://maven.apache.org/} Apache Maven}}
Quick start
diff --git a/src/site/apt/site-publish.apt b/src/site/apt/site-publish.apt
index 244888a..44c50bd 100644
--- a/src/site/apt/site-publish.apt
+++ b/src/site/apt/site-publish.apt
@@ -20,11 +20,11 @@
How to publish the Rat website
- The {{{http://creadur.apache.org}Apache Creadur}} project, the community
- that develops {{{http://creadur.apache.org/rat}Apache Rat}},
+ The {{{https://creadur.apache.org}Apache Creadur}} project, the community
+ that develops {{{https://creadur.apache.org/rat}Apache Rat}},
hosts its website on the
- {{{http://www.apache.org/dev/cms.html}ASF Content Management System}}.
- {{{http://maven.apache.org}Apache Maven}} builds Rat, and generates this
+ {{{https://www.apache.org/dev/cms.html}ASF Content Management System}}.
+ {{{https://maven.apache.org}Apache Maven}} builds Rat, and generates this
subsite. Here's (one way) to work with these systems.
* Developing Content
@@ -48,9 +48,9 @@
* Committing and Reviewing Content
As soon as your changes look okay locally on <<<localhost:8080>>>, commit them.
- {{{http://ci.apache.org/buildbot.html}Buildbot}} will automatically
+ {{{https://ci.apache.org/buildbot.html}Buildbot}} will automatically
notice the commit and create a staging site to look at
- {{{http://ci.apache.org/projects/rat} http://ci.apache.org/projects/rat/}}
+ {{{https://builds.apache.org/view/A-D/view/Creadur/} https://builds.apache.org/view/A-D/view/Creadur/}}
which is always up to date (within a couple of minutes of any commit).
Need to make changes? No problem - go back and repeat the cycle as often as you like.
@@ -105,19 +105,19 @@
The content committed by the Maven <<<scm-publish>>> plugin
triggers a staging build on
- {{{http://ci.apache.org/}<<<http://ci.apache.org/>>>}}. To
+ {{{https://ci.apache.org/}<<<https://ci.apache.org/>>>}}. To
follow its progress, open the
- {{{http://ci.apache.org/builders/creadur-site-staging}creadur
+ {{{https://ci.apache.org/builders/creadur-site-staging}creadur
site builder}}.
When this builds has completed successfully, review the content
staged on
- {{{http://creadur.staging.apache.org/rat/index.html}
- <<<http://creadur.staging.apache.org/rat/index.html>>>}}. If
+ {{{https://creadur.staging.apache.org/rat/index.html}
+ <<<https://creadur.staging.apache.org/rat/index.html>>>}}. If
this looks fine then publish the staged content using the
- {{{http://www.apache.org/dev/cms.html}ASF Content Management System}}.
+ {{{https://www.apache.org/dev/cms.html}ASF Content Management System}}.
- Propagating the content to {{{http://creadur.apache.org/rat}production}} may take a brief while (maybe
+ Propagating the content to {{{https://creadur.apache.org/rat}production}} may take a brief while (maybe
30 seconds) so please be patient a little longer.
* Troubleshooting
diff --git a/src/site/site.xml b/src/site/site.xml
index 259179e..6c7a4b9 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,34 +18,34 @@
<project xmlns="http://maven.apache.org/DECORATION/1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"
name="Apache Rat™">
- <bannerRight>
+ <bannerLeft>
<title>The Apache Software Foundation</title>
<name>The Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf_logo_wide.jpg</src>
- <href>http://www.apache.org/</href>
- </bannerRight>
+ <src>https://www.apache.org/img/asf_logo.png</src>
+ <href>https://www.apache.org/</href>
+ </bannerLeft>
<poweredBy>
<logo name="Maven"
- href="http://maven.apache.org/"
- img="http://maven.apache.org/images/logos/maven-feather.png"/>
+ href="https://maven.apache.org/"
+ img="https://maven.apache.org/images/logos/maven-feather.png"/>
</poweredBy>
<body>
<head>
<link
- href='http://fonts.googleapis.com/css?family=Mate+SC'
+ href='https://fonts.googleapis.com/css?family=Mate+SC'
rel='stylesheet'
type='text/css'/>
</head>
<breadcrumbs>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Creadur" href="http://creadur.apache.org/"/>
- <item name="Rat" href="http://creadur.apache.org/rat/"/>
+ <item name="Apache" href="https://www.apache.org/"/>
+ <item name="Creadur" href="https://creadur.apache.org/"/>
+ <item name="Rat" href="https://creadur.apache.org/rat/"/>
</breadcrumbs>
- <menu name="Apache Rat™" inherit="bottom">
+ <menu name="Apache Rat™" inherit="bottom">
<item name="Introducing Rat" href="/index.html"/>
<item name="Javadocs" href="/apidocs/index.html"/>
<item name="Downloads" href="/download_rat.cgi"/>
@@ -59,54 +59,53 @@
<item name="With Gradle" href="apache-rat-gradle/index.html"/>
</menu>
- <menu name="Apache Creadur™" inherit="bottom">
- <item name='Creadur Project Home' href="http://creadur.apache.org"/>
- <item name='Apache Tentacles' href="http://creadur.apache.org/tentacles"/>
- <item name='Apache Whisker' href="http://creadur.apache.org/whisker"/>
- <item name='Security' href='http://www.apache.org/security/'/>
- <item name='License' href='http://www.apache.org/licenses/'/>
- <item name='Sponsorship' href='http://www.apache.org/foundation/sponsorship.html'/>
- <item name='Thanks' href='http://www.apache.org/foundation/thanks.html'/>
+ <menu name="Apache Creadur™" inherit="bottom">
+ <item name='Creadur Project Home' href="https://creadur.apache.org"/>
+ <item name='Apache Tentacles' href="https://creadur.apache.org/tentacles"/>
+ <item name='Apache Whisker' href="https://creadur.apache.org/whisker"/>
+ <item name='Security' href='https://www.apache.org/security/'/>
+ <item name='License' href='https://www.apache.org/licenses/'/>
+ <item name='Sponsorship' href='https://www.apache.org/foundation/sponsorship.html'/>
+ <item name='Thanks' href='https://www.apache.org/foundation/thanks.html'/>
</menu>
<menu name="The Apache Software Foundation" inherit="bottom">
<item name='About the Foundation'
- href="http://www.apache.org/foundation"/>
+ href="https://www.apache.org/foundation"/>
<item name='The projects'
- href="http://projects.apache.org"/>
+ href="https://projects.apache.org"/>
<item name='The people'
- href="http://people.apache.org"/>
+ href="https://people.apache.org"/>
<item name='How we work'
- href='http://www.apache.org/foundation/how-it-works.html'/>
+ href='https://www.apache.org/foundation/how-it-works.html'/>
<item name='Our history'
- href='http://www.apache.org/foundation/how-it-works.html#history'/>
+ href='https://www.apache.org/foundation/how-it-works.html#history'/>
<item name='News'
- href='http://blogs.apache.org/foundation/'/>
+ href='https://blogs.apache.org/foundation/'/>
</menu>
<menu name="Contribute" inherit="bottom">
- <item name="Get Involved" href='http://www.apache.org/foundation/getinvolved.html'/>
+ <item name="Get Involved" href='https://www.apache.org/foundation/getinvolved.html'/>
</menu>
<menu name="Committer Info" inherit="bottom">
- <item name="ASF Committers' FAQ" href='http://www.apache.org/dev/committers.html'/>
- <item name='New Committers Guide' href='http://www.apache.org/dev/new-committers-guide.html'/>
+ <item name="ASF Committers' FAQ" href='https://www.apache.org/dev/committers.html'/>
+ <item name='New Committers Guide' href='https://www.apache.org/dev/new-committers-guide.html'/>
<item name="Howto publish this site" href="site-publish.html"/>
- <item name='Plant Apache' href='http://planet.apache.org/committers/'/>
- <item name='Community' href='http://community.apache.org/'/>
- <item name='Legal' href='http://www.apache.org/legal/'/>
- <item name='Branding' href='http://www.apache.org/foundation/marks/'/>
- <item name='Media Relations' href='http://www.apache.org/press/'/>
+ <item name='Plant Apache' href='https://planet.apache.org/committers/'/>
+ <item name='Community' href='https://community.apache.org/'/>
+ <item name='Legal' href='https://www.apache.org/legal/'/>
+ <item name='Branding' href='https://www.apache.org/foundation/marks/'/>
+ <item name='Media Relations' href='https://www.apache.org/press/'/>
</menu>
<menu ref="modules"/>
<menu ref="reports"/>
- <footer>Copyright © 2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ <footer>Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks
of The Apache Software Foundation.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</footer>
-
</body>
</project>
diff --git a/src/site/xdoc/download_rat.xml.vm b/src/site/xdoc/download_rat.xml.vm
index 4b2903a..8d80585 100644
--- a/src/site/xdoc/download_rat.xml.vm
+++ b/src/site/xdoc/download_rat.xml.vm
@@ -24,7 +24,7 @@
<subsection name="Using a Mirror">
<p>
We recommend you use a mirror to download our release
- builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
+ builds, but you <strong>must</strong> <a href="https://www.apache.org/info/verification.html">verify the integrity</a> of
the downloaded files using signatures downloaded from our main
distribution directories. Recent releases (48 hours) may not yet
be available from the mirrors.
@@ -60,7 +60,7 @@
<p>
The <a
- href="http://www.apache.org/dist/creadur/KEYS">KEYS</a>
+ href="https://www.apache.org/dist/creadur/KEYS">KEYS</a>
link links to the code signing keys used to sign the
product. The <code>PGP</code> link downloads the OpenPGP
compatible signature from our main site. The
@@ -74,20 +74,20 @@
<table>
<tr>
<td><a href="[preferred]/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.bz2">apache-rat-${project.version}-bin.tar.bz2</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.bz2.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.bz2.sha1">sha1</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.bz2.asc">pgp</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.bz2.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.bz2.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.bz2.asc">pgp</a></td>
</tr>
<tr>
<td><a href="[preferred]/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.gz">apache-rat-${project.version}-bin.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.gz.sha1">sha1</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
<td><a href="[preferred]/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.zip">apache-rat-${project.version}-bin.zip</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.zip.sha1">sha1</a></td>
<td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-bin.zip.asc">pgp</a></td>
</tr>
</table>
@@ -96,21 +96,21 @@
<table>
<tr>
<td><a href="[preferred]/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.bz2">apache-rat-${project.version}-src.tar.bz2</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.bz2.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.bz2.sha1">sha1</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.bz2.asc">pgp</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.bz2.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.bz2.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.bz2.asc">pgp</a></td>
</tr>
<tr>
<td><a href="[preferred]/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.gz">apache-rat-${project.version}-src.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.gz.sha1">sha1</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.gz.asc">pgp</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
<td><a href="[preferred]/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.zip">apache-rat-${project.version}-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.zip.sha1">sha1</a></td>
- <td><a href="http://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.zip.asc">pgp</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/creadur/apache-rat-${project.version}/apache-rat-${project.version}-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
@@ -121,8 +121,8 @@
</p>
<ul>
<li class="download"><a href="[preferred]/creadur/">browse download area</a></li>
- <li><a href="http://archive.apache.org/dist/creadur/">archives...</a></li>
- <li><a href="http://archive.apache.org/dist/incubator/rat/">Incubator archives...</a></li>
+ <li><a href="https://archive.apache.org/dist/creadur/">archives...</a></li>
+ <li><a href="https://archive.apache.org/dist/incubator/rat/">Incubator archives...</a></li>
</ul>
</section>
</body>
