Ticket #1147 (closed defect: fixed)

Update on the Updater issues ;-)

The Update-the-Updater-first functionality has been reinstated. It had been working correctly, if it was not for the change before beta2 to support file names with version numbers in them. On a high note, that functionality was now moved into the core.

Funny side note: at some stage, I had to test this interactively, which I did by downloading the complete update site locally, redirecting the local db.xml.gz 's update site URL to the local site, and then running this script every time I changed the source code:

(cd core/updater/core/ && maven) &&
(cd ui/awt-swing/swing/updater/ && maven) &&
cp /path/to/fiji/modules/imagej2/core/updater/core/target/ij-updater-core-2.0.0-SNAPSHOT.jar /path/to/fiji/modules/imagej2/ui/awt-swing/swing/updater/target/ij-ui-swing-updater-2.0.0-SNAPSHOT.jar ImageJ.app/jars/ &&
sha1="$(./ImageJ.app/ImageJ-linux64 ImageJ.app/calculate-checksums.bsh jars/ij-updater-core-2.0.0-SNAPSHOT.jar 2> /dev/null | sed 's/.* //')" &&
gunzip update-site/db.xml.gz &&
sed -i "s/be02a995d8f202946c255fa71f5a14aa57a3e1d9/$sha1/" update-site/db.xml &&
gzip update-site/db.xml &&
./ImageJ.app/ImageJ-linux64

This requires ImageJ.app/calculate-checksums.bsh of course, which I derived from Fiji's version:

/*/. 2>/dev/null; exec "$(dirname "$0")"/ImageJ-linux64 -Dpatch.ij1=false -- "$0" "$@" # exec with ImageJ */

import imagej.updater.core.Checksummer;
import imagej.updater.core.FilesCollection;
import imagej.updater.core.FileObject;

import imagej.updater.util.StderrProgress;

import java.util.Arrays;

dbPath = System.getProperty("ij.dir") + "/db.xml.gz";

plugins = new FilesCollection(new File(System.getProperty("ij.dir")));
progress = new StderrProgress();
checksummer = new Checksummer(plugins, progress);

if (bsh.args.length > 0) {
        checksummer.updateFromLocal(Arrays.asList(bsh.args));
}
else
        checksummer.updateFromLocal();
plugins.sort();
iter = plugins.iterator();
while (iter.hasNext()) {
        FileObject plugin = iter.next();
        print(plugin + " " + plugin.current.checksum);
}

On the issue I described as "override empty metadata from update site": metadata is no longer easily forgotten (when updating files from -beta1 to -beta2, it forgot all the metadata I had put into db.xml.gz in the first upload).

With the newest changes on the updater branch, metadata is picked up from a pom.xml if one is contained in a .jar.

Fixed in 81fdfc4d68ab2d715e914cbfc9e40397665c4a4c