You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/11/14 22:13:38 UTC
[1/2] shiro-site git commit: Minor logos.png change
Repository: shiro-site
Updated Branches:
refs/heads/master e57788cb0 -> 9935ed5b5
Minor logos.png change
Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/a239d2b9
Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/a239d2b9
Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/a239d2b9
Branch: refs/heads/master
Commit: a239d2b978f9cf4ceff9145c7c8441955d0f9e34
Parents: e57788c
Author: Brian Demers <bd...@apache.org>
Authored: Mon Oct 31 12:18:37 2016 -0400
Committer: Brian Demers <bd...@apache.org>
Committed: Mon Oct 31 12:18:37 2016 -0400
----------------------------------------------------------------------
assets/images/logos.png | Bin 26302 -> 28746 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a239d2b9/assets/images/logos.png
----------------------------------------------------------------------
diff --git a/assets/images/logos.png b/assets/images/logos.png
index 9222b3b..5f1fdad 100644
Binary files a/assets/images/logos.png and b/assets/images/logos.png differ
[2/2] shiro-site git commit: Updated site for 1.4.0-RC2 release
Posted by bd...@apache.org.
Updated site for 1.4.0-RC2 release
Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/9935ed5b
Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/9935ed5b
Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/9935ed5b
Branch: refs/heads/master
Commit: 9935ed5b591673e9fac9c9c4ac6edb47eb4564ad
Parents: a239d2b
Author: Brian Demers <bd...@apache.org>
Authored: Mon Nov 14 17:09:36 2016 -0500
Committer: Brian Demers <bd...@apache.org>
Committed: Mon Nov 14 17:09:36 2016 -0500
----------------------------------------------------------------------
config.scms.groovy | 5 ++++
download.html.vtl | 47 ++++++++++++++++++++++++++++++
news.html | 71 +++++++++++++++++++++++++++++++++++++++++----
static/.htaccess.vtl | 20 +++++++++++++
templates/versions.vtl | 33 +++++++++++++++++++++
5 files changed, 171 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/9935ed5b/config.scms.groovy
----------------------------------------------------------------------
diff --git a/config.scms.groovy b/config.scms.groovy
index d906585..7a812e5 100644
--- a/config.scms.groovy
+++ b/config.scms.groovy
@@ -246,6 +246,11 @@ scms {
template = 'templates/none.vtl'
}
+ 'static/.htaccess.vtl' {
+ template = 'templates/none.vtl'
+ outputFileExtension = 'htaccess'
+ }
+
'**/*.html' {
template = 'templates/default.vtl'
model {
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/9935ed5b/download.html.vtl
----------------------------------------------------------------------
diff --git a/download.html.vtl b/download.html.vtl
index fbe8746..7fc8b48 100644
--- a/download.html.vtl
+++ b/download.html.vtl
@@ -72,6 +72,17 @@
<li><a href="#latestGit">${latestRelease} Git Source repository</a></li>
</ul>
</li>
+ #if( $earlyRelease )
+ <li>
+ <a href="#early">Early Access Release (${earlyRelease})</a>
+ <ul>
+ <li><a href="#earlyBinary">${latestRelease} Binary Distribution</a></li>
+ <li><a href="#earlySource">${latestRelease} Source Code Distribution</a></li>
+ <li><a href="#earlyGit">${latestRelease} Git Source repository</a></li>
+ </ul>
+ </li>
+ #end
+
<li><a href="#previous">Previous Releases</a>
<ul>
<li><a href="#1.2.xBinary">$shiro12x.version</a></li>
@@ -129,6 +140,42 @@ git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}
</code>
</pre>
+
+<h2><a name="early"></a>Early Access Release (${earlyRelease})</h2>
+<h3><a name="earlyBinary"></a>${earlyRelease} Binary Distribution</h3>
+
+<p>Associated documentation can be found <a href="documentation.html" title="Documentation">here</a></p>
+
+<p>To download the files directly as one .jar file just click the link in the "Artifact" column. If you would like
+ acquire Shiro through Maven, then please use the markup listed under "Maven Usage"</p>
+
+<p>
+</p>
+
+#artifactTable($shiro14x)
+
+<h3><a name="earlySource"></a>${earlyRelease} Source Code Distribution</h3>
+
+<p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
+
+<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip">zip</a>
+ (<a class="external-link"
+ href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip.asc">pgp</a>, <a
+ class="external-link"
+ href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip.md5">md5</a>, <a
+ class="external-link"
+ href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip.sha1">sha1</a>)
+</p>
+
+<h3><a name="earlyGit"></a>${earlyRelease} Git Source repository</h3>
+
+<p>The source can be cloned anonymously from Git with this command:</p>
+<pre><code style="bash">git clone https://github.com/apache/shiro.git
+git checkout shiro-root-${earlyRelease} -b shiro-root-${earlyRelease}
+</code>
+</pre>
+
+
<h2><a name="previous"></a>Previous Releases</h2>
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/9935ed5b/news.html
----------------------------------------------------------------------
diff --git a/news.html b/news.html
index fe5b127..ab26227 100644
--- a/news.html
+++ b/news.html
@@ -3,13 +3,74 @@
<p>Stay up to date with the latest news on the Apache Shiro Security Framework</p>
-Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors.
+<p>Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors.
-For more information on Shiro, please read the documentation.
+For more information on Shiro, please read the documentation.</p>
-Enjoy!
+<p>Enjoy!</p>
-The Apache Shiro Team
+<p>The Apache Shiro Team</p>
+
+
+<div class="blog-post-listing">
+
+ <div class="logo-heading-block">
+ <a class="blogHeading" id="1.4.0-RC2-released" href="#1.4.0-RC2-released">Apache Shiro 1.4.0-RC2 Released</a>
+ </div>
+
+ <div class="news-content">
+ <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.4.0-RC2. This is a feature release for 1.x.</p>
+
+ <p>This release includes 15 issues resolved since the 1.3.2 release and is available for Download now.</p>
+
+ <p>Of Note:
+ <ul>
+ <li>The core has been broken up into a fewer smaller modules (lang, crypto, config), but package names remain the same. Maven, Gradle, and Ivy users will NOT be effected.</li>
+ <li>New <a href="https://github.com/apache/shiro/tree/shiro-root-1.4.0-RC2/support/spring-boot">modules</a> for Spring Boot</li>
+ <li>New <a href="http://search.maven.org/#artifactdetails%7Corg.apache.shiro%7Cshiro-servlet-plugin%7C1.4.0-RC2%7Cjar">servlet fragment module</a></li>
+ <li>New module for JAX-RS (based off <a href="https://github.com/silb/shiro-jersey">https://github.com/silb/shiro-jersey</a>)</li>
+ <li>Guice 4 support</li>
+ <li>Shiro.ini string interpolation</li>
+ </ul>
+ </p>
+
+ <p>This release is an release candidate, so we encourage feedback on the new modules above.</p>
+
+ <p>Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors.</p>
+
+ <p>For more information on <a href="documentation.html">Shiro, please read the documentation.</a></p>
+
+ <p>Enjoy!</p>
+
+ <p>The Apache Shiro Team</p>
+</div>
+</div>
+
+
+<div class="blog-post-listing">
+
+ <div class="logo-heading-block">
+ <a class="blogHeading" id="1.3.2-released" href="#1.3.2-released">Apache Shiro 1.3.2 Released</a>
+ </div>
+
+ <div class="news-content">
+ <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.3.2.</p>
+
+ <p>This security release contains 1 fix since the 1.3.1 release.</p>
+
+ <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6802">CVE-2016-6802</a>:
+ <p>Apache Shiro before 1.3.2, when using a non-root servlet context path,
+ specifically crafted requests can be used to by pass some security servlet
+ filters, resulting in unauthorized access.</p>
+
+ <p>Release binaries (.jars) are also available through Maven Central and
+ source bundles through Apache distribution mirrors.</p>
+
+ <p>For more information on <a href="documentation.html">Shiro, please read the documentation.</a></p>
+
+ <p>The Apache Shiro Team</p>
+ </div>
+</div>
<div class="blog-post-listing">
@@ -24,7 +85,7 @@ The Apache Shiro Team
<p>Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors. </p>
- <p>For more information on <a class="external-link" href="http://shiro.apache.org/documentation.html" rel="nofollow">Shiro, please read the documentation.</a></p>
+ <p>For more information on <a href="documentation.html">Shiro, please read the documentation.</a></p>
<p>Enjoy!</p>
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/9935ed5b/static/.htaccess.vtl
----------------------------------------------------------------------
diff --git a/static/.htaccess.vtl b/static/.htaccess.vtl
new file mode 100644
index 0000000..a7d2c58
--- /dev/null
+++ b/static/.htaccess.vtl
@@ -0,0 +1,20 @@
+#parse( "templates/versions.vtl" )
+RedirectMatch /static/1.1.0(.*) /static/current$1
+RedirectMatch /static/1.0.0-incubating(.*) /static/current$1
+RedirectMatch /static/1.2.0(.*) /static/1.2.6$1
+
+RedirectMatch /static/1.2.1/shiro-quartz(.*) /static/1.2.6/shiro-quartz/$1
+RedirectMatch /static/1.2.1/shiro-samples(.*) /static/1.2.6/shiro-samples/$1
+RedirectMatch /static/1.2.1/shiro-ehcache(.*) /static/1.2.6/shiro-ehcache/$1
+RedirectMatch /static/1.2.1/shiro-cas(.*) /static/1.2.6/shiro-cas/$1
+RedirectMatch /static/1.2.1/shiro-aspectj(.*) /static/1.2.6/shiro-aspectj/$1
+RedirectMatch /static/1.2.1/shiro-spring(.*) /static/1.2.6/shiro-spring/$1
+RedirectMatch /static/1.2.1/shiro-guice(.*) /static/1.2.6/shiro-guice/$1
+RedirectMatch /static/1.2.1/shiro-web(.*) /static/1.2.6/shiro-web/$1
+RedirectMatch /static/1.2.1/shiro-features(.*) /static/1.2.6/shiro-features/$1
+
+
+RedirectMatch /static/(.*)/tools(.*) /static/$1/shiro-tools/$2
+
+RedirectMatch /static/current(.*) /static/${latestRelease}$1
+RedirectMatch /static/latest(.*) /static/${latestRelease}$1
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/9935ed5b/templates/versions.vtl
----------------------------------------------------------------------
diff --git a/templates/versions.vtl b/templates/versions.vtl
index fc5a033..10d824b 100644
--- a/templates/versions.vtl
+++ b/templates/versions.vtl
@@ -1,6 +1,8 @@
#set( $latestRelease = "1.3.2" )
#set( $versionInfo = {"1.3.2": { "releaseDate": "2016-09-12" } } )
+#set( $earlyRelease = "1.4.0-RC2" )
+
#set( $shiroCore = {"g":"org.apache.shiro", "a": "shiro-core", "type": "jar",
"description": 'Required in all environments. <a class="external-link" href="http://slf4j.org/">Slf4j</a>''s
<code>slf4j-api</code> jar and one of its binding jars is required. <code>commons-beanutils</code> is
@@ -9,6 +11,12 @@
#set ($shiroWeb = {"g": "org.apache.shiro", "a": "shiro-web", "type": "jar",
"description": "Enables support for web-based applications."})
+#set ($shiroServletPlugin = {"g": "org.apache.shiro", "a": "shiro-servlet-plugin", "type": "jar",
+ "description": "Servlet Fragment which configures Shiro's servlet filter."})
+
+#set ($shiroJaxrs = {"g": "org.apache.shiro", "a": "shiro-jaxrs", "type": "jar",
+ "description": "Enables support for JAX-RS applications."})
+
#set ($shiroAspectJ = {"g": "org.apache.shiro", "a": "shiro-aspectj", "type": "jar",
"description": 'Enables <a class="external-link" href="http://www.eclipse.org/aspectj/">AspectJ</a> support for Shiro AOP and Annotations.'})
@@ -34,6 +42,12 @@
#set ($shiroSpring = {"g": "org.apache.shiro", "a": "shiro-spring", "type": "jar",
"description": 'Enables <a class="external-link" href="https://spring.io/">Spring Framework</a> integration.'})
+#set ($shiroSpringBoot = {"g": "org.apache.shiro", "a": "shiro-spring-boot-starter", "type": "jar",
+ "description": '<a class="external-link" href="https://spring.io/">Spring Boot</a> starter.'})
+
+#set ($shiroSpringBootWeb = {"g": "org.apache.shiro", "a": "shiro-spring-boot-web-starter", "type": "jar",
+ "description": '<a class="external-link" href="https://spring.io/">Spring Boot</a> web starter.'})
+
#set ($shiroHasher = {"g": "org.apache.shiro.tools", "a": "shiro-tools-hasher", "c": "cli", "type": "jar", "gavAlt": '<b>Not Relevant</b>',
"description": "A command-line program to perform hashing (MD5, SHA, etc) for files, streams and passwords.
Note that this is a command line program and not intended to be used as a Maven/program
@@ -86,4 +100,23 @@
$shiroHasher
]} )
+#set( $shiro14x = {"version": $earlyRelease, "artifacts": [
+ $shiroAll,
+ $shiroCore,
+ $shiroWeb,
+ $shiroServletPlugin,
+ $shiroJaxrs,
+ $shiroAspectJ,
+ $shiroCas,
+ $shiroEhCache,
+ $shiroHazelcast,
+ $shiroFeatures,
+ $shiroGuice,
+ $shiroQuartz,
+ $shiroSpring,
+ $shiroSpringBoot,
+ $shiroSpringBootWeb,
+ $shiroHasher
+]} )
+