o Polished code
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@965076 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java b/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
index 4c52616..44b6836 100644
--- a/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
+++ b/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
@@ -44,12 +44,12 @@
public static final String POM = "pom.xml";
/**
- * Base directory.
+ * Output directory.
*
- * @parameter default-value="${basedir}"
+ * @parameter default-value="${project.build.directory}"
* @readonly
*/
- private String basedir;
+ private File outputDirectory;
/**
* The current Maven project.
@@ -161,10 +161,9 @@
final String finalName = project.getBuild().getFinalName();
- String outputDirectory = project.getBuild().getDirectory();
-
boolean batchMode = settings == null ? false : !settings.isInteractiveMode();
- List<File> files = BundleUtils.selectProjectFiles( new File( outputDirectory ), inputHandler, finalName, pom, getLog(), batchMode );
+ List<File> files =
+ BundleUtils.selectProjectFiles( outputDirectory, inputHandler, finalName, pom, getLog(), batchMode );
File bundle = new File( outputDirectory, finalName + "-bundle.jar" );
diff --git a/src/test/resources/unit/default-configuration/pom.xml b/src/test/resources/unit/default-configuration/pom.xml
index 8f05d27..a8c2215 100644
--- a/src/test/resources/unit/default-configuration/pom.xml
+++ b/src/test/resources/unit/default-configuration/pom.xml
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.repository.stubs.DefaultConfigurationMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/default-configuration</basedir>
+ <outputDirectory>${basedir}/target/test/unit/default-configuration/target</outputDirectory>
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/no-javadoc-sources/pom.xml b/src/test/resources/unit/no-javadoc-sources/pom.xml
index 787cd4b..2c58fc1 100644
--- a/src/test/resources/unit/no-javadoc-sources/pom.xml
+++ b/src/test/resources/unit/no-javadoc-sources/pom.xml
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.repository.stubs.NoJavadocSourcesMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/no-javadoc-sources</basedir>
+ <outputDirectory>${basedir}/target/test/unit/no-javadoc-sources/target</outputDirectory>
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/no-javadocjar/pom.xml b/src/test/resources/unit/no-javadocjar/pom.xml
index a991785..477d8b2 100644
--- a/src/test/resources/unit/no-javadocjar/pom.xml
+++ b/src/test/resources/unit/no-javadocjar/pom.xml
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.repository.stubs.NoJavadocJarMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/no-javadocjar</basedir>
+ <outputDirectory>${basedir}/target/test/unit/no-javadocjar/target</outputDirectory>
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/no-scm/pom.xml b/src/test/resources/unit/no-scm/pom.xml
index cf52ddf..8159fea 100644
--- a/src/test/resources/unit/no-scm/pom.xml
+++ b/src/test/resources/unit/no-scm/pom.xml
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.repository.stubs.NoScmMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/no-scm</basedir>
+ <outputDirectory>${basedir}/target/test/unit/no-scm/target</outputDirectory>
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/no-sourcesjar/pom.xml b/src/test/resources/unit/no-sourcesjar/pom.xml
index 93ba22b..aa66650 100644
--- a/src/test/resources/unit/no-sourcesjar/pom.xml
+++ b/src/test/resources/unit/no-sourcesjar/pom.xml
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.repository.stubs.NoSourcesJarMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/no-sourcesjar</basedir>
+ <outputDirectory>${basedir}/target/test/unit/no-sourcesjar/target</outputDirectory>
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/pom-only/pom.xml b/src/test/resources/unit/pom-only/pom.xml
index 01d08fc..4bcb0ec 100644
--- a/src/test/resources/unit/pom-only/pom.xml
+++ b/src/test/resources/unit/pom-only/pom.xml
@@ -10,7 +10,7 @@
<artifactId>maven-repository-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.repository.stubs.PomOnlyMavenProjectStub"/>
- <basedir>${basedir}/src/test/resources/unit/pom-only</basedir>
+ <outputDirectory>${basedir}/target/test/unit/pom-only/target</outputDirectory>
</configuration>
</plugin>
</plugins>
