[Git][java-team/maven-debian-helper][master] Use the plugin annotations instead of the javadoc tags in the Maven mojos

Emmanuel Bourg gitlab at salsa.debian.org
Thu Jun 28 13:29:22 BST 2018


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-debian-helper


Commits:
200093e2 by Emmanuel Bourg at 2018-06-28T14:28:46+02:00
Use the plugin annotations instead of the javadoc tags in the Maven mojos

- - - - -


15 changed files:

- debian-maven-plugin/pom.xml
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveCompileMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveRuntimeMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveTestMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
- debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java
- debian/changelog
- maven-packager-utils/pom.xml
- maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
- maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
- pom.xml


Changes:

=====================================
debian-maven-plugin/pom.xml
=====================================
--- a/debian-maven-plugin/pom.xml
+++ b/debian-maven-plugin/pom.xml
@@ -23,6 +23,10 @@
             <artifactId>maven-core</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
@@ -18,26 +18,27 @@ package org.debian.maven.plugin;
 
 import java.io.File;
 
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
 /**
  * Install the javadoc jar files into the debian/ directory
  *
  * @author Ludovic Claude
- * @goal install-doc
  */
+ at Mojo(name = "install-doc")
 public class InstallDocMojo extends SysInstallDocMojo {
 
     /**
      * Maven repository root
-     *
-     * @parameter expression="${maven.repo.local}"
      */
+    @Parameter(defaultValue = "${maven.repo.local}")
     private File mavenRepoLocal;
 
     /**
      * If true, use local Maven repository for installation
-     *
-     * @parameter expression="${use.maven.repo.local}"
      */
+    @Parameter(property = "use.maven.repo.local")
     private boolean useMavenRepoLocal;
 
     // ----------------------------------------------------------------------


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallMojo.java
@@ -18,25 +18,25 @@ package org.debian.maven.plugin;
 
 import java.io.File;
 
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
 /**
  * Install pom and jar files into the debian/ directory
- *
- * @goal install
  */
+ at Mojo(name = "install")
 public class InstallMojo extends SysInstallMojo {
 
     /**
      * Maven repository root
-     *
-     * @parameter expression="${maven.repo.local}"
      */
+    @Parameter(defaultValue = "${maven.repo.local}")
     private File mavenRepoLocal;
 
     /**
      * If true, use local Maven repository for installation
-     *
-     * @parameter expression="${use.maven.repo.local}"
      */
+    @Parameter(property = "use.maven.repo.local")
     private boolean useMavenRepoLocal;
 
     // ----------------------------------------------------------------------


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveCompileMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveCompileMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveCompileMojo.java
@@ -16,13 +16,13 @@
 
 package org.debian.maven.plugin;
 
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
 /**
  * Resolves compile dependencies
- *
- * @goal resolve-compile
- * @requiresDependencyResolution compile
- * @aggregator true
  */
+ at Mojo(name = "resolve-compile", aggregator = true, requiresDependencyResolution = ResolutionScope.COMPILE)
 public class ResolveCompileMojo extends ResolveNoneMojo
 {
 }


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java
@@ -18,13 +18,12 @@ package org.debian.maven.plugin;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
 
 /**
  * Dummy goal that just reads the pom.xml files including parents
- *
- * @goal resolve-none
- * @aggregator true
  */
+ at Mojo(name = "resolve-none", aggregator = true)
 public class ResolveNoneMojo extends AbstractMojo {
     
     public void execute() throws MojoExecutionException {


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveRuntimeMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveRuntimeMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveRuntimeMojo.java
@@ -16,13 +16,13 @@
 
 package org.debian.maven.plugin;
 
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
 /**
  * Resolves runtime dependencies
- *
- * @goal resolve-runtime
- * @requiresDependencyResolution runtime
- * @aggregator true
  */
+ at Mojo(name = "resolve-runtime", aggregator = true, requiresDependencyResolution = ResolutionScope.RUNTIME)
 public class ResolveRuntimeMojo extends ResolveNoneMojo
 {
 }


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveTestMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveTestMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveTestMojo.java
@@ -16,13 +16,13 @@
 
 package org.debian.maven.plugin;
 
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
 /**
  * Resolves test dependencies
- *
- * @goal resolve-test
- * @requiresDependencyResolution test
- * @aggregator true
  */
+ at Mojo(name="resolve-test", aggregator = true, requiresDependencyResolution = ResolutionScope.TEST)
 public class ResolveTestMojo extends ResolveNoneMojo
 {
 }


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
@@ -18,12 +18,14 @@ package org.debian.maven.plugin;
 
 import java.io.IOException;
 
+import org.apache.maven.plugins.annotations.Mojo;
+
 /**
  * Install the javadoc jar.
  *
  * @author Ludovic Claude
- * @goal sysinstall-doc
  */
+ at Mojo(name = "sysinstall-doc")
 public class SysInstallDocMojo extends SysInstallMojo {
 
     {


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
@@ -27,6 +27,8 @@ import java.util.regex.Pattern;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.io.RawInputStreamFacade;
 import org.debian.maven.repo.Dependency;
@@ -36,9 +38,8 @@ import org.debian.maven.repo.POMOptions;
 
 /**
  * Install pom and jar files into the /usr/share/hierarchy
- *
- * @goal sysinstall
  */
+ at Mojo(name = "sysinstall")
 public class SysInstallMojo extends AbstractMojo {
 
     /** Regex for detecting that package is a libXXX-java package */
@@ -53,134 +54,96 @@ public class SysInstallMojo extends AbstractMojo {
 
     /**
      * groupId
-     *
-     * @parameter expression="${project.groupId}"
-     * @required
-     * @readonly
      */
+    @Parameter(defaultValue = "${project.groupId}", readonly = true, required = true)
     private String groupId;
 
     /**
      * artifactId
-     *
-     * @parameter expression="${project.artifactId}"
-     * @required
-     * @readonly
      */
+    @Parameter(defaultValue = "${project.artifactId}", readonly = true, required = true)
     private String artifactId;
 
     /**
      * destGroupId
-     *
-     * @parameter expression="${project.groupId}"
-     * @required
      */
+    @Parameter(defaultValue = "${project.groupId}", required = true)
     private String destGroupId;
 
     /**
      * destArtifactId
-     *
-     * @parameter expression="${project.artifactId}"
-     * @required
      */
+    @Parameter(defaultValue = "${project.artifactId}", required = true)
     private String destArtifactId;
 
     /**
      * version
-     *
-     * @parameter expression="${project.version}"
-     * @required
-     * @readonly
      */
+    @Parameter(defaultValue = "${project.version}", readonly = true, required = true)
     private String version;
 
     /**
      * debianVersion
-     *
-     * @parameter
      */
+    @Parameter
     private String debianVersion;
 
     /**
      * directory where the current pom.xml can be found
-     *
-     * @parameter expression="${basedir}"
-     * @required
-     * @readonly
      */
+    @Parameter(defaultValue = "${basedir}", readonly = true, required = true)
     private File basedir;
 
     /**
      * directory of the jar file
-     *
-     * @parameter expression="${project.build.directory}"
-     * @required
-     * @readonly
      */
+    @Parameter(defaultValue = "${project.build.directory}", readonly = true, required = true)
     private String jarDir;
 
     /**
      * finalname of the artifact
-     *
-     * @parameter expression="${project.build.finalName}"
-     * @required
-     * @readonly
      */
+    @Parameter(defaultValue = "${project.build.finalName}", readonly = true, required = true)
     private String finalName;
 
     /**
      * Debian directory
-     *
-     * @parameter expression="${debian.dir}"
      */
+    @Parameter(property = "debian.dir")
     private File debianDir;
 
     /**
      * Debian package (send from command line)
-     *
-     * @parameter expression="${debian.package}"
      */
+    @Parameter(property = "debian.package")
     private String debianPackage;
 
     /**
      * Debian package destination (set by xxx.poms file).
      * By default, equals to <code>debianPackage</code> attribute.
-     *
-     * @parameter expression="${debian.package}"
      */
+    @Parameter(property = "debian.package")
     private String destPackage;
 
-    /**
-     * @parameter expression="${maven.rules}" default-value="maven.rules"
-     * @required
-     */
+    @Parameter(property = "maven.rules", defaultValue = "maven.rules", required = true)
     private String mavenRules;
 
-    /**
-     * @parameter expression="${maven.ignoreRules}" default-value="maven.ignoreRules"
-     * @required
-     */
+    @Parameter(property = "maven.ignoreRules", defaultValue = "maven.ignoreRules", required = true)
     private String mavenIgnoreRules;
 
-    /**
-     * @parameter expression="${maven.publishedRules}" default-value="maven.publishedRules"
-     * @required
-     */
+    @Parameter(property = "maven.publishedRules", defaultValue = "maven.ignoreRules", required = true)
     private String mavenPublishedRules;
 
     /**
      * root directory of the Maven repository
-     *
-     * @parameter expression="${basedir}"
-     * @readonly
      */
+    @Parameter(defaultValue = "${basedir}", readonly = true)
     private File repoDir;
 
     /**
      * Install the jar to /usr/share/java if true. Default is true
-     *
-     * @parameter expression="${install.to.usj}" default-value="true"
      */
+    @Parameter(property = "install.to.usj", defaultValue = "true")
     private boolean installToUsj = true;
 
     /**


=====================================
debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java
=====================================
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java
@@ -18,13 +18,13 @@ package org.debian.maven.plugin;
 
 import java.io.IOException;
 
+import org.apache.maven.plugins.annotations.Mojo;
 import org.codehaus.plexus.util.FileUtils;
 
 /**
  * Remove installed files and symlinks from the /usr/share hierarchy
- *
- * @goal sysuninstall
  */
+ at Mojo(name = "sysuninstall")
 public class SysUninstallMojo extends SysInstallMojo {
     // ----------------------------------------------------------------------
     // Mojo parameters


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ maven-debian-helper (2.3~exp2) UNRELEASED; urgency=medium
     generating the debian/copyright file
   * Replaced BSD with BSD-<n>-clause in the list of suggested licenses
   * Detect the BSD-<n>-clause licenses when generating the debian/copyright file
+  * Use the plugin annotations instead of the javadoc tags in the Maven mojos
   * Use XZ compression by default when repacking tarballs downloaded from GitHub
   * Standards-Version updated to 4.1.4
   * The generated control file now specifies Standards-Version: 4.1.4


=====================================
maven-packager-utils/pom.xml
=====================================
--- a/maven-packager-utils/pom.xml
+++ b/maven-packager-utils/pom.xml
@@ -23,6 +23,10 @@
             <artifactId>maven-core</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
         </dependency>


=====================================
maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
=====================================
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
@@ -16,12 +16,17 @@
 
 package org.debian.maven.packager;
 
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.debian.maven.packager.util.PackageScanner;
 import org.debian.maven.repo.DependencyRuleSetFiles.RulesType;
@@ -31,95 +36,75 @@ import org.debian.maven.repo.DependencyRuleSetFiles.RulesType;
  * reusable as subvars in the Debian control file and the list of POM files
  * to use and the rules if they did not exist already.
  *
- * @goal dependencies
- * @aggregator
- * @requiresDependencyResolution
- * @phase process-sources
- * 
  * @author Ludovic Claude
  */
+ at Mojo(name = "dependencies", defaultPhase = LifecyclePhase.PROCESS_SOURCES, aggregator = true, requiresDependencyResolution = ResolutionScope.RUNTIME)
 public class DependenciesMojo extends AbstractMojo {
 
     /**
      * The Maven Project Object
-     *
-     * @parameter expression="${project}"
-     * @readonly
-     * @required
      */
+    @Parameter(defaultValue = "${project}", readonly = true, required = true)
     protected MavenProject project;
     
     /**
      * A list of every project in this reactor; provided by Maven
-     * 
-     * @parameter expression="${project.collectedProjects}"
      */
+    @Parameter(defaultValue = "${project.collectedProjects}")
     protected List<MavenProject> collectedProjects;
     
     /**
      * Location of the file.
-     * 
-     * @parameter expression="${debian.directory}"
-     *   default-value="debian"
      */
+    @Parameter(property = "debian.directory", defaultValue = "debian")
     protected File outputDirectory;
     
     /**
      * Name of the package (e.g. 'commons-lang')
-     * 
-     * @parameter expression="${package}"
-     * @required
      */
+    @Parameter(property = "package", required = true)
     protected String packageName;
     
     /**
      * Type of the package (e.g. 'maven' or 'ant')
-     * 
-     * @parameter expression="${packageType}" default-value="maven"
      */
+    @Parameter(property = "packageType", defaultValue = "maven")
     protected String packageType;
     
     /**
      * Should we also resolve Javadoc dependencies
-     * 
-     * @parameter expression="${resolveJavadoc}" default-value="false"
      */
+    @Parameter(property = "resolveJavadoc", defaultValue = "false")
     protected boolean resolveJavadoc;
     
     /**
      * Location for the list of POMs file.
-     * 
-     * @required
-     * @parameter expression="debian/${package}.poms"
      */
+    @Parameter(defaultValue = "debian/${package}.poms", required = true)
     protected File listOfPoms;
     
     /**
      * Location of the Maven repository
-     *
-     * @parameter expression="${maven.repo.local}" default-value="/usr/share/maven-repo"
      */
+    @Parameter(property = "maven.repo.local", defaultValue = "/usr/share/maven-repo")
     protected File mavenRepo;
     
     /**
      * Interactive execution will ask questions to the user
-     * 
-     * @parameter expression="${interactive}" default-value="true"
      */
+    @Parameter(property = "interactive", defaultValue = "true")
     protected boolean interactive;
     
     /**
      * Offline prevents any download from Internet
-     * 
-     * @parameter expression="${offline}" default-value="false"
      */
+    @Parameter(property = "offline", defaultValue = "false")
     protected boolean offline;
     
     /**
      * Try to be verbose
-     * 
-     * @parameter expression="${verbose}" default-value="false"
      */
+    @Parameter(property = "verbose", defaultValue = "false")
     protected boolean verbose;
 
     public void execute() throws MojoExecutionException {


=====================================
maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
=====================================
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
@@ -36,6 +36,10 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Developer;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
@@ -49,115 +53,87 @@ import org.debian.maven.repo.POMOptions;
 /**
  * Generate the Debian files for packaging the current Maven project.
  *
- * @goal generate
- * @aggregator
- * @requiresDependencyResolution
- * @phase process-sources
- * 
  * @author Ludovic Claude
  */
+ at Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_SOURCES, aggregator = true, requiresDependencyResolution = ResolutionScope.RUNTIME)
 public class GenerateDebianFilesMojo extends AbstractMojo {
 
     /**
      * The Maven Project Object
-     *
-     * @parameter expression="${project}"
-     * @readonly
-     * @required
      */
+    @Parameter(defaultValue = "${project}", readonly = true, required = true)
     protected MavenProject project;
     
     /**
      * A list of every project in this reactor; provided by Maven
-     * 
-     * @parameter expression="${project.collectedProjects}"
      */
+    @Parameter(defaultValue = "${project.collectedProjects}")
     protected List<MavenProject> collectedProjects;
     
-    /**
-     * @parameter expression="${localRepository}"
-     * @required
-     * @readonly
-     */
+    @Parameter(defaultValue = "${localRepository}", readonly = true, required = true)
     protected ArtifactRepository localRepository;
     
     /**
      * Location of the file.
-     * 
-     * @parameter expression="${debian.directory}"
-     *   default-value="debian"
      */
+    @Parameter(property = "debian.directory", defaultValue = "debian")
     protected File outputDirectory;
     
     /**
      * Name of the packager (e.g. 'Ludovic Claude')
-     * 
-     * @parameter expression="${packager}"
-     * @required
      */
+    @Parameter(property = "packager", required = true)
     protected String packager;
     
     /**
      * Email of the packager (e.g. 'ludovic.claude at laposte.net')
-     * 
-     * @parameter expression="${email}"
-     * @required
      */
+    @Parameter(property = "email", required = true)
     protected String email;
     
     /**
      * License used by the packager (e.g. 'GPL-3' or 'Apache-2.0')
      * See http://dep.debian.net/deps/dep5/ for the list of licenses.
-     * 
-     * @parameter expression="${packagerLicense}" default-value="GPL-3"
-     * @required
      */
+    @Parameter(property = "packagerLicense", defaultValue = "Apache-2.0", required = true)
     protected String packagerLicense;
     
     /**
      * Name of the source package (e.g. 'commons-lang')
-     * 
-     * @parameter expression="${package}"
-     * @required
      */
+    @Parameter(property = "package", required = true)
     protected String packageName;
     
     /**
      * Name of the binary package (e.g. 'libcommons-lang-java')
-     * 
-     * @parameter expression="${bin.package}"
-     * @required
      */
+    @Parameter(property = "bin.package", required = true)
     protected String binPackageName;
     
     /**
      * Type of the package (e.g. 'maven' or 'ant')
-     * 
-     * @parameter expression="${packageType}" default-value="maven"
      */
+    @Parameter(property = "packageType", defaultValue = "maven")
     protected String packageType;
     
     /**
      * URL for downloading the source code, in the form scm:[svn|cvs]:http://xxx/
      * for downloads using a source code repository,
      * or http://xxx.[tar|zip|gz|tgz] for downloads using source tarballs.
-     * 
-     * @parameter expression="${downloadUrl}"
      */
+    @Parameter(property = "downloadUrl")
     protected String downloadUrl;
     
     /**
      * If true, include running the tests during the build.
-     * 
-     * @parameter expression="${runTests}" default-value="false"
      */
+    @Parameter(property = "runTests", defaultValue = "false")
     protected boolean runTests;
     
     /**
      * If true, generate the Javadoc packaged in a separate package.
-     * 
-     * @parameter expression="${generateJavadoc}" default-value="false"
      */
+    @Parameter(property = "generateJavadoc", defaultValue = "false")
     protected boolean generateJavadoc;
 
     private PackageScanner scanner = new PackageScanner(false);


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,11 @@
                 <version>3.5.0</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-annotations</artifactId>
+                <version>3.5.2</version>
+            </dependency>
+            <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-classworlds</artifactId>
                 <version>2.5.1</version>



View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/commit/200093e2384264c1b1a821e49b8e49a69e059660

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/commit/200093e2384264c1b1a821e49b8e49a69e059660
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180628/6b64968f/attachment.html>


More information about the pkg-java-commits mailing list