This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro-site.git
The following commit(s) were added to refs/heads/main by this push:
new 4cce63f17 2.0.1 release
4cce63f17 is described below
commit 4cce63f170ef6cdba914da19055c5b7a5070288c
Author: lprimak <[email protected]>
AuthorDate: Fri May 31 00:36:17 2024 -0400
2.0.1 release
---
.../blog/2024/05/apache-shiro-201-released.adoc | 54 ++++++++++++++++++++++
src/site/content/documentation.adoc | 2 +-
src/site/data/releases.yaml | 6 ++-
src/site/templates/macros/versions.ftl | 27 +----------
src/site/templates/page.ftl | 1 -
5 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/src/site/content/blog/2024/05/apache-shiro-201-released.adoc
b/src/site/content/blog/2024/05/apache-shiro-201-released.adoc
new file mode 100644
index 000000000..038fa1f7c
--- /dev/null
+++ b/src/site/content/blog/2024/05/apache-shiro-201-released.adoc
@@ -0,0 +1,54 @@
+////
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+////
+
+= 2.0.1 available
+:jbake-author: Lenny Primak
+:jbake-date: 2024-05-30 00:00:00
+:jbake-type: post
+:jbake-status: published
+:jbake-tags: blog, release
+:idprefix:
+:icons: font
+
+The Apache Shiro team is pleased to announce the release of Apache Shiro
version 2.0.1.
+
+This release is available for download now.
+
+== Release Highlights
+* Added a supported way to decorate Shiro SecurityManager
+* Better compatibility with OSGi for Jakarta EE jakarta namespace
+* Fixed exception handling bugs in Jax-Rs integration module
+* Fixed a bug in Jakarta Faces integration
+* Better compatibility when building with Maven 4.x
+
+== All changes
+
+You can learn more on
link:https://github.com/apache/shiro/releases/tag/shiro-root-2.0.1[GitHub,
Release 2.0.1].
+
+== Download
+
+Download and verification instructions are available link:/download.html[on
our download page].
+
+== Documentation
+
+For more information on link:/documentation.html[Shiro, please read the
documentation.]
+
+Enjoy!
+
+The Apache Shiro Team
diff --git a/src/site/content/documentation.adoc
b/src/site/content/documentation.adoc
index f6297ca10..1a8f68a13 100644
--- a/src/site/content/documentation.adoc
+++ b/src/site/content/documentation.adoc
@@ -35,7 +35,7 @@ Apache Shiro ${versions.latestRelease}
(link:download.html[Download])
* link:https://javadoc.io/doc/org.apache.shiro[API] (Javadoc - Hosted on
javadoc.io)
*
link:https://github.com/apache/shiro/tree/shiro-root-${versions.latestRelease}/[Browse
Source] (GitHub tag)
-* link:static/${versions.latestRelease}/[Maven Static Site]
+* link:static/latest/[Maven Static Site]
++++
<@lendahand.lendahand />
diff --git a/src/site/data/releases.yaml b/src/site/data/releases.yaml
index 61300eec7..38626f434 100644
--- a/src/site/data/releases.yaml
+++ b/src/site/data/releases.yaml
@@ -1,12 +1,14 @@
---
# for each release, update this variable with the latest version.
-latestRelease: "2.0.0"
+latestRelease: "2.0.1"
# for each alpha release, update this variable with the latest alpha version.
# it can be dropped after shiro 2 goes final.
latestAlphaRelease: "2.0.0-alpha-4"
# also add or replace the latest version here.
versionInfo:
+ '2.0.1':
+ releaseDate: 2024-05-30
'2.0.0':
releaseDate: 2024-02-28
'1.13.0':
@@ -305,7 +307,7 @@ releases:
- sha512
shiro20x:
- version: 2.0.0
+ version: 2.0.1
artifacts:
- shiroCore
- shiroWeb
diff --git a/src/site/templates/macros/versions.ftl
b/src/site/templates/macros/versions.ftl
index b08398e60..84a87f953 100644
--- a/src/site/templates/macros/versions.ftl
+++ b/src/site/templates/macros/versions.ftl
@@ -6,29 +6,7 @@
<#assign artifacts = data.get('artifacts.yaml').artifacts>
-<#macro shirov2>
- <#assign theDate = .now?date>
- <div class="admonitionblock important">
- <table>
- <tbody>
- <tr>
- <td class="icon">
- <i class="fa icon-important" title="Important"></i>
- </td>
- <td class="content">
- <div class="title">Shiro v2 alpha notice</div>
- <div class="paragraph">
- <p>As of ${theDate?iso_utc}, this version of Apache Shiro is in
Alpha stage.</p>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</#macro>
-
<#macro shirov1 sourcepage="" hasv2=false>
- <#assign theDate = .now?date>
<div class="admonitionblock tip">
<table>
<tbody>
@@ -39,11 +17,10 @@
<td class="content">
<div class="title">Shiro v1 version notice</div>
<div class="paragraph">
- <p>As of ${theDate?iso_utc}, Shiro v1 will soon be superseded by
v2.<p>
+ <p>As of February 28, 2024, Shiro v1 was superseded by v2.<p>
<#if (sourcepage)?? && (sourcepage)?is_string && (sourcepage) !=
"" && hasv2 == true>
- <#assign target=sourcepage?keep_after_last("/") />
<p>
- <a href="./v2/${target}">Read this page in the v2
documentation</a>.
+ <a href="./v2/${sourcepage}">Read this page in the v2
documentation</a>.
</p>
</#if>
</div>
diff --git a/src/site/templates/page.ftl b/src/site/templates/page.ftl
index cba2d98af..29ee2a695 100644
--- a/src/site/templates/page.ftl
+++ b/src/site/templates/page.ftl
@@ -33,7 +33,6 @@
<#import "macros/versions.ftl" as versions>
<#if (content.uri)?contains("/v2/") || (content.uri)?starts_with("v2/")>
- <@versions.shirov2 />
<#else>
<#-- this is a shiro v1 page -->
<#assign hasv2=((content["shiro-hasv2"])?? &&
(content["shiro-hasv2"]) == "true") />
