From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Dec 2023 05:39:21 +0000 (+0100)
Subject: Merge tag 'v2.3.9' into testing
X-Git-Tag: v2.1.5~1
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=c5fcf8644b6a8e6f0881f4fa9a224fd87124058c;hp=c8473aa8de8ab0c9db5c2fa0fa7f08fc750df4c6;p=cc0%2Fargeo-build.git

Merge tag 'v2.3.9' into testing
---

diff --git a/repackage.mk b/repackage.mk
index 511ad2c..5a14bb7 100644
--- a/repackage.mk
+++ b/repackage.mk
@@ -43,8 +43,8 @@ uninstall:
 # so that we don't repackage a category if it hasn't changed
 $(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
 $(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
-	$(ARGEO_REPACKAGE) $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
-	touch $(BUILD_BASE)/repackaged
+	@$(ARGEO_REPACKAGE) $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
+	@touch $(BUILD_BASE)/repackaged
 
 $(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
 	@rm -rf $(dir $@)
@@ -52,5 +52,5 @@ $(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
 	@touch $@
 
 clean:
-	$(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category))
-	rm -f $(BUILD_BASE)/repackaged
+	@$(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category))
+	@rm -f $(BUILD_BASE)/repackaged
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index 5ec42c4..9ba0e10 100644
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,6 +1,6 @@
 major=2
 minor=3
-micro=8
+micro=9
 qualifier=
 
 SPDX-License-Identifier=CC0-1.0
\ No newline at end of file
diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 9ebbfd4..34477cf 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -309,7 +309,7 @@ public class Make {
 		}
 		CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join();
 		long duration = System.currentTimeMillis() - begin;
-		logger.log(INFO, "Packaging took " + duration + " ms");
+		logger.log(DEBUG, "Packaging took " + duration + " ms");
 	}
 
 	/** Install the bundles. */
@@ -729,8 +729,8 @@ public class Make {
 			}
 
 			long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
-			logger.log(INFO, "Make.java action '" + action + "' succesfully completed after " + (jvmUptime / 1000) + "."
-					+ (jvmUptime % 1000) + " s");
+			logger.log(INFO, "Make.java action '" + action + "' successfully completed after " + (jvmUptime / 1000)
+					+ "." + (jvmUptime % 1000) + " s");
 		} catch (Exception e) {
 			long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
 			logger.log(ERROR, "Make.java action '" + action + "' failed after " + (jvmUptime / 1000) + "."
diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 6f5fbf8..5b5247b 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -438,7 +438,7 @@ public class Repackage {
 				if (artifact.getVersion() == null) {
 					artifact.setVersion(m2Version);
 				} else {
-					logger.log(WARNING, p.getFileName() + " : Using version " + artifact.getVersion()
+					logger.log(DEBUG, p.getFileName() + " : Using version " + artifact.getVersion()
 							+ " specified in descriptor rather than " + m2Version + " specified in " + COMMON_BND);
 				}
 
@@ -578,9 +578,9 @@ public class Repackage {
 					}
 
 					if (entry.getName().endsWith("NOTICE") || entry.getName().endsWith("NOTICE.txt")
-							|| entry.getName().endsWith("LICENSE") || entry.getName().endsWith("LICENSE.md")
-							|| entry.getName().endsWith("LICENSE-notice.md") || entry.getName().endsWith("COPYING")
-							|| entry.getName().endsWith("COPYING.LESSER")) {
+							|| entry.getName().endsWith("NOTICE.md") || entry.getName().endsWith("LICENSE")
+							|| entry.getName().endsWith("LICENSE.md") || entry.getName().endsWith("LICENSE-notice.md")
+							|| entry.getName().endsWith("COPYING") || entry.getName().endsWith("COPYING.LESSER")) {
 						Path artifactOriginDir = bundleDir.resolve(ARGEO_ORIGIN).resolve(artifact.getGroupId())
 								.resolve(artifact.getArtifactId());
 						Path target = artifactOriginDir.resolve(entry.getName());
@@ -1343,15 +1343,17 @@ public class Repackage {
 	}
 
 	/**
-	 * Effectively download. Synchronised in order to avoid downloading twice in
-	 * parallel.
+	 * Effectively download an archive.
 	 */
-	synchronized Path downloadArchive(URL url, Path dir) throws IOException {
+	Path downloadArchive(URL url, Path dir) throws IOException {
 		return download(url, dir, (String) null);
 	}
 
-	/** Effectively download. */
-	Path download(URL url, Path dir, String name) throws IOException {
+	/**
+	 * Effectively download. Synchronised in order to avoid downloading twice in
+	 * parallel.
+	 */
+	synchronized Path download(URL url, Path dir, String name) throws IOException {
 
 		Path dest;
 		if (name == null) {