sha1: add missing hex param

and deprecate ${js} macro because of removed script engine

Signed-off-by: Christoph Rueger <[email protected]>

Author: chrisrueger

biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java

@@ -3283,9 +3283,16 @@ public String _sha1(String args[]) throws Exception {
 				throw new FileNotFoundException("From sha1, not found " + args[1]);
 
 			IO.copy(r.openInputStream(), digester);
+
+			boolean hex = args.length > 2 && args[2].equals("hex");
+			if (hex)
+				return Hex.toHexString(digester.digest()
+					.digest());
+
 			return Base64.encodeBase64(digester.digest()
 				.digest());
 		}
+
 	}
 
 	public Descriptor getDescriptor(String descriptor) {

biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java

@@ -1931,6 +1931,10 @@ public String _split(String[] args) throws Exception {
 
 	static final String _jsHelp = "${js [;<js expr>...]}";
 
+	/**
+	 * @deprecated javascript script engine removed in Java 15
+	 */
+	@Deprecated
 	public Object _js(String[] args) throws Exception {
 		verifyCommand(args, _jsHelp, null, 2, Integer.MAX_VALUE);