generate goal (org.netbeans.apitest.SigtestGenerate) should have a way to specify other generate options like exclude specified subpackages in sigtest-maven-plugin

tools/sigtest/src/main/java/org/netbeans/apitest/Sigtest.java

@@ -42,6 +42,7 @@ public final class Sigtest extends Task {
     Path classpath;
     String version;
     String packages;
+    String excludes;
     ActionType action;
     Boolean failOnError;
     File report;
@@ -56,6 +57,10 @@ public void setPackages(String s) {
         packages = s;
     }
 
+    public void setExcludes(String s) {
+        excludes = s;
+    }
+
     public void setAction(ActionType s) {
         action = s;
     }
@@ -120,6 +125,11 @@ protected String getPackages() {
                 return packages;
             }
 
+            @Override
+            protected String getExcludes() {
+                return excludes;
+            }
+
             @Override
             protected File getFileName() {
                 return fileName;

tools/sigtest/src/main/java/org/netbeans/apitest/SigtestCheck.java

@@ -95,6 +95,8 @@ public final class SigtestCheck extends AbstractMojo {
     private String action;
     @Parameter(defaultValue = "")
     private String packages;
+    @Parameter(defaultValue = "")
+    private String excludes;
     @Parameter(defaultValue = "${project.build.directory}/surefire-reports/sigtest/TEST-${project.build.finalName}.xml")
     private File report;
     @Parameter(defaultValue = "true", property = "sigtest.fail")
@@ -108,17 +110,22 @@ public SigtestCheck() {
     }
 
     SigtestCheck(MavenProject prj, File classes, File sigfile, String action, String packages, File report, boolean failOnError, final String[] ignoreJDKClasses, boolean ignoreAllJDKClasses) {
-        this.prj = prj;
-        this.classes = classes;
-        this.sigfile = sigfile;
-        this.action = action;
-        this.packages = packages;
-        this.report = report;
-        this.failOnError = failOnError;
-        this.ignoreJDKClasses = Arrays.copyOf(ignoreJDKClasses, ignoreJDKClasses.length);
-        this.ignoreAllJDKClasses = ignoreAllJDKClasses;
+        this(prj, classes, sigfile, action, packages, report, failOnError, ignoreJDKClasses, ignoreAllJDKClasses, "");
     }
 
+    SigtestCheck(MavenProject prj, File classes, File sigfile, String action, String packages, File report, boolean failOnError, final String[] ignoreJDKClasses, boolean ignoreAllJDKClasses, final String excludes) {
+            this.prj = prj;
+            this.classes = classes;
+            this.sigfile = sigfile;
+            this.action = action;
+            this.packages = packages;
+            this.report = report;
+            this.failOnError = failOnError;
+            this.ignoreJDKClasses = Arrays.copyOf(ignoreJDKClasses, ignoreJDKClasses.length);
+            this.ignoreAllJDKClasses = ignoreAllJDKClasses;
+            this.excludes = excludes;
+        }
+
 
 
     public void execute() throws MojoExecutionException, MojoFailureException {
@@ -143,6 +150,11 @@ protected String getPackages() {
                 return packages;
             }
 
+            @Override
+            protected String getExcludes() {
+                return excludes;
+            }
+
             @Override
             protected File getFileName() {
                 return sigfile;

tools/sigtest/src/main/java/org/netbeans/apitest/SigtestCompare.java

@@ -63,6 +63,8 @@ public final class SigtestCompare extends AbstractMojo {
     private File sigfile;
     @Parameter(defaultValue = "")
     private String packages;
+    @Parameter(defaultValue = "")
+    String excludes;
 
     @Parameter(property = "maven.compiler.release")
     private String release;
@@ -99,7 +101,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             throw new MojoExecutionException("Cannot resolve " + artifact, ex);
         }
 
-        SigtestGenerate generate = new SigtestGenerate(prj, artifact.getFile(), sigfile, packages, releaseVersion, release, ignoreJDKClasses, ignoreAllJDKClasses);
+        SigtestGenerate generate = new SigtestGenerate(prj, artifact.getFile(), sigfile, packages, releaseVersion, release, ignoreJDKClasses, ignoreAllJDKClasses, excludes);
         generate.execute();
 
         SigtestCheck check = new SigtestCheck(prj, classes, sigfile, action, packages, report, failOnError, ignoreJDKClasses, ignoreAllJDKClasses);

tools/sigtest/src/main/java/org/netbeans/apitest/SigtestGenerate.java

@@ -55,6 +55,7 @@
   <configuration>
     <release>8</release> <!-- specify version of JDK API to use 6,7,8,...15 -->
     <packages>org.yourcompany.app.api,org.yourcompany.help.api</packages>
+    <excludes>org.yourcompany.app.api.internalonly,org.yourcompany.help.api.ignorethispackagealso</packages>
   </configuration>
 </plugin>
  * </pre>
@@ -78,6 +79,8 @@ public final class SigtestGenerate extends AbstractMojo {
     private File sigfile;
     @Parameter(defaultValue = "")
     private String packages;
+    @Parameter(defaultValue = "")
+    String excludes;
     @Parameter(property = "maven.compiler.release")
     private String release;
     /**
@@ -101,14 +104,19 @@ public SigtestGenerate() {
     }
 
     SigtestGenerate(MavenProject prj, File classes, File sigfile, String packages, String version, String release, final String[] ignoreJDKClasses, boolean ignoreAllJdkClasses) {
+        this(prj, classes, sigfile, packages, version, release, ignoreJDKClasses, ignoreAllJdkClasses,"");
+    }
+
+    public SigtestGenerate(MavenProject prj, File file, File sigfile, String packages, String releaseVersion, String release, String[] ignoreJDKClasses, boolean ignoreAllJDKClasses, String excludes) {
         this.prj = prj;
         this.classes = classes;
         this.sigfile = sigfile;
         this.packages = packages;
-        this.version = version;
+        this.version = releaseVersion;
         this.release = release;
         this.ignoreJDKClasses = Arrays.copyOf(ignoreJDKClasses, ignoreJDKClasses.length);
         this.ignoreAllJdkClasses = ignoreAllJdkClasses;
+        this.excludes = excludes;
     }
 
     public void execute() throws MojoExecutionException, MojoFailureException {
@@ -128,6 +136,9 @@ protected String getPackages() {
                 return packages;
             }
 
+            @Override
+            protected String getExcludes() { return excludes; }
+
             @Override
             protected File getFileName() {
                 return sigfile;

tools/sigtest/src/main/java/org/netbeans/apitest/SigtestHandler.java

@@ -126,6 +126,17 @@ public final int execute() throws IOException {
             arg.add(prefix.trim());
             arg.add(p);
         }
+        // Add each specified excludes package name to "-Exclude $PACKAGENAME
+        if (getExcludes() != null ) {
+            StringTokenizer excludesTokenizer = new StringTokenizer(getExcludes(), ",:;");
+            while (excludesTokenizer.hasMoreTokens()) {
+                String p = excludesTokenizer.nextToken().trim();
+                String prefix = "-Exclude "; // NOI18N
+                arg.add(prefix.trim());
+                arg.add(p);
+            }
+        }
+
         if (getClasspath() != null) {
             StringBuffer sb = new StringBuffer();
             String pref = "";
@@ -262,6 +273,7 @@ private static Document createDocument(String rootQName) throws IOException {
 
     protected abstract Integer getRelease();
     protected abstract String getPackages();
+    protected abstract String getExcludes();
     protected abstract File getFileName();
     protected abstract String getAction();
     protected abstract String getVersion();