You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/07/24 17:40:52 UTC

svn commit: r1506600 - in /httpcomponents/project-release-tools/trunk: buildSrc/src/main/groovy/HCPlugin.groovy rc.gradle

Author: olegk
Date: Wed Jul 24 15:40:51 2013
New Revision: 1506600

URL: http://svn.apache.org/r1506600
Log:
Fixed bug in svnmucc task declaration; added RC qualifier property

Modified:
    httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy
    httpcomponents/project-release-tools/trunk/rc.gradle

Modified: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy?rev=1506600&r1=1506599&r2=1506600&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCPlugin.groovy Wed Jul 24 15:40:51 2013
@@ -60,13 +60,15 @@ class HCPlugin implements Plugin<Project
         HCProject rc = new HCProject(new URI(HC_RC), project)
         project.extensions.add('rc', rc)
 
-        String rcQualifier = null
-        String path = rc.repo.path
-        if (path) {
-            String name = new File(path).name
-            if (name) {
-                ArtifactVersion ver = new DefaultArtifactVersion(name)
-                rcQualifier = ver.qualifier
+        String rcQualifier = project.getProperties().get('HC_RC_QUALIFIER')
+        if (!rcQualifier) {
+            String path = rc.repo.path
+            if (path) {
+                String name = new File(path).name
+                if (name) {
+                    ArtifactVersion ver = new DefaultArtifactVersion(name)
+                    rcQualifier = ver.qualifier
+                }
             }
         }
         project.extensions.add('rcQualifier', rcQualifier ?: "RC" )

Modified: httpcomponents/project-release-tools/trunk/rc.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/rc.gradle?rev=1506600&r1=1506599&r2=1506600&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/rc.gradle (original)
+++ httpcomponents/project-release-tools/trunk/rc.gradle Wed Jul 24 15:40:51 2013
@@ -160,7 +160,7 @@ task addChanges(type: SvnScheduleForAddi
     repo = tasks.prepareStage.repo
 }
 
-task svnmucc() {
+task svnmucc() << {
     println 'svnmucc file'
     println '----------------8<-------------[ cut here ]------------------'
     println "rm"