hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1503722 - in /httpcomponents/project-release-tools/trunk: ./ buildSrc/src/main/groovy/
Date Tue, 16 Jul 2013 14:09:50 GMT
Author: olegk
Date: Tue Jul 16 14:09:50 2013
New Revision: 1503722

URL: http://svn.apache.org/r1503722
Log:
Moved most of the build script initialization plumbing from 'site' and 'rc' scripts to the
respective plugins maving the build scripts a little more readable and Gradle-y

Added:
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy
      - copied, changed from r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy
      - copied, changed from r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCSitePlugin.groovy
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy
      - copied, changed from r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy
      - copied, changed from r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy
Removed:
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy
Modified:
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Digest.groovy
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Mvn.groovy
    httpcomponents/project-release-tools/trunk/rc.gradle
    httpcomponents/project-release-tools/trunk/site.gradle

Modified: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Digest.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Digest.groovy?rev=1503722&r1=1503721&r2=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Digest.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Digest.groovy Tue
Jul 16 14:09:50 2013
@@ -28,8 +28,6 @@
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.PublishArtifact
-import org.gradle.api.file.FileCollection
-import org.gradle.api.file.FileTree
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputFiles
 import org.gradle.api.tasks.TaskAction

Copied: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy
(from r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy)
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy?p2=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy&p1=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy&r1=1503044&r2=1503722&rev=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy Tue
Jul 16 14:09:50 2013
@@ -25,30 +25,36 @@
  *
  */
 
-class HCProject {
-    Pom pom
-    File localDir
-    URI repo
+import org.gradle.api.InvalidUserDataException
+import org.gradle.api.Plugin
+import org.gradle.api.Project
 
-}
+/**
+ * This plugin adds the following extensions to the project model:
+ *
+ * 'mvn' - Maven wrapper
+ * 'rc' - Release candidate project metadata
+ */
+class HCPlugin implements Plugin<Project> {
 
-static File checkout(URI location, File buildDir) {
-    File dst
-    if (!location.absolute) {
-        dst = new File(location.toString())
-    } else {
-        String l = location.getPath()
-        if (l.startsWith('/repos/asf/httpcomponents/')) {
-            l = l - '/repos/asf/httpcomponents/'
+    void apply(Project project) {
+        String MAVEN_HOME = project.getProperties().get('MAVEN_HOME')
+        if (!MAVEN_HOME) {
+            throw InvalidUserDataException("MAVEN_HOME not set")
         }
-        if (l.endsWith('/')) {
-            l = l.substring(0, l.length() - 1)
+        File mvnHomeDir = new File(MAVEN_HOME)
+        if (!mvnHomeDir.exists()) {
+            throw InvalidUserDataException("Maven not found at ${mvnHomeDir}")
         }
-        dst = new File(buildDir, l.replace('/', '-'))
-        if (!dst.exists()) {
-            dst.mkdirs()
-            Svn.checkout(location, dst)
+        Mvn mvn = new Mvn(project, mvnHomeDir)
+        project.extensions.add('mvn', mvn)
+
+        String HC_RC = project.getProperties().get('HC_RC')
+        if (!HC_RC) {
+            throw InvalidUserDataException("HC_RC not set")
         }
+        HCProject rc = new HCProject(new URI(HC_RC), project)
+        project.extensions.add('rc', rc)
     }
-    return dst
+
 }

Copied: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy
(from r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy)
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy?p2=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy&p1=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy&r1=1503044&r2=1503722&rev=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy Tue
Jul 16 14:09:50 2013
@@ -25,30 +25,39 @@
  *
  */
 
+import org.gradle.api.Project
+
 class HCProject {
-    Pom pom
-    File localDir
-    URI repo
 
-}
+    final URI repo
+    final File localDir
+    final Pom pom
 
-static File checkout(URI location, File buildDir) {
-    File dst
-    if (!location.absolute) {
-        dst = new File(location.toString())
-    } else {
-        String l = location.getPath()
-        if (l.startsWith('/repos/asf/httpcomponents/')) {
-            l = l - '/repos/asf/httpcomponents/'
-        }
-        if (l.endsWith('/')) {
-            l = l.substring(0, l.length() - 1)
-        }
-        dst = new File(buildDir, l.replace('/', '-'))
-        if (!dst.exists()) {
-            dst.mkdirs()
-            Svn.checkout(location, dst)
+    public HCProject(URI repo, Project project) {
+        this.repo = repo
+        this.localDir = findLocalDir(repo, project.buildDir)
+        this.pom = Mvn.parsePom(this.localDir)
+    }
+
+    static File findLocalDir(URI repo, File buildDir) {
+        File localDir
+        if (!repo.absolute) {
+            localDir = new File(repo.toString())
+        } else {
+            String l = repo.getPath()
+            if (l.startsWith('/repos/asf/httpcomponents/')) {
+                l = l - '/repos/asf/httpcomponents/'
+            }
+            if (l.endsWith('/')) {
+                l = l.substring(0, l.length() - 1)
+            }
+            localDir = new File(buildDir, l.replace('/', '-'))
+            if (!localDir.exists()) {
+                println("Checking out from SVN repository at ${repo}")
+                Svn.checkout(repo, localDir)
+            }
         }
+        localDir
     }
-    return dst
+
 }

Added: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCSitePlugin.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCSitePlugin.groovy?rev=1503722&view=auto
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCSitePlugin.groovy
(added)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCSitePlugin.groovy
Tue Jul 16 14:09:50 2013
@@ -0,0 +1,82 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+import org.gradle.api.InvalidUserDataException
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+ * This plugin adds the following extensions to the project model:
+ *
+ * 'mvn' - Maven wrapper
+ * 'website' - Website project metadata
+ * 'publishedReleases' - Project metadata of the published releases to be added to the site
+ * 'staging' - Local staging location
+ */
+class HCSitePlugin implements Plugin<Project> {
+
+    void apply(Project project) {
+        String MAVEN_HOME = project.getProperties().get('MAVEN_HOME')
+        if (!MAVEN_HOME) {
+            throw InvalidUserDataException("MAVEN_HOME not set")
+        }
+        File mvnHomeDir = new File(MAVEN_HOME)
+        if (!mvnHomeDir.exists()) {
+            throw InvalidUserDataException("Maven not found at ${mvnHomeDir}")
+        }
+        Mvn mvn = new Mvn(project, mvnHomeDir)
+        project.extensions.add('mvn', mvn)
+
+        String HC_PROJECT_SITE = project.getProperties().get('HC_PROJECT_SITE')
+        if (!HC_PROJECT_SITE) {
+            throw InvalidUserDataException("HC_PROJECT_SITE not set")
+        }
+        URI websiteURI = new URI(HC_PROJECT_SITE)
+
+        HCProject website = new HCProject(new URI(HC_PROJECT_SITE), project)
+        project.extensions.add('website', website)
+
+        String HC_PUBLISHED_RELEASES = project.getProperties().get('HC_PUBLISHED_RELEASES')
+        List<URI> uris = HC_PUBLISHED_RELEASES ?
+            HC_PUBLISHED_RELEASES.split(/[ \t]+/).collect { new URI(it) } : []
+
+        List<HCProject> publishedReleases = []
+        for (URI uri: uris) {
+            publishedReleases.add(new HCProject(uri, project))
+        }
+        project.extensions.add('publishedReleases', publishedReleases)
+
+        String HC_SITE_STAGING = project.getProperties().get('HC_SITE_STAGING')
+        if (!HC_SITE_STAGING) {
+            throw InvalidUserDataException("HC_SITE_STAGING not set")
+        }
+        URI stagingURI = new URI(HC_SITE_STAGING)
+        File staging = HCProject.findLocalDir(stagingURI, project.buildDir)
+        project.extensions.add('staging', staging)
+    }
+
+}

Modified: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Mvn.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Mvn.groovy?rev=1503722&r1=1503721&r2=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Mvn.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Mvn.groovy Tue Jul
16 14:09:50 2013
@@ -27,36 +27,6 @@
 
 import org.gradle.api.Project
 
-class PomArtifact {
-    String groupId
-    String id
-    String version
-}
-
-class Pom {
-
-    PomArtifact parent
-    PomArtifact artifact
-    List<String> modules
-
-    String getGroupId() {
-        if (artifact.groupId) {
-            artifact.groupId
-        } else {
-            parent ? parent.groupId : null
-        }
-    }
-
-    String getArtifactId() {
-        artifact.id
-    }
-
-    String getVersion() {
-        artifact.version
-    }
-
-}
-
 class Mvn {
 
     final Project project
@@ -77,25 +47,19 @@ class Mvn {
         }
     }
 
-    Pom parsePom(File dir) {
+    static Pom parsePom(File dir) {
         File pomFile = new File(dir, 'pom.xml')
-        Pom result = new Pom()
         def pomModel = new XmlSlurper().parse(pomFile)
         def el = pomModel['parent']
-        if (el) {
-            PomArtifact pomParent = new PomArtifact()
-            pomParent.groupId = el.groupId
-            pomParent.id = el.artifactId
-            pomParent.version = el.version
-            result.parent = pomParent
-        }
-        PomArtifact artifact = new PomArtifact()
-        artifact.groupId = pomModel.groupId
-        artifact.id = pomModel.artifactId
-        artifact.version = pomModel.version
-        result.artifact = artifact
-        result.modules = pomModel.modules.module*.text()
-        return result
+        PomArtifact pomParent = el ? new PomArtifact(
+                el.groupId.text(),
+                el.artifactId.text(),
+                el.version.text()) : null
+        PomArtifact artifact = new PomArtifact(
+                pomModel.groupId.text(),
+                pomModel.artifactId.text(),
+                pomModel.version.text())
+        new Pom(pomParent, artifact, pomModel.modules.module*.text())
     }
 
 }

Copied: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy (from
r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy)
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy?p2=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy&p1=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy&r1=1503044&r2=1503722&rev=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy Tue Jul
16 14:09:50 2013
@@ -25,30 +25,36 @@
  *
  */
 
-class HCProject {
-    Pom pom
-    File localDir
-    URI repo
+class Pom {
 
-}
+    private final PomArtifact parent
+    private final PomArtifact artifact
+    private final List<String> modules
 
-static File checkout(URI location, File buildDir) {
-    File dst
-    if (!location.absolute) {
-        dst = new File(location.toString())
-    } else {
-        String l = location.getPath()
-        if (l.startsWith('/repos/asf/httpcomponents/')) {
-            l = l - '/repos/asf/httpcomponents/'
-        }
-        if (l.endsWith('/')) {
-            l = l.substring(0, l.length() - 1)
-        }
-        dst = new File(buildDir, l.replace('/', '-'))
-        if (!dst.exists()) {
-            dst.mkdirs()
-            Svn.checkout(location, dst)
+    Pom(PomArtifact parent, PomArtifact artifact, modules) {
+        this.parent = parent
+        this.artifact = artifact
+        this.modules = modules
+    }
+
+    String getGroupId() {
+        if (artifact.groupId) {
+            artifact.groupId
+        } else {
+            parent ? parent.groupId : null
         }
     }
-    return dst
+
+    String getArtifactId() {
+        artifact.id
+    }
+
+    String getVersion() {
+        artifact.version
+    }
+
+    List<String> getModules() {
+        modules
+    }
+
 }

Copied: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy
(from r1503044, httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy)
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy?p2=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy&p1=httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy&r1=1503044&r2=1503722&rev=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HC.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy
Tue Jul 16 14:09:50 2013
@@ -25,30 +25,16 @@
  *
  */
 
-class HCProject {
-    Pom pom
-    File localDir
-    URI repo
+class PomArtifact {
 
-}
+    final String groupId
+    final String id
+    final String version
 
-static File checkout(URI location, File buildDir) {
-    File dst
-    if (!location.absolute) {
-        dst = new File(location.toString())
-    } else {
-        String l = location.getPath()
-        if (l.startsWith('/repos/asf/httpcomponents/')) {
-            l = l - '/repos/asf/httpcomponents/'
-        }
-        if (l.endsWith('/')) {
-            l = l.substring(0, l.length() - 1)
-        }
-        dst = new File(buildDir, l.replace('/', '-'))
-        if (!dst.exists()) {
-            dst.mkdirs()
-            Svn.checkout(location, dst)
-        }
+    PomArtifact(String groupId, String id, String version) {
+        this.groupId = groupId
+        this.id = id
+        this.version = version
     }
-    return dst
+
 }

Modified: httpcomponents/project-release-tools/trunk/rc.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/rc.gradle?rev=1503722&r1=1503721&r2=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/rc.gradle (original)
+++ httpcomponents/project-release-tools/trunk/rc.gradle Tue Jul 16 14:09:50 2013
@@ -25,32 +25,20 @@
  *
  */
 
+apply plugin: HCPlugin
 apply plugin: 'signing'
 
+println("========================================================")
+println("Release candidate ${rc.pom.artifactId}:${rc.pom.version}")
+println("========================================================")
+
 repositories {
     mavenLocal()
 }
 
-if (!MAVEN_HOME) {
-    throw InvalidUserDataException("MAVEN_HOME not set")
-}
-File mvnHomeDir = file(MAVEN_HOME)
-if (!mvnHomeDir.exists()) {
-    throw InvalidUserDataException("Maven not found at ${mvnHomeDir}")
-}
-Mvn mvn = new Mvn(project, mvnHomeDir)
-
-if (!HC_RC) {
-    throw InvalidUserDataException("HC_RC not set")
-}
-URI rcURI = new URI(HC_RC)
-File rcDir = HC.checkout(rcURI, project.buildDir)
-Pom rcPom = mvn.parsePom(rcDir)
-HCProject rc = new HCProject(pom: rcPom, localDir: rcDir, repo: rcURI)
-
 Configuration binCfg = project.configurations.create('rc')
+// Declare dependencies (excluding OSGi bundle)
 rc.pom.modules.each { String submodule ->
-    // Exclude OSGi bundle
     if (!submodule.endsWith('-osgi')) {
         project.dependencies.add(
                 binCfg.name,
@@ -58,64 +46,52 @@ rc.pom.modules.each { String submodule -
     }
 }
 
-task generate << {
-    logger.info("Generating RC artifacts ${rc.pom.artifactId}:${rc.pom.version}")
-    mvn.exec(rc.localDir,
-            'clean', 'install', 'site', 'javadoc:aggregate')
+task generate() << {
+    mvn.exec(rc.localDir, 'clean', 'install', 'site', 'javadoc:aggregate')
 }
 
 task distWinBin(type: Zip) {
     with docs(rc, Line.CRLF), atrifacts(configurations.rc)
-    destinationDir = file("${buildDir}/dists")
-    baseName = rc.pom.artifactId
-    version = rc.pom.version
     classifier = 'bin'
 }
 
 task distUxBin(type: Tar) {
     with docs(rc, Line.LF), atrifacts(configurations.rc)
-    destinationDir = file("${buildDir}/dists")
-    baseName = rc.pom.artifactId
-    version = rc.pom.version
     classifier = 'bin'
-    compression = Compression.GZIP
-    extension = "tar.gz"
 }
 
 task distWinOSGiBin(type: Zip) {
     with docs(rc, Line.CRLF), osgiBundle(rc)
-    destinationDir = file("${buildDir}/dists")
-    baseName = rc.pom.artifactId
-    version = rc.pom.version
     classifier = 'osgi-bin'
 }
 
 task distUxOSGiBin(type: Tar) {
     with docs(rc, Line.LF), osgiBundle(rc)
-    destinationDir = file("${buildDir}/dists")
-    baseName = rc.pom.artifactId
-    version = rc.pom.version
     classifier = 'osgi-bin'
-    compression = Compression.GZIP
-    extension = "tar.gz"
 }
 
 task distWinSrc(type: Zip) {
     with sources(rc, Line.CRLF)
-    destinationDir = file("${buildDir}/dists")
-    baseName = rc.pom.artifactId
-    version = rc.pom.version
     classifier = 'src'
 }
 
 task distUxSrc(type: Tar) {
     with sources(rc, Line.LF)
-    destinationDir = file("${buildDir}/dists")
-    baseName = rc.pom.artifactId
-    version = rc.pom.version
     classifier = 'src'
-    compression = Compression.GZIP
-    extension = "tar.gz"
+}
+
+tasks.withType(Zip) { Zip zip ->
+    zip.baseName = rc.pom.artifactId
+    zip.version = rc.pom.version
+    zip.destinationDir = file("${buildDir}/dists")
+}
+
+tasks.withType(Tar) { Tar tar ->
+    tar.baseName = rc.pom.artifactId
+    tar.version = rc.pom.version
+    tar.extension = "tar.gz"
+    tar.compression = Compression.GZIP
+    tar.destinationDir = file("${buildDir}/dists")
 }
 
 configurations {

Modified: httpcomponents/project-release-tools/trunk/site.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/site.gradle?rev=1503722&r1=1503721&r2=1503722&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/site.gradle (original)
+++ httpcomponents/project-release-tools/trunk/site.gradle Tue Jul 16 14:09:50 2013
@@ -25,38 +25,14 @@
  *
  */
 
-if (!MAVEN_HOME) {
-    throw InvalidUserDataException("MAVEN_HOME not set")
-}
-File mvnHomeDir = file(MAVEN_HOME)
-if (!mvnHomeDir.exists()) {
-    throw InvalidUserDataException("Maven not found at ${mvnHomeDir}")
-}
-Mvn mvn = new Mvn(project, mvnHomeDir)
-
-if (!HC_SITE_STAGING) {
-    throw InvalidUserDataException("HC_SITE_STAGING not set")
-}
-URI stagingURI = new URI(HC_SITE_STAGING)
-File staging = HC.checkout(stagingURI, project.buildDir)
+apply plugin: HCSitePlugin
 
-if (!HC_PROJECT_SITE) {
-    throw InvalidUserDataException("HC_PROJECT_SITE not set")
-}
-URI websiteURI = new URI(HC_PROJECT_SITE)
-File websiteDir = HC.checkout(websiteURI, project.buildDir)
-Pom websitePom = mvn.parsePom(websiteDir)
-HCProject website = new HCProject(pom: websitePom, localDir: websiteDir, repo: websiteURI)
-
-List<URI> uris = HC_PUBLISHED_RELEASES ?
-    HC_PUBLISHED_RELEASES.split(/[ \t]+/).collect { new URI(it) } : []
-
-List<HCProject> publishedReleases = []
-for (URI uri: uris) {
-    File releaseDir = HC.checkout(uri, project.buildDir)
-    Pom releasePom = mvn.parsePom(releaseDir)
-    publishedReleases.add(new HCProject(pom: releasePom, localDir: releaseDir, repo: uri))
+println("========================================================")
+println("Web site ${website.pom.artifactId}:${website.pom.version}")
+for (HCProject release: publishedReleases) {
+    println("Published release ${release.pom.artifactId}:${release.pom.version}")
 }
+println("========================================================")
 
 task clean << {
     if (project.buildDir.exists()) {
@@ -65,18 +41,14 @@ task clean << {
 }
 
 task generate << {
-    logger.info("Generating website content ${website.pom.artifactId}:${website.pom.version}")
     Svn.update(website.localDir)
     mvn.exec(website.localDir, 'clean', 'site')
     for (HCProject release: publishedReleases) {
-        logger.info("Generating published release content ${release.pom.artifactId}:${release.pom.version}")
         mvn.exec(release.localDir, 'clean', 'site')
     }
 }
 
 task stage << {
-    logger.info("Staging website content ${website.pom.artifactId}:${website.pom.version}")
-
     copy {
         into staging
         with siteContent(website)



Mime
View raw message