From 06d62438802c0ea484766af58b772ead48912e51 Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 11 Nov 2022 13:32:43 -0500 Subject: [PATCH 1/2] maven: Avoid incorrect use of variable Signed-off-by: BJ Hargrave --- .../java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java b/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java index 527da020b5..24f0c9f546 100644 --- a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java +++ b/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java @@ -666,7 +666,7 @@ private File getArtifactFile() { private String getExtension(String type) { ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler(type); if (artifactHandler != null) { - type = artifactHandler.getExtension(); + return artifactHandler.getExtension(); } return type; } From d0996e02be420b678b6cb9749ffb1664140bfb0e Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 11 Nov 2022 13:54:51 -0500 Subject: [PATCH 2/2] build: Publish biz.aQute.bnd.javagen Signed-off-by: BJ Hargrave --- biz.aQute.bnd.javagen/bnd.bnd | 6 +----- biz.aQute.bnd.javagen/test/.gitignore | 0 .../test/biz/aQute/bnd/javagen/ExampleTest.java | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) create mode 100644 biz.aQute.bnd.javagen/test/.gitignore delete mode 100644 biz.aQute.bnd.javagen/test/biz/aQute/bnd/javagen/ExampleTest.java diff --git a/biz.aQute.bnd.javagen/bnd.bnd b/biz.aQute.bnd.javagen/bnd.bnd index 3e9fb5aedf..30fb926def 100644 --- a/biz.aQute.bnd.javagen/bnd.bnd +++ b/biz.aQute.bnd.javagen/bnd.bnd @@ -14,8 +14,4 @@ aQute.lib.*, \ aQute.libg.* -# Don't release since this project is only used in testing --buildrepo: --releaserepo: --nojunit: true --nojunitosgi: true +# Tested in biz.aQute.bndall.tests/test/biz/aQute/bnd/project/ProjectGenerateTest.java diff --git a/biz.aQute.bnd.javagen/test/.gitignore b/biz.aQute.bnd.javagen/test/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/biz.aQute.bnd.javagen/test/biz/aQute/bnd/javagen/ExampleTest.java b/biz.aQute.bnd.javagen/test/biz/aQute/bnd/javagen/ExampleTest.java deleted file mode 100644 index 4ad89de95b..0000000000 --- a/biz.aQute.bnd.javagen/test/biz/aQute/bnd/javagen/ExampleTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package biz.aQute.bnd.javagen; - -public class ExampleTest { - -}