From 42f0aff7412f5552cce44bcb6030e3eb80060e13 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 7 Oct 2021 07:03:52 +0200 Subject: [PATCH 1/2] maven list modules plugin update Signed-off-by: Maxim Nesen --- .../pom.xml | 29 +++++++++++++++++++ .../plugins/GenerateJerseyModuleListMojo.java | 21 +++++++++++--- .../jersey/tools/plugins/HelpMojo.java | 11 ++++--- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/tools/jersey-doc-modulelist-maven-plugin/pom.xml b/tools/jersey-doc-modulelist-maven-plugin/pom.xml index 06ae2466c3..8c07e072fb 100644 --- a/tools/jersey-doc-modulelist-maven-plugin/pom.xml +++ b/tools/jersey-doc-modulelist-maven-plugin/pom.xml @@ -21,6 +21,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.eclipse.ee4j + project + 1.0.6 + + org.glassfish.jersey.tools.plugins jersey-doc-modulelist-maven-plugin maven-plugin @@ -53,6 +59,12 @@ maven-dependency-tree ${maven.shared.version} + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.6.1 + provided + @@ -74,6 +86,23 @@ false + + org.apache.maven.plugins + maven-plugin-plugin + 3.6.0 + + true + + + + default-descriptor + + descriptor + + process-classes + + + diff --git a/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/GenerateJerseyModuleListMojo.java b/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/GenerateJerseyModuleListMojo.java index da1de2c175..f284074e60 100644 --- a/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/GenerateJerseyModuleListMojo.java +++ b/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/GenerateJerseyModuleListMojo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -21,6 +21,10 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.Log; +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.project.MavenProject; import java.io.BufferedReader; @@ -41,10 +45,11 @@ * The plugins main MOJO class. * Walks through the maven dependency tree and creates the docbook output file. * - * @goal generate - * @phase process-sources - * @aggregator + * goal: generate + * phase: process-sources + * aggregator */ +@Mojo(name = "generate", aggregator = true, defaultPhase = LifecyclePhase.PROCESS_SOURCES) public class GenerateJerseyModuleListMojo extends AbstractMojo { /** @@ -82,6 +87,7 @@ public class GenerateJerseyModuleListMojo extends AbstractMojo { * @required * @readonly */ + @Parameter(defaultValue = "${project.basedir}") private MavenProject mavenProject; /** @@ -89,11 +95,13 @@ public class GenerateJerseyModuleListMojo extends AbstractMojo { * @required * @readonly */ + @Parameter( defaultValue = "${session}", readonly = true ) private MavenSession mavenSession; /** * @parameter default-value="modules.xml" */ + @Parameter(defaultValue = "modules.xml") private String outputFileName; /** @@ -103,6 +111,7 @@ public class GenerateJerseyModuleListMojo extends AbstractMojo { * * @parameter */ + @Parameter private String templateFileName; /** @@ -112,6 +121,7 @@ public class GenerateJerseyModuleListMojo extends AbstractMojo { * * @parameter */ + @Parameter private String tableHeaderFileName; /** @@ -120,6 +130,7 @@ public class GenerateJerseyModuleListMojo extends AbstractMojo { * * @parameter */ + @Parameter private String tableFooterFileName; /** @@ -129,11 +140,13 @@ public class GenerateJerseyModuleListMojo extends AbstractMojo { * * @parameter */ + @Parameter private String tableRowFileName; /** * @parameter default-value="false" */ + @Parameter(defaultValue = "false") private boolean outputUnmatched; private Configuration configuration; diff --git a/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/HelpMojo.java b/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/HelpMojo.java index c8c8b5680d..ccbdadd8ba 100644 --- a/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/HelpMojo.java +++ b/tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/HelpMojo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -20,14 +20,17 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; /** * Displays the plugin help message. * - * @goal help - * @phase process-sources - * @aggregator + * goal: help + * phase: process-sources + * aggregator */ +@Mojo(name = "help", aggregator = true, defaultPhase = LifecyclePhase.PROCESS_SOURCES) public class HelpMojo extends AbstractMojo { private Log log; From a39947fc086936ca79f36d912b2627c0385fa8c9 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 7 Oct 2021 14:37:58 +0200 Subject: [PATCH 2/2] Parent pom version update Signed-off-by: Maxim Nesen --- tools/jersey-doc-modulelist-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/jersey-doc-modulelist-maven-plugin/pom.xml b/tools/jersey-doc-modulelist-maven-plugin/pom.xml index 8c07e072fb..e09245b0a4 100644 --- a/tools/jersey-doc-modulelist-maven-plugin/pom.xml +++ b/tools/jersey-doc-modulelist-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.7 org.glassfish.jersey.tools.plugins