Skip to content

Commit b9da98e

Browse files
committed
maven: Fix bnd-run-maven-plugin bndrun file selection
The bndrun configuration parameter is of type File which means maven when resolve relative paths against ${project.basedir}. So we don’t need to worry about trying to do this. Signed-off-by: BJ Hargrave <[email protected]>
1 parent 0c76117 commit b9da98e

File tree

1 file changed

+2
-7
lines changed
  • maven/bnd-run-maven-plugin/src/main/java/aQute/bnd/maven/run/plugin

1 file changed

+2
-7
lines changed

maven/bnd-run-maven-plugin/src/main/java/aQute/bnd/maven/run/plugin/RunMojo.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
101101

102102
Operation operation = getOperation();
103103

104-
Bndruns bndruns = new Bndruns();
105-
bndruns.addFile(bndrun);
106-
List<File> bndrunFiles = bndruns.getFiles(project.getBasedir(), "*.bndrun");
107-
108-
File runFile = bndrunFiles.get(0);
109-
logger.info("Running {}:", runFile);
110-
errors += container.execute(runFile, "run", targetDir, operation);
104+
logger.info("Running {}:", bndrun);
105+
errors += container.execute(bndrun, "run", targetDir, operation);
111106
} catch (Exception e) {
112107
throw new MojoExecutionException(e.getMessage(), e);
113108
}

0 commit comments

Comments
 (0)