Skip to content

Commit

Permalink
Merge pull request #181 from rzo1/main
Browse files Browse the repository at this point in the history
Avoid confusion of users due to 'shiro-jakarta-ee' is not available in Shiro 1.x
  • Loading branch information
bmarwell authored Jun 27, 2023
2 parents d8b8704 + 141695f commit 13f0d83
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/site/content/jakarta-ee.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/site/data/releases.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
1 change: 1 addition & 0 deletions src/site/templates/macros/versions.ftl
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 13f0d83

Please sign in to comment.