From a64b04afa49d0610672aef39ee8a05fdb15d9294 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Mon, 5 Nov 2012 10:21:01 +0100
Subject: [PATCH] Prefix zip archives with 'spring-framework'

Prior to this change, zip archives were named

   spring-${version}-${classifier}.zip

e.g.:
 - spring-3.2.0.RC1-dist.zip
 - spring-3.2.0.RC1-docs.zip
 - spring-3.2.0.RC1-schema.zip

This commit updates the Gradle build script to ensure that the fully-
qualified 'spring-framework' name is used consistently, such that names
follow the pattern

   spring-framework-${version}-${classifier}.zip

This includes the naming of the root-level directory within the -dist
zip.

Issue: SPR-9954
---
 build.gradle | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index aa9b657402..fee0541a9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -683,9 +683,10 @@ configure(rootProject) {
 
     task docsZip(type: Zip) {
         group = 'Distribution'
+        baseName = 'spring-framework'
         classifier = 'docs'
         description = "Builds -${classifier} archive containing api and reference " +
-            "for deployment at static.springframework.org/spring-framework/docs."
+            "for deployment at http://static.springframework.org/spring-framework/docs."
 
         from('src/dist') {
             include 'changelog.txt'
@@ -702,9 +703,10 @@ configure(rootProject) {
 
     task schemaZip(type: Zip) {
         group = 'Distribution'
+        baseName = 'spring-framework'
         classifier = 'schema'
         description = "Builds -${classifier} archive containing all " +
-            "XSDs for deployment at static.springframework.org/schema."
+            "XSDs for deployment at http://springframework.org/schema."
 
         subprojects.each { subproject ->
             def Properties schemas = new Properties();
@@ -729,11 +731,12 @@ configure(rootProject) {
 
     task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
         group = 'Distribution'
+        baseName = 'spring-framework'
         classifier = 'dist'
         description = "Builds -${classifier} archive, containing all jars and docs, " +
                       "suitable for community download page."
 
-        ext.baseDir = "${project.name}-${project.version}";
+        ext.baseDir = "${baseName}-${project.version}";
 
         from('src/dist') {
             include 'readme.txt'
@@ -768,6 +771,7 @@ configure(rootProject) {
     // Not published by default; only for use when building from source.
     task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
         group = 'Distribution'
+        baseName = 'spring-framework'
         classifier = 'dist-with-deps'
         description = "Builds -${classifier} archive, containing everything " +
             "in the -${distZip.classifier} archive plus all runtime dependencies."