From 81835fe8d0f870051d4a85d2c8680dda84022dfb Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Mon, 24 Oct 2016 21:02:28 -0400 Subject: [PATCH] Define versions in versions _include_ and generate the tables for the download.html --- download.html.vtl | 1001 ++++------------------------------------ templates/versions.vtl | 92 +++- 2 files changed, 168 insertions(+), 925 deletions(-) diff --git a/download.html.vtl b/download.html.vtl index bed82359c5..a54e670857 100644 --- a/download.html.vtl +++ b/download.html.vtl @@ -1,4 +1,52 @@ #parse("templates/includes.vtl") +#mdStyle() + +#macro(artifactTable, $versionObject) + + + + + + + + + + + #foreach($artifact in $versionObject.artifacts) + + #set($version = $versionObject.version) + + #if($artifact.c) + #set($classifier = "-$artifact.c") + #else + #set($classifier = "") + #end + + + + + + + + + #end + +
ArtifactMaven UsageNotes
+ $artifact.a + + #if($artifact.gavAlt) + $artifact.gavAlt + #else +

+<dependency>
+  <groupId>$artifact.g</groupId>
+  <artifactId>$artifact.a</artifactId>
+  <version>$version</version>
+</dependency>
+
+ #end + 		$artifact.description.replace('%version%', "$version")
+#end

Download Apache Shiro

@@ -27,19 +75,19 @@
  • Previous Releases
    • @@ -58,239 +106,8 @@

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Artifact Maven Usage Notes
    shiro-allNot Recommended Includes all binary functionality for Shiro (without - dependencies), useful in certain build environments (e.g. Ant). However, this is NOT - recommended in Maven builds as it does not retain correct dependency metadata, which can lead to - Maven working incorrectly. For Maven builds, it is highly recommended to specify individual - modules listed below as you require them. -
    shiro-core -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-core</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Required in all environments. Slf4j's - slf4j-api jar and one of its binding jars is required. commons-beanutils is - required only if using INI config. -
    shiro-web -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-web</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables support for web-based applications.
    shiro-aspectj -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-aspectj</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables AspectJ support for - Shiro AOP and Annotations. -
    shiro-cas -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-cas</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables Jasig CAS support. -
    - NOTE: - Shiro-CAS support is deprecated, support has been moved to the Apache Shiro based buji-pac4j project. -
    -
    shiro-ehcache -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-ehcache</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables Ehcache-based - famework caching. -
    shiro-hazelcast -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-hazelcast</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables Hazelcast-based - famework caching. -
    shiro-features -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-features</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		OSGi / Apache - Karaf integration. -
    shiro-guice -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-guice</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables Google Guice - integration. -
    shiro-quartz -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-quartz</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables Quartz-based scheduling - for Shiro native session validation. -
    shiro-spring -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-spring</artifactId>
-  <version>${latestRelease}</version>
-</dependency>
    -
    -
    -     		Enables Spring Framework - integration. -
    shiro-tools-hasher-cliNot Relevant 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 dependency. It is intended to be downloaded and executed: -
    -
    -
    -java -jar shiro-tools-hasher-${latestRelease}-cli.jar
-
    -
    -
    -
    -
    +#artifactTable($shiro13x)

    ${latestRelease} Source Code Distribution

    @@ -320,7 +137,7 @@ git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}

    Previous Releases

    -

    1.2.6 Binary Distribution

    +

    ${shiro12x.version} Binary Distribution

    Associated documentation can be found here

    @@ -329,245 +146,38 @@ git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Artifact Maven Usage Notes
    shiro-allNot Recommended Includes all binary functionality for Shiro (without - dependencies), useful in certain build environments (e.g. Ant). However, this is NOT - recommended in Maven builds as it does not retain correct dependency metadata, which can lead to - Maven working incorrectly. For Maven builds, it is highly recommended to specify individual - modules listed below as you require them. -
    shiro-core -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-core</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Required in all environments. Slf4j's - slf4j-api jar and one of its binding jars is required. commons-beanutils is - required only if using INI config. -
    shiro-web -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-web</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Enables support for web-based applications.
    shiro-aspectj -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-aspectj</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Enables AspectJ support for - Shiro AOP and Annotations. -
    shiro-cas -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-cas</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Enables Jasig CAS support. -
    shiro-ehcache -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-ehcache</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Enables Ehcache-based - famework caching. -
    shiro-features -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-features</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		OSGi / Apache - Karaf integration. -
    shiro-guice -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-guice</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Enables Google Guice - integration. -
    shiro-quartz -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-quartz</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Enables Quartz-based scheduling - for Shiro native session validation. -
    shiro-spring -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-spring</artifactId>
-  <version>1.2.6</version>
-</dependency>
    -
    -
    -     		Enables Spring Framework - integration. -
    shiro-tools-hasher-cliNot Relevant 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 dependency. It is intended to be downloaded and executed: -
    -
    -
    -java -jar shiro-tools-hasher-1.2.6-cli.jar
-
    -
    -
    -
    -
    +#artifactTable($shiro12x) -

    1.2.6 Source Code Distribution

    +

    ${shiro12x.version} Source Code Distribution

    The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:

    -

    zip +

    zip (pgp, pgp, md5, md5, sha1) + href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.sha1">sha1)

    -

    1.2.6 Git Source repository

    +

    ${shiro12x.version} Git Source repository

    The source can be cloned anonymously from Git with this command:

     git clone https://github.com/apache/shiro.git
-git checkout shiro-root-1.2.6 -b shiro-root-1.2.6
+git checkout shiro-root-${shiro12x.version} -b shiro-root-${shiro12x.version}
    -

    1.1.0

    +

    ${shiro11x.version}

    -

    1.1.0 Binary Distribution

    +

    ${shiro11x.version} Binary Distribution

    Associated documentation can be found here

    @@ -576,488 +186,31 @@ git checkout shiro-root-1.2.6 -b shiro-root-1.2.6

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Artifact Maven Usage Notes
    shiro-allNot Recommended Includes all binary functionality for Shiro (without - dependencies), useful in certain build environments (e.g. Ant). However, this is NOT - recommended in Maven builds as it does not retain correct dependency metadata, which can lead to - Maven working incorrectly. For Maven builds, it is highly recommended to specify individual - modules listed below as you require them. -
    shiro-core -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-core</artifactId>
-  <version>1.1.0</version>
-</dependency>
    -
    -
    -     		Required in all environments. Slf4j's - slf4j-api jar and one of its binding jars is required. commons-beanutils is - required only if using INI config. -
    shiro-web -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-web</artifactId>
-  <version>1.1.0</version>
-</dependency>
    -
    -
    -     		Enables support for web-based applications.
    shiro-aspectj -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-aspectj</artifactId>
-  <version>1.1.0</version>
-</dependency>
    -
    -
    -     		Enables AspectJ support for - Shiro AOP and Annotations. -
    shiro-ehcache -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-ehcache</artifactId>
-  <version>1.1.0</version>
-</dependency>
    -
    -
    -     		Enables Ehcache-based - famework caching. -
    shiro-quartz -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-quartz</artifactId>
-  <version>1.1.0</version>
-</dependency>
    -
    -
    -     		Enables Quartz-based scheduling - for Shiro native session validation. -
    shiro-spring -
    -
    -
    <dependency>
-  <groupId>org.apache.shiro</groupId>
-  <artifactId>shiro-spring</artifactId>
-  <version>1.1.0</version>
-</dependency>
    -
    -
    -     		Enables Spring Framework - integration. -
    -
    +#artifactTable($shiro11x) -

    1.1.0 Source Code Distribution

    +

    ${shiro11x.version} Source Code Distribution

    -

    The 1.1.0 source bundle requires JDK 1.5+ and Maven 2.2+ to build:

    +

    The ${shiro11x.version} source bundle requires JDK 1.5+ and Maven 2.2+ to build:

    zip (pgp, - md5, - sha1) + href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip">zip (pgp, + md5, + sha1)

    -

    1.1.0 Git Source repository

    +

    ${shiro11x.version} Git Source repository

    The source can be cloned anonymously from Git with this command:

     git clone https://github.com/apache/shiro.git
-git checkout shiro-root-1.1.0 -b shiro-root-1.1.0
+git checkout shiro-root-${shiro11x.version} -b shiro-root-${shiro11x.version}
    - - diff --git a/templates/versions.vtl b/templates/versions.vtl index aa2f42be02..3663a0d898 100644 --- a/templates/versions.vtl +++ b/templates/versions.vtl @@ -1,2 +1,92 @@ #set( $latestRelease = "1.3.2" ) -#set( $versionInfo = {"1.3.2": { "releaseDate": "2016-09-12" } } ) \ No newline at end of file +#set( $versionInfo = {"1.3.2": { "releaseDate": "2016-09-12" } } ) + +#set( $shiroCore = {"g":"org.apache.shiro", "a": "shiro-core", "type": "jar", + "description": 'Required in all environments. Slf4j''s + slf4j-api jar and one of its binding jars is required. commons-beanutils is + required only if using INI config.'}) + +#set ($shiroWeb = {"g": "org.apache.shiro", "a": "shiro-web", "type": "jar", + "description": "Enables support for web-based applications."}) + +#set ($shiroAspectJ = {"g": "org.apache.shiro", "a": "shiro-aspectj", "type": "jar", + "description": 'Enables AspectJ support for Shiro AOP and Annotations.'}) + +#set ($shiroCas = {"g": "org.apache.shiro", "a": "shiro-cas", "type": "jar", + "description": 'Enables Jasig CAS support. +
    + NOTE: + Shiro-CAS support is deprecated, support has been moved to the Apache Shiro based buji-pac4j project. +
    '}) + +#set ($shiroEhCache = {"g": "org.apache.shiro", "a": "shiro-ehcache", "type": "jar", + "description": 'Enables Ehcache-based famework caching.'}) + +#set ($shiroHazelcast = {"g": "org.apache.shiro", "a": "shiro-hazelcast", "type": "jar", + "description": 'Enables Hazelcast-based famework caching.'}) + +#set ($shiroFeatures = {"g": "org.apache.shiro", "a": "shiro-features", "type": "xml", + "description": 'OSGi / Apache Karaf integration.'}) + +#set ($shiroGuice = {"g": "org.apache.shiro", "a": "shiro-guice", "type": "jar", + "description": 'Enables Google Guice integration.'}) + +#set ($shiroQuartz = {"g": "org.apache.shiro", "a": "shiro-quartz", "type": "jar", + "description": 'Enables Quartz-based scheduling for Shiro native session validation.'}) + +#set ($shiroSpring = {"g": "org.apache.shiro", "a": "shiro-spring", "type": "jar", + "description": 'Enables Spring Framework integration.'}) + +#set ($shiroHasher = {"g": "org.apache.shiro.tools", "a": "shiro-tools-hasher", "c": "cli", "type": "jar", "gavAlt": 'Not Relevant', + "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 + dependency. It is intended to be downloaded and executed: + 
     java -jar shiro-tools-hasher-%version%-cli.jar
    "}) + +#set ($shiroAll = {"g": "org.apache.shiro", "a": "shiro-all", "type": "jar", "gavAlt": 'Not Recommended', + "description": 'Includes all binary functionality for Shiro (without dependencies), useful in certain build + environments (e.g. Ant). However, this is NOT recommended in Maven builds as it does not + retain correct dependency metadata, which can lead to Maven working incorrectly. For Maven builds, + it is highly recommended to specify individual modules listed below as you require them.'}) + + +#set( $shiro11x = {"version": "1.1.0", "artifacts": [ + $shiroAll, + $shiroCore, + $shiroWeb, + $shiroAspectJ, + $shiroEhCache, + $shiroQuartz, + $shiroSpring +]} ) + +#set( $shiro12x = {"version": "1.2.6", "artifacts": [ + $shiroAll, + $shiroCore, + $shiroWeb, + $shiroAspectJ, + $shiroCas, + $shiroEhCache, + $shiroFeatures, + $shiroGuice, + $shiroQuartz, + $shiroSpring, + $shiroHasher +]} ) + +#set( $shiro13x = {"version": $latestRelease, "artifacts": [ + $shiroAll, + $shiroCore, + $shiroWeb, + $shiroAspectJ, + $shiroCas, + $shiroEhCache, + $shiroHazelcast, + $shiroFeatures, + $shiroGuice, + $shiroQuartz, + $shiroSpring, + $shiroHasher +]} ) + +