Partial fix for GRAILS-6469 "Codehaus changed root CA to untrusted SmartCom: affects plugin resolution and publishing". Stops publishings zips with the HTTPS url as the download location. Also fixes the issue of leaving zip distribution in trunk by deleting the zip after it has been copied to the tagged branches.

Author: graemerocher

scripts/ReleasePlugin.groovy

@@ -200,9 +200,24 @@ def publishZipOnlyRelease() {
 
     tagPluginRelease()
     modifyOrCreatePluginList()
+	deleteZipFromTrunk()
     println "Successfully published zip-only plugin release."
 }
 
+def deleteZipFromTrunk() {
+    def commitClient = new SVNCommitClient((ISVNAuthenticationManager) authManager, null)
+
+    if (!commitMessage) askForMessage()
+	if(pluginZip) {
+		def pluginZipFile = new File(pluginZip)
+		def zipLocation = SVNURL.parseURIDecoded("${remoteLocation}/trunk/${pluginZipFile.name}")
+	    try { commitClient.doDelete([zipLocation] as SVNURL[], commitMessage) }
+	    catch (SVNException e) {
+	        // ok - the zip doesn't exist yet
+	    }			
+	}
+}
+
 def updateLocalZipAndXml(File localWorkingCopy) {
     ant.copy(file: pluginZip, todir: localWorkingCopy, overwrite:true)
     ant.copy(file: "${basedir}/plugin.xml", todir: localWorkingCopy, overwrite:true)
@@ -255,7 +270,7 @@ target(modifyOrCreatePluginList:"Updates the remote plugin.xml descriptor or cre
             }
         }
 
-        def publisher = new DefaultPluginPublisher(remoteRevision, pluginSVN)
+        def publisher = new DefaultPluginPublisher(remoteRevision, pluginDistURL)
         def updatedList = publisher.publishRelease(pluginName, new FileSystemResource(pluginsListFile), !skipLatest)
         pluginsListFile.withWriter("UTF-8") { w ->
             publisher.writePluginList(updatedList, w)