This is an automated email from the ASF dual-hosted git repository.
bmarwell 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 141695f98 Avoid confusion of users due to 'shiro-jakarta-ee' is not
available in Shiro 1.x
new 13f0d835a Merge pull request #181 from rzo1/main
141695f98 is described below
commit 141695f9880597b7e3445dabba5075f5e18e6585
Author: Richard Zowalla <[email protected]>
AuthorDate: Mon Jun 26 12:46:06 2023 +0200
Avoid confusion of users due to 'shiro-jakarta-ee' is not available in
Shiro 1.x
---
src/site/content/jakarta-ee.adoc | 2 +-
src/site/data/releases.yaml | 3 +++
src/site/templates/macros/versions.ftl | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/site/content/jakarta-ee.adoc b/src/site/content/jakarta-ee.adoc
index 4f5bab78a..9bd4c2245 100644
--- a/src/site/content/jakarta-ee.adoc
+++ b/src/site/content/jakarta-ee.adoc
@@ -17,7 +17,7 @@ The module is compatible with Java EE 8 through Jakarta EE 10
or later. It may w
Include the `shiro-jakarta-ee` dependency in you application classpath (we
recommend using a tool such as Apache Maven or Gradle to manage this).
++++
-<@dependencies.dependencies anchorId="cli" deps=[{'g':'org.apache.shiro',
'a':'shiro-jakarta-ee', "v":"${versions.latestRelease}"}] />
+<@dependencies.dependencies anchorId="cli" deps=[{'g':'org.apache.shiro',
'a':'shiro-jakarta-ee', "v":"${versions.latestAlphaRelease}"}] />
++++
== Relationships between Jakarta EE and CDI / Jax-RS modules
diff --git a/src/site/data/releases.yaml b/src/site/data/releases.yaml
index abae29d7a..7b5358691 100644
--- a/src/site/data/releases.yaml
+++ b/src/site/data/releases.yaml
@@ -1,6 +1,9 @@
---
# for each release, update this variable with the latest version.
latestRelease: "1.11.0"
+# 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-2"
# also add or replace the latest version here.
versionInfo:
diff --git a/src/site/templates/macros/versions.ftl
b/src/site/templates/macros/versions.ftl
index 29d8fe6c8..0f617ebc9 100644
--- a/src/site/templates/macros/versions.ftl
+++ b/src/site/templates/macros/versions.ftl
@@ -1,4 +1,5 @@
<#assign latestRelease = data.get('releases.yaml').latestRelease>
+<#assign latestAlphaRelease = data.get('releases.yaml').latestAlphaRelease>
<#assign versionInfo = data.get('releases.yaml').versionInfo>
<#assign releases = data.get('releases.yaml').releases>
<#assign oldReleases = data.get('releases.yaml').oldReleases>
