Merge remote-tracking branch 'origin/1.x'

ao-apps · Sep 18, 2023 · 6c93009 · 6c93009
2 parents cf813c3 + 1950ab4
commit 6c93009
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/book/src/main/resources-filtered/META-INF/resources/section/style/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/section/style/changelog.jspx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 semanticcms-section-style - Default style for sections nested within SemanticCMS pages and elements.
-Copyright (C) 2016, 2017, 2019, 2020, 2021, 2022  AO Industries, Inc.
+Copyright (C) 2016, 2017, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -39,7 +39,12 @@ along with semanticcms-section-style.  If not, see <https://www.gnu.org/licenses
     datePublished="2016-10-31T02:24:12-05:00"
     dateModified="2021-07-19T03:30:14-05:00"
   >
-    <c:if test="${fn:endsWith('@{project.version}', '-SNAPSHOT') and !fn:endsWith('@{project.version}', '-POST-SNAPSHOT')}">
+    <c:set var="latestRelease" value="1.8.0" />
+    <c:if test="${
+      fn:endsWith('@{project.version}', '-SNAPSHOT')
+      and !fn:endsWith('@{project.version}', '-POST-SNAPSHOT')
+      and '@{project.version}' != (latestRelease.concat('-SNAPSHOT'))
+    }">
       <changelog:release
         projectName="@{documented.name}"
         version="@{project.version}"