From 6862a075aed7008c0fdf839b737e758ba1996f82 Mon Sep 17 00:00:00 2001 From: Peter Kriens Date: Fri, 21 Jul 2023 17:35:57 +0200 Subject: [PATCH 1/3] --- Signed-off-by: Peter Kriens Signed-off-by: Peter Kriens --- biz.aQute.bndlib/src/aQute/bnd/build/Project.java | 2 ++ biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java | 1 + 2 files changed, 3 insertions(+) diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java index c81154e3b9..aea67d7960 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java @@ -1727,6 +1727,7 @@ public Parameters getInstallRepositories() { private void install(RepositoryPlugin repo, Processor context, File f, Attrs value) throws Exception { try (Processor p = new Processor(context)) { + p.use(context); p.getProperties() .putAll(value); PutOptions options = new PutOptions(); @@ -1736,6 +1737,7 @@ private void install(RepositoryPlugin repo, Processor context, File f, Attrs val } catch (Exception e) { exception(e, "Cannot install %s into %s because %s", f, repo.getName(), e); } + context.getInfo(p, f.getName() + ":"); } } diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java index faeeb58639..bbc1c5f762 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java @@ -418,6 +418,7 @@ public void use(Processor reporter) { setTrace(reporter.isTrace()); setExceptions(reporter.isExceptions()); setFailOk(reporter.isFailOk()); + setBase(reporter.getBase()); } public static File getFile(File base, String file) { From 47c55e9cc30d148bad8f6f2127e48fce71447b1b Mon Sep 17 00:00:00 2001 From: Peter Kriens Date: Fri, 21 Jul 2023 17:36:45 +0200 Subject: [PATCH 2/3] Maven release archive option The archive option used the context given in the RepositoryPlugin.put as the base processor. This is true for the release process but the `-buildrepo` option had a special install method in Project. This method created a processor per file. This copied processor did not have the same file base nor did it collect the warnings and errors. --- Signed-off-by: Peter Kriens Signed-off-by: Peter Kriens --- docs/_instructions/maven-release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_instructions/maven-release.md b/docs/_instructions/maven-release.md index d8606fb598..31f84a5374 100644 --- a/docs/_instructions/maven-release.md +++ b/docs/_instructions/maven-release.md @@ -12,7 +12,7 @@ Though this instruction is not specific for a plugin, it was developed in conjun -maven-release ::= ( 'local'|'remote' ( ';' snapshot )? ) ( ',' option )* snapshot ::= - option ::= sources | javadoc | pom | sign | extra* + option ::= sources | javadoc | pom | sign | archive* archive ::= 'archive' ( ';path=' ( PATH | '{' PATH '}' )? ( ';classifier=' maven-classifier )? From 2266e61af9056429edfa3ffe4db048297c3ccfb2 Mon Sep 17 00:00:00 2001 From: Peter Kriens Date: Mon, 24 Jul 2023 10:14:37 +0200 Subject: [PATCH 3/3] Setting the base in Processor.use(...) was too much --- Signed-off-by: Peter Kriens Signed-off-by: Peter Kriens --- biz.aQute.bndlib/src/aQute/bnd/build/Project.java | 2 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java index aea67d7960..c4338e8954 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java @@ -1727,7 +1727,7 @@ public Parameters getInstallRepositories() { private void install(RepositoryPlugin repo, Processor context, File f, Attrs value) throws Exception { try (Processor p = new Processor(context)) { - p.use(context); + p.setBase(context.getBase()); p.getProperties() .putAll(value); PutOptions options = new PutOptions(); diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java index bbc1c5f762..faeeb58639 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java @@ -418,7 +418,6 @@ public void use(Processor reporter) { setTrace(reporter.isTrace()); setExceptions(reporter.isExceptions()); setFailOk(reporter.isFailOk()); - setBase(reporter.getBase()); } public static File getFile(File base, String file) {