Use https on links
diff --git a/README.md b/README.md
index e1777a9..f55f68d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[<img src="http://shiro.apache.org/images/apache-shiro-logo.png" align="right" />](http://shiro.apache.org)
+[<img src="https://shiro.apache.org/images/apache-shiro-logo.png" align="right" />](https://shiro.apache.org)
[](https://central.sonatype.com/artifact/org.apache.shiro/shiro-core/)
[](https://ci-builds.apache.org/job/Shiro/job/Shiro-all/job/main/)
@@ -8,16 +8,16 @@
Apache Shiro
============
-[Apache Shiro](http://shiro.apache.org) is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management. With Shiro’s easy-to-understand API, you can quickly and easily secure any application – from the smallest mobile applications to the largest web and enterprise applications.
+[Apache Shiro](https://shiro.apache.org) is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management. With Shiro’s easy-to-understand API, you can quickly and easily secure any application – from the smallest mobile applications to the largest web and enterprise applications.
Documentation and Examples
--------------------------
-http://shiro.apache.org
+https://shiro.apache.org
Tutorials
---------
-* [10 Minute Tutorial](http://shiro.apache.org/10-minute-tutorial.html)
-* [Web Application](http://shiro.apache.org/webapp-tutorial.html)
+* [10 Minute Tutorial](https://shiro.apache.org/10-minute-tutorial.html)
+* [Web Application](https://shiro.apache.org/webapp-tutorial.html)
License
-------
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58e3501..7d3c90e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -473,7 +473,7 @@
Bug:
[SHIRO-341] - ReflectionBuilder has invalid log message format
- [SHIRO-342] - Running the example as described at http://shiro.apache.org/10-minute-tutorial.html fails
+ [SHIRO-342] - Running the example as described at https://shiro.apache.org/10-minute-tutorial.html fails
[SHIRO-344] - runAs feature doesn't work
[SHIRO-350] - Creating a subject should not create a session
[SHIRO-353] - DefaultSecurityManager has invalid SLF4J log instruction
@@ -502,7 +502,7 @@
If you overrode this method in Shiro 1.0 or 1.1, please look at the new
org.apache.shiro.mgt.DefaultSubjectDAO implementation, which performs compatible logic.
Documentation for this is covered here:
- http://shiro.apache.org/session-management.html#SessionManagement-SessionsandSubjectState
+ https://shiro.apache.org/session-management.html#SessionManagement-SessionsandSubjectState
- The org.apache.shiro.web.session.mgt.ServletContainerSessionManager implementation
(enabled by default for all web applications) no longer subclasses
diff --git a/core/src/main/java/org/apache/shiro/mgt/AbstractRememberMeManager.java b/core/src/main/java/org/apache/shiro/mgt/AbstractRememberMeManager.java
index 9fce078..9107cd6 100644
--- a/core/src/main/java/org/apache/shiro/mgt/AbstractRememberMeManager.java
+++ b/core/src/main/java/org/apache/shiro/mgt/AbstractRememberMeManager.java
@@ -461,7 +461,7 @@
+ "configuration problem or corrupted principals. This could also be due to a recently "
+ "changed encryption key, if you are using a shiro.ini file, this property would be "
+ "'securityManager.rememberMeManager.cipherKey'"
- + "see: http://shiro.apache.org/web.html#Web-RememberMeServices. "
+ + "see: https://shiro.apache.org/web.html#Web-RememberMeServices. "
+ "The remembered identity will be forgotten and not used for this request.";
LOGGER.warn(message);
}
diff --git a/integration-tests/guice3/src/main/webapp/WEB-INF/shiro.ini b/integration-tests/guice3/src/main/webapp/WEB-INF/shiro.ini
index db453e7..ef2c2ff 100644
--- a/integration-tests/guice3/src/main/webapp/WEB-INF/shiro.ini
+++ b/integration-tests/guice3/src/main/webapp/WEB-INF/shiro.ini
@@ -18,8 +18,8 @@
#
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
shiro.loginUrl = /login.jsp
diff --git a/integration-tests/guice4/src/main/webapp/WEB-INF/shiro.ini b/integration-tests/guice4/src/main/webapp/WEB-INF/shiro.ini
index db453e7..ef2c2ff 100644
--- a/integration-tests/guice4/src/main/webapp/WEB-INF/shiro.ini
+++ b/integration-tests/guice4/src/main/webapp/WEB-INF/shiro.ini
@@ -18,8 +18,8 @@
#
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
shiro.loginUrl = /login.jsp
diff --git a/integration-tests/jaxrs/app/src/main/resources/META-INF/resources/WEB-INF/shiro.ini b/integration-tests/jaxrs/app/src/main/resources/META-INF/resources/WEB-INF/shiro.ini
index e891406..71fb398 100644
--- a/integration-tests/jaxrs/app/src/main/resources/META-INF/resources/WEB-INF/shiro.ini
+++ b/integration-tests/jaxrs/app/src/main/resources/META-INF/resources/WEB-INF/shiro.ini
@@ -18,8 +18,8 @@
#
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
diff --git a/integration-tests/jaxrs/app/src/main/webapp/WEB-INF/shiro.ini b/integration-tests/jaxrs/app/src/main/webapp/WEB-INF/shiro.ini
index e891406..71fb398 100644
--- a/integration-tests/jaxrs/app/src/main/webapp/WEB-INF/shiro.ini
+++ b/integration-tests/jaxrs/app/src/main/webapp/WEB-INF/shiro.ini
@@ -18,8 +18,8 @@
#
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
diff --git a/samples/guice/src/main/webapp/WEB-INF/shiro.ini b/samples/guice/src/main/webapp/WEB-INF/shiro.ini
index db453e7..ef2c2ff 100644
--- a/samples/guice/src/main/webapp/WEB-INF/shiro.ini
+++ b/samples/guice/src/main/webapp/WEB-INF/shiro.ini
@@ -18,8 +18,8 @@
#
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
shiro.loginUrl = /login.jsp
diff --git a/samples/servlet-plugin/src/main/webapp/WEB-INF/shiro.ini b/samples/servlet-plugin/src/main/webapp/WEB-INF/shiro.ini
index 759427c..4a5fc78 100644
--- a/samples/servlet-plugin/src/main/webapp/WEB-INF/shiro.ini
+++ b/samples/servlet-plugin/src/main/webapp/WEB-INF/shiro.ini
@@ -17,8 +17,8 @@
# under the License.
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
listener = org.apache.shiro.config.ogdl.event.LoggingBeanEventListener
diff --git a/samples/spring-boot-3-web/src/main/resources/templates/error.html b/samples/spring-boot-3-web/src/main/resources/templates/error.html
index c183c27..e26648d 100644
--- a/samples/spring-boot-3-web/src/main/resources/templates/error.html
+++ b/samples/spring-boot-3-web/src/main/resources/templates/error.html
@@ -25,7 +25,7 @@
<div class="row">
<div class="box col-md-6 col-md-offset-3">
<div class="custom-header">
- <img src="http://shiro.apache.org/images/apache-shiro-logo.png"/>
+ <img src="https://shiro.apache.org/images/apache-shiro-logo.png"/>
</div>
<div class="logo">
<h1 th:text="${errors.status}"></h1>
diff --git a/samples/spring-boot-web/src/main/resources/templates/error.html b/samples/spring-boot-web/src/main/resources/templates/error.html
index 77362a3..7659f61 100644
--- a/samples/spring-boot-web/src/main/resources/templates/error.html
+++ b/samples/spring-boot-web/src/main/resources/templates/error.html
@@ -25,7 +25,7 @@
<div class="row">
<div class="box col-md-6 col-md-offset-3">
<div class="custom-header">
- <img src="http://shiro.apache.org/assets/images/apache-shiro-logo.png"/>
+ <img src="https://shiro.apache.org/assets/images/apache-shiro-logo.png"/>
</div>
<div class="logo">
<h1 th:text="${errors.status}"></h1>
diff --git a/samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini b/samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini
index d9832b9..d64e918 100644
--- a/samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini
+++ b/samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini
@@ -17,8 +17,8 @@
# under the License.
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
listener = org.apache.shiro.config.ogdl.event.LoggingBeanEventListener
diff --git a/samples/web/src/main/webapp/WEB-INF/shiro.ini b/samples/web/src/main/webapp/WEB-INF/shiro.ini
index d9832b9..d64e918 100644
--- a/samples/web/src/main/webapp/WEB-INF/shiro.ini
+++ b/samples/web/src/main/webapp/WEB-INF/shiro.ini
@@ -17,8 +17,8 @@
# under the License.
# INI configuration is very powerful and flexible, while still remaining succinct.
-# Please http://shiro.apache.org/configuration.html and
-# http://shiro.apache.org/web.html for more.
+# Please https://shiro.apache.org/configuration.html and
+# https://shiro.apache.org/web.html for more.
[main]
listener = org.apache.shiro.config.ogdl.event.LoggingBeanEventListener
diff --git a/src/site/site.xml b/src/site/site.xml
index b9c6738..15861da 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,7 +20,7 @@
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="Shiro">
- <bannerLeft name="Shiro" href="http://shiro.apache.org">
+ <bannerLeft name="Shiro" href="https://shiro.apache.org">
<image src="https://shiro.apache.org/images/apache-shiro-logo.png"/>
</bannerLeft>
diff --git a/web/src/main/java/org/apache/shiro/web/env/EnvironmentLoader.java b/web/src/main/java/org/apache/shiro/web/env/EnvironmentLoader.java
index 7d265de..f4fd086 100644
--- a/web/src/main/java/org/apache/shiro/web/env/EnvironmentLoader.java
+++ b/web/src/main/java/org/apache/shiro/web/env/EnvironmentLoader.java
@@ -61,7 +61,7 @@
* </context-param>
* </pre>
* If not specified, the default value is the {@link IniWebEnvironment} class, which assumes Shiro's default
- * <a href="http://shiro.apache.org/configuration.html">INI configuration format</a>
+ * <a href="https://shiro.apache.org/configuration.html">INI configuration format</a>
* <h3>shiroConfigLocations</h3>
* The {@code shiroConfigLocations} {@code context-param}, if it exists, allows you to specify the config location(s)
* (resource path(s)) that will be relayed to the instantiated {@link WebEnvironment}. For example:
diff --git a/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java b/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java
index 0b13043..de4a6c6 100644
--- a/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java
+++ b/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java
@@ -67,10 +67,10 @@
* </init-param>
* </filter>
* </pre>
- * See the Shiro <a href="http://shiro.apache.org/subject.html">Subject documentation</a> for more information as to
+ * See the Shiro <a href="https://shiro.apache.org/subject.html">Subject documentation</a> for more information as to
* if you would do this, particularly the sections on the {@code Subject.Builder} and Thread Association.
*
- * @see <a href="http://shiro.apache.org/subject.html">Subject documentation</a>
+ * @see <a href="https://shiro.apache.org/subject.html">Subject documentation</a>
* @since 1.0
*/
public abstract class AbstractShiroFilter extends OncePerRequestFilter {
diff --git a/web/src/main/java/org/apache/shiro/web/servlet/IniShiroFilter.java b/web/src/main/java/org/apache/shiro/web/servlet/IniShiroFilter.java
index 83bd90e..51fccca 100644
--- a/web/src/main/java/org/apache/shiro/web/servlet/IniShiroFilter.java
+++ b/web/src/main/java/org/apache/shiro/web/servlet/IniShiroFilter.java
@@ -47,8 +47,8 @@
* <a href="http://en.wikipedia.org/wiki/INI_file">INI</a> configuration format.
* <p/>
* The actual INI configuration contents are not covered here, but instead in Shiro's
- * <a href="http://shiro.apache.org/configuration.html">Configuration Documentation</a> and additional web-specific
- * <a href="http://shiro.apache.org/web.html">Web Documentation</a>.
+ * <a href="https://shiro.apache.org/configuration.html">Configuration Documentation</a> and additional web-specific
+ * <a href="https://shiro.apache.org/web.html">Web Documentation</a>.
* <h2>Usage</h2>
* <h3>Default</h3>
* By default, the simplest filter declaration expects a {@code shiro.ini} resource to be located at
@@ -98,11 +98,11 @@
* 'noise' in the web.xml file.
* <p/>
* When creating the shiro.ini configuration itself, please see Shiro's
- * <a href="http://shiro.apache.org/configuration.html">Configuration Documentation</a> and
- * <a href="http://shiro.apache.org/web.html">Web Documentation</a>.
+ * <a href="https://shiro.apache.org/configuration.html">Configuration Documentation</a> and
+ * <a href="https://shiro.apache.org/web.html">Web Documentation</a>.
*
- * @see <a href="http://shiro.apache.org/configuration.html">Apache Shiro INI Configuration</a>
- * @see <a href="http://shiro.apache.org/web.html">Apache Shiro Web Documentation</a>
+ * @see <a href="https://shiro.apache.org/configuration.html">Apache Shiro INI Configuration</a>
+ * @see <a href="https://shiro.apache.org/web.html">Apache Shiro Web Documentation</a>
* @since 1.0
* @deprecated in 1.2 in favor of using the {@link ShiroFilter}
*/
diff --git a/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java b/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java
index 1d5de6c..f21df13 100644
--- a/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java
+++ b/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java
@@ -56,7 +56,7 @@
*
* @see org.apache.shiro.web.env.EnvironmentLoader EnvironmentLoader
* @see org.apache.shiro.web.env.EnvironmentLoaderListener EnvironmentLoaderListener
- * @see <a href="http://shiro.apache.org/web.html">Apache Shiro Web Documentation</a>
+ * @see <a href="https://shiro.apache.org/web.html">Apache Shiro Web Documentation</a>
* @since 1.2
*/
public class ShiroFilter extends AbstractShiroFilter {
