You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2022/02/12 11:40:49 UTC

[shiro-site] 01/01: [SHIRO-864] prefix classifiers when exist

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch SHIRO-864_links_classifier
in repository https://gitbox.apache.org/repos/asf/shiro-site.git

commit 40736cbfde8e60f6769d66a6996558e2d1d508a3
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Sat Feb 12 12:40:33 2022 +0100

    [SHIRO-864] prefix classifiers when exist
---
 src/site/templates/macros/artifacttable.ftl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/site/templates/macros/artifacttable.ftl b/src/site/templates/macros/artifacttable.ftl
index 7ceab9a..99d342b 100644
--- a/src/site/templates/macros/artifacttable.ftl
+++ b/src/site/templates/macros/artifacttable.ftl
@@ -14,19 +14,21 @@
   <#-- releases.yaml contains the artifactObject's names. We can just resolve them using eval. -->
   <#assign artifact=versions.artifacts[artifactName]>
   <tr>
-    <#assign classifier=artifact.c!"">
+    <#if (artifact.c)??>
+        <#assign classifier="-"+artifact.c>
+    </#if>
     <#assign group=artifact.g?replace('.', '/') >
 
     <td style="white-space: nowrap;">
-      <a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier}.${artifact.type}">${artifact.a}</a><br/>
-      (<a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier}.${artifact.type}.asc">pgp</a>,
+      <a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier!}.${artifact.type}">${artifact.a}</a><br/>
+      (<a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier!}.${artifact.type}.asc">pgp</a>,
       <#if versionObject.hashes??>
         <#list versionObject.hashes>
-          <#items as hash><a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier}.${artifact.type}.${hash}">${hash}</a><#sep>, </#sep></#items>)
+          <#items as hash><a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier!}.${artifact.type}.${hash}">${hash}</a><#sep>, </#sep></#items>)
         </#list>
       <#else>
-       <a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier}.${artifact.type}.md5">md5</a>,
-       <a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier}.${artifact.type}.sha1">sha1</a>)
+       <a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier!}.${artifact.type}.md5">md5</a>,
+       <a href="https://repo1.maven.org/maven2/${group}/${artifact.a}/${version}/${artifact.a}-${version}${classifier!}.${artifact.type}.sha1">sha1</a>)
       </#if>
     </td>