Make proper use of @Parameter(property="...")
diff --git a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java b/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
index 5e4dbad..6c34a8a 100644
--- a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
+++ b/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
@@ -38,7 +38,7 @@
@Mojo(name="post-process-classes", defaultPhase=LifecyclePhase.PROCESS_CLASSES)
public class PostProcessMojo extends AbstractMojo {
- @Parameter(defaultValue="${project.build.outputDirectory}", required=true, readonly=true)
+ @Parameter(property="project.build.outputDirectory", required=true, readonly=true)
private File classesDir;
@Override
diff --git a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java b/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
index c2894f6..9d97d33 100644
--- a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
+++ b/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
@@ -49,18 +49,15 @@
@Parameter(property="locales")
private String locales;
- @Parameter(defaultValue="${project}", required=true, readonly=true)
+ @Parameter(property="project", required=true, readonly=true)
private MavenProject project;
- @Parameter(defaultValue="${reactorProjects}", required=true, readonly=true)
+ @Parameter(property="reactorProjects", required=true, readonly=true)
private List<MavenProject> reactorProjects;
- @Parameter(defaultValue="${localRepository}", required=true, readonly=true)
+ @Parameter(property="localRepository", required=true, readonly=true)
private ArtifactRepository localRepository;
- @Parameter(defaultValue="${project.remoteArtifactRepositories}", required=true, readonly=true)
- private List<ArtifactRepository> repositories;
-
@Parameter(defaultValue="${basedir}/src/site")
private File siteDirectory;
@@ -73,7 +70,7 @@
try {
decorationModel = siteTool.getDecorationModel(siteDirectory,
siteTool.getSiteLocales(locales).get(0),
- project, reactorProjects, localRepository, repositories);
+ project, reactorProjects, localRepository, project.getRemoteArtifactRepositories());
} catch (SiteToolException ex) {
throw new MojoExecutionException("SiteToolException: " + ex.getMessage(), ex);
}
diff --git a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/sources/PostProcessMojo.java b/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/sources/PostProcessMojo.java
index 8a39160..f904f2c 100644
--- a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/sources/PostProcessMojo.java
+++ b/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/sources/PostProcessMojo.java
@@ -49,18 +49,12 @@
@Mojo(name="post-process-sources-jar", defaultPhase=LifecyclePhase.PACKAGE, requiresDependencyResolution=ResolutionScope.COMPILE_PLUS_RUNTIME)
public class PostProcessMojo extends AbstractMojo {
- @Parameter(defaultValue="${project}", readonly=true, required=true)
+ @Parameter(property="project", readonly=true, required=true)
private MavenProject project;
- @Parameter(defaultValue="${session}", readonly=true, required=true)
+ @Parameter(property="session", readonly=true, required=true)
private MavenSession session;
- @Parameter(defaultValue="${project.build.directory}", readonly=true, required=true)
- private File outputDirectory;
-
- @Parameter(defaultValue="${project.build.finalName}", readonly=true, required=true)
- private String finalName;
-
@Component
private ArtifactResolver artifactResolver;
@@ -81,8 +75,8 @@
} catch (IOException ex) {
throw new MojoExecutionException("Error reading jar: " + ex.getMessage(), ex);
}
- File sourcesJar = new File(outputDirectory, finalName + "-sources.jar");
- File postProcessedSourcesJar = new File(outputDirectory, finalName + "-post-processed-sources.jar");
+ File sourcesJar = new File(project.getBuild().getDirectory(), project.getBuild().getFinalName() + "-sources.jar");
+ File postProcessedSourcesJar = new File(project.getBuild().getDirectory(), project.getBuild().getFinalName() + "-post-processed-sources.jar");
try (JarOutputStream out = new JarOutputStream(new FileOutputStream(postProcessedSourcesJar))) {
processSourceJar(sourcesJar, sources, true, out);
ArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME);
