Merge pull request #5426 from bjhargrave/build-fixes

Build fixes
bndtools · Nov 11, 2022 · d936a95 · d936a95
2 parents 05c321d + d0996e0
commit d936a95
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git 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
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
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
@@ -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;
 	}