You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/01/31 02:48:51 UTC
git commit: Fix Maven parameter syntax
Updated Branches:
refs/heads/master ca7f2a88d -> 50909ecfd
Fix Maven parameter syntax
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/50909ecf
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/50909ecf
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/50909ecf
Branch: refs/heads/master
Commit: 50909ecfd81757aa73042628f51908a5d6e8d221
Parents: ca7f2a8
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 31 02:47:31 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 31 02:47:31 2014 +0100
----------------------------------------------------------------------
.../karaf/tooling/commands/GenerateHelpMojo.java | 6 +++---
.../karaf/tooling/features/AddToRepositoryMojo.java | 2 +-
.../karaf/tooling/features/CreateKarMojo.java | 6 +++---
.../tooling/features/ExportFeatureMetaDataMojo.java | 2 +-
.../tooling/features/GenerateDescriptorMojo.java | 8 ++++----
.../karaf/tooling/features/InstallKarsMojo.java | 16 ++++++++--------
.../karaf/tooling/instances/CreateArchiveMojo.java | 9 +++------
.../org/apache/karaf/tooling/utils/MojoSupport.java | 6 +++---
8 files changed, 26 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
index 72ba9ad..7416640 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
@@ -56,7 +56,7 @@ public class GenerateHelpMojo extends AbstractMojo {
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
*/
protected MavenProject project;
@@ -71,7 +71,7 @@ public class GenerateHelpMojo extends AbstractMojo {
/**
* The output format
*
- * @parameter default-value="docbx" expression="${format}"
+ * @parameter default-value="docbx"
*/
protected String format;
@@ -86,7 +86,7 @@ public class GenerateHelpMojo extends AbstractMojo {
/**
* Includes the --help command output in the generated documentation
*
- * @parameter default_value="true"
+ * @parameter default-value="true"
*/
protected boolean includeHelpOption;
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
index b8ac820..315accf 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
@@ -40,7 +40,7 @@ import org.apache.maven.plugin.MojoFailureException;
public class AddToRepositoryMojo extends AbstractFeatureMojo {
/**
- * @parameter expression="${project.build.directory}/features-repo"
+ * @parameter default-value="${project.build.directory}/features-repo"
*/
protected File repository;
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
index 81d95bb..3297342 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
@@ -76,7 +76,7 @@ public class CreateKarMojo extends MojoSupport {
/**
* Directory containing the generated archive.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
*/
private File outputDirectory = null;
@@ -84,7 +84,7 @@ public class CreateKarMojo extends MojoSupport {
/**
* Name of the generated archive.
*
- * @parameter expression="${project.build.finalName}"
+ * @parameter default-value="${project.build.finalName}"
* @required
*/
private String finalName = null;
@@ -108,7 +108,7 @@ public class CreateKarMojo extends MojoSupport {
* Location of resources directory for additional content to include in the kar.
* Note that it includes everything under classes so as to include maven-remote-resources
*
- * @parameter expression="${project.build.directory}/classes"
+ * @parameter default-value="${project.build.directory}/classes"
*/
private File resourcesDir;
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
index 3c30832..f661381 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
@@ -59,7 +59,7 @@ public class ExportFeatureMetaDataMojo extends AbstractFeatureMojo {
/**
* Name of the file for exported feature meta data
*
- * @parameter expression="${project.build.directory}/features.xml"
+ * @parameter default-value="${project.build.directory}/features.xml"
*/
private File metaDataFile;
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index 670481f..94e4d44 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -187,7 +187,7 @@ public class GenerateDescriptorMojo extends AbstractLogEnabled implements Mojo {
/**
* (wrapper) The maven project.
*
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
* @readonly
*/
@@ -236,7 +236,7 @@ public class GenerateDescriptorMojo extends AbstractLogEnabled implements Mojo {
protected MavenResourcesFiltering mavenResourcesFiltering;
/**
- * @parameter expression="${session}"
+ * @parameter default-value="${session}"
* @required
* @readonly
*/
@@ -523,7 +523,7 @@ public class GenerateDescriptorMojo extends AbstractLogEnabled implements Mojo {
/**
* The character encoding scheme to be applied when filtering resources.
*
- * @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}"
+ * @parameter default-value="${project.build.sourceEncoding}"
*/
protected String encoding;
@@ -531,7 +531,7 @@ public class GenerateDescriptorMojo extends AbstractLogEnabled implements Mojo {
* Expression preceded with the String won't be interpolated
* \${foo} will be replaced with ${foo}
*
- * @parameter expression="${maven.resources.escapeString}"
+ * @parameter default-value="${maven.resources.escapeString}"
*/
protected String escapeString = "\\";
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
index 5e30c3f..98e7963 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
@@ -75,17 +75,17 @@ import org.sonatype.aether.util.artifact.DefaultArtifact;
public class InstallKarsMojo extends MojoSupport {
/**
- * Directory that resources are copied to during the build.
+ * Base directory used to copy the resources during the build (working directory).
*
- * @parameter expression="${project.build.directory}/assembly"
+ * @parameter default-value="${project.build.directory}/assembly"
* @required
*/
protected String workDirectory;
/**
- * features config file.
+ * Features configuration file (etc/org.apache.karaf.features.cfg).
*
- * @parameter expression="${project.build.directory}/assembly/etc/org.apache.karaf.features.cfg"
+ * @parameter default-value="${project.build.directory}/assembly/etc/org.apache.karaf.features.cfg"
* @required
*/
protected File featuresCfgFile;
@@ -93,13 +93,13 @@ public class InstallKarsMojo extends MojoSupport {
/**
* startup.properties file.
*
- * @parameter expression="${project.build.directory}/assembly/etc/startup.properties"
+ * @parameter default-value="${project.build.directory}/assembly/etc/startup.properties"
* @required
*/
protected File startupPropertiesFile;
/**
- * default start level for bundles in features that dont' specify it
+ * default start level for bundles in features that don't specify it.
*
* @parameter
*/
@@ -112,9 +112,9 @@ public class InstallKarsMojo extends MojoSupport {
protected boolean dontAddToStartup;
/**
- * Directory that resources are copied to during the build.
+ * Directory used during build to construction the Karaf system repository.
*
- * @parameter expression="${project.build.directory}/assembly/system"
+ * @parameter default-value="${project.build.directory}/assembly/system"
* @required
*/
protected File systemDirectory;
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
index 4c2d3a6..9b0dba8 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
@@ -16,8 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-
package org.apache.karaf.tooling.instances;
import java.io.File;
@@ -49,17 +47,16 @@ public class CreateArchiveMojo extends MojoSupport {
/**
* The target directory of the project.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
* @readonly
*/
private File destDir;
-
/**
* The location of the server repository.
*
- * @parameter expression="${project.build.directory}/assembly"
+ * @parameter default-value="${project.build.directory}/assembly"
* @required
*/
private File targetServerDirectory;
@@ -67,7 +64,7 @@ public class CreateArchiveMojo extends MojoSupport {
/**
* The target file to set as the project's artifact.
*
- * @parameter expression="${project.file}"
+ * @parameter default-value="${project.file}"
* @required
*/
private File targetFile;
http://git-wip-us.apache.org/repos/asf/karaf/blob/50909ecf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
index d4735c8..0da8109 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
@@ -64,7 +64,7 @@ public abstract class MojoSupport extends AbstractMojo {
/**
* The Maven project.
*
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
* @readonly
*/
@@ -73,7 +73,7 @@ public abstract class MojoSupport extends AbstractMojo {
/**
* Directory that resources are copied to during the build.
*
- * @parameter expression="${project.build.directory}/${project.artifactId}-${project.version}-installer"
+ * @parameter default-value="${project.build.directory}/${project.artifactId}-${project.version}-installer"
* @required
*/
protected File workDirectory;
@@ -118,7 +118,7 @@ public abstract class MojoSupport extends AbstractMojo {
/**
* The Maven session.
*
- * @parameter expression="${session}"
+ * @parameter default-value="${session}"
* @readonly
* @required
*/