Le 29/01/2012 01:09, [email protected] a ecrit : > Author: sebb > Date: Sun Jan 29 01:09:43 2012 > New Revision: 1237186 > > URL: http://svn.apache.org/viewvc?rev=1237186&view=rev > Log: > Fix sign_dist to work with Java 1.5 > Fix bug - did not wait for process to finish > Don't sign .sha files >
I just finish a new release snapshot process with maven tasks / java 5. Signing the files works fine. https://repository.apache.org/content/groups/snapshots-group/org/apache/jmeter/ApacheJMeter/2.6-SNAPSHOT/ApacheJMeter-2.6-20120129.102601-9.jar (etc) Milamber > Modified: > jmeter/trunk/build.xml > > Modified: jmeter/trunk/build.xml > URL: > http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1237186&r1=1237185&r2=1237186&view=diff > ============================================================================== > --- jmeter/trunk/build.xml (original) > +++ jmeter/trunk/build.xml Sun Jan 29 01:09:43 2012 > @@ -2469,7 +2469,12 @@ run JMeter unless all the JMeter jars ar > <target name="sign_dist" > description="Sign release artifacts in dist and dist/maven. Usage: > ant sign_dist -Dgpg.keyname=key-id [-Dgpg.secretKeyring=path-to-keyring] > "> > <scriptdef name="gpg" language="beanshell"> > - <classpath path="${lib.dir}/${beanshell.jar}"/> > + <classpath> > + <pathelement location="${lib.dir}/${beanshell.jar}"/> > + <!-- Needed to work with Java 1.5 --> > + <pathelement location="${lib.dir}/${apache-bsf.jar}"/> > + <pathelement location="${lib.dir}/${commons-logging.jar}"/> > + </classpath> > <element name="fileset" type="fileset"/> > <![CDATA[ > int execcode( String command ) // helper > @@ -2485,14 +2490,15 @@ run JMeter unless all the JMeter jars ar > while( (line=din.readLine()) != null ) { > print(line); > } > - return this.proc.exitValue(); > + return this.proc.waitFor(); > } > keyname = project.getProperty("gpg.keyname"); > - if (keyname == void) { > + // Java 1.6 returns void, Java 1.5 returns null > + if (keyname == void || keyname == null) { > self.fail("Please provide the gpg.keyname property"); > } > keyring = project.getProperty("gpg.secretKeyring"); > - if (keyring == void) { > + if (keyring == void || keyring == null) { > keyring = "secring.gpg"; // the default > } > sep=java.io.File.separator; > @@ -2518,8 +2524,8 @@ run JMeter unless all the JMeter jars ar > ]]> > </scriptdef> > <gpg> > - <fileset dir="${dist.dir}" includes="*.*" excludes="*.asc *.md5 > *.sha1"/> > - <fileset dir="${maven.dir}" includes="*.*" excludes="*.asc *.md5 > *.sha1"/> > + <fileset dir="${dist.dir}" includes="*.*" excludes="*.asc *.md5 > *.sha1 *.sha"/> > + <fileset dir="${maven.dir}" includes="*.*" excludes="*.asc *.md5 > *.sha1 *.sha"/> > </gpg> > </target> > </project> > > > >
