You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2018/10/10 22:32:24 UTC

svn commit: r1843518 - in /felix/trunk/dependencymanager/release: build.gradle check_staged_release.sh

Author: pderop
Date: Wed Oct 10 22:32:23 2018
New Revision: 1843518

URL: http://svn.apache.org/viewvc?rev=1843518&view=rev
Log:
FELIX-5955: Move changelog.txt to toplevel project dir. FELIX-5960: Do not supply MD5 checksum

Modified:
    felix/trunk/dependencymanager/release/build.gradle
    felix/trunk/dependencymanager/release/check_staged_release.sh

Modified: felix/trunk/dependencymanager/release/build.gradle
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/release/build.gradle?rev=1843518&r1=1843517&r2=1843518&view=diff
==============================================================================
--- felix/trunk/dependencymanager/release/build.gradle (original)
+++ felix/trunk/dependencymanager/release/build.gradle Wed Oct 10 22:32:23 2018
@@ -88,7 +88,7 @@ task makeStaging {
     doLast {
     description = 'Packages the source and binary distributions.'
 
-    // Package source and source bin dependencies distributions.
+    // Package source distributions.
     logger.lifecycle("    Packaging source distributions.")
     def topdir="org.apache.felix.dependencymanager-" + dmRelease
     ant.zip(destfile: "staging/"+topdir+'-src.zip') {
@@ -96,6 +96,7 @@ task makeStaging {
 		zipfileset(dir: '..', prefix: topdir+"-src", includes: '*.gradle,*.properties')
 		zipfileset(dir: 'resources/src', prefix: topdir+"-src", includes: '*')
 		ant.zipfileset(dir: '..', prefix: topdir+"-src", includes: 'gradlew')
+		ant.zipfileset(dir: '..', prefix: topdir+"-src", includes: 'changelog.txt')
     		ant.zipfileset(dir: '../.gradle-wrapper', prefix: topdir+"-src/.gradle-wrapper", includes: 'gradle-wrapper.properties')
 		new File('.').eachFile { 
 	    	    if(new File(it, 'bnd.bnd').exists()) {	    		
@@ -189,12 +190,6 @@ task signStaging {
 	    		ant.arg(line: details.file.name)
 		}
 
-		ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".md5") { 
-	    		ant.arg(line: '--print-md')
-	    		ant.arg(line: 'MD5')
-	    		ant.arg(line: details.file.name)
-		}
-
 		ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".sha1") {
 	    		ant.arg(line: '--print-md')
 	    		ant.arg(line: 'SHA1')

Modified: felix/trunk/dependencymanager/release/check_staged_release.sh
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/release/check_staged_release.sh?rev=1843518&r1=1843517&r2=1843518&view=diff
==============================================================================
--- felix/trunk/dependencymanager/release/check_staged_release.sh (original)
+++ felix/trunk/dependencymanager/release/check_staged_release.sh Wed Oct 10 22:32:23 2018
@@ -107,8 +107,6 @@ for f in `find . -type f | grep -v '\.\(
 
     echo -e "    ASC: \c"
     checkSig $f
-    echo -e "    MD5: \c"
-    checkSum $f "$f.md5" MD5
     echo -e "    SHA1: \c"
     checkSum $f "$f.sha1" SHA1
     echo -e "    SHA512: \c"