diff --git a/.gitignore b/.gitignore index f06ebb1..b2e3880 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-plugin-tools-3.6.0-source-release.zip +SOURCES/maven-plugin-tools-3.9.0-source-release.zip diff --git a/.maven-plugin-tools.metadata b/.maven-plugin-tools.metadata index 8f162db..802930d 100644 --- a/.maven-plugin-tools.metadata +++ b/.maven-plugin-tools.metadata @@ -1 +1 @@ -16e6909001190b589583443487167dff52c6f520 SOURCES/maven-plugin-tools-3.6.0-source-release.zip +f4929e9b55600b4719fe997c68a3b9f5a01197c1 SOURCES/maven-plugin-tools-3.9.0-source-release.zip diff --git a/SOURCES/0001-Disable-help-MOJO-generation.patch b/SOURCES/0001-Disable-help-MOJO-generation.patch new file mode 100644 index 0000000..b920c7d --- /dev/null +++ b/SOURCES/0001-Disable-help-MOJO-generation.patch @@ -0,0 +1,214 @@ +From bb0c2f36de5d9c85d00b3549ec9cef6074edd950 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 12:52:15 +0200 +Subject: [PATCH 1/3] Disable help MOJO generation + +Forwarded: not-needed +--- + .../plugin/plugin/HelpGeneratorMojo.java | 59 ++++--------- + .../plugin/generator/PluginHelpGenerator.java | 87 +++++++------------ + 2 files changed, 48 insertions(+), 98 deletions(-) + +diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java +index c5f82ce..9f5c61d 100644 +--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java ++++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java +@@ -28,15 +28,13 @@ 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.tools.plugin.generator.GeneratorException; +-import org.apache.maven.tools.plugin.generator.PluginHelpGenerator; +-import org.codehaus.plexus.util.StringUtils; +-import org.codehaus.plexus.velocity.VelocityComponent; +- +-/** +- * Generates a HelpMojo class. ++import org.apache.maven.plugins.annotations.Parameter; ++import org.apache.maven.plugins.annotations.ResolutionScope; ++import org.apache.maven.tools.plugin.generator.GeneratorException; ++import org.codehaus.plexus.util.StringUtils; ++ ++/** ++ * Generates a HelpMojo class. + * Relies at runtime on one output file from {@link DescriptorGeneratorMojo}. + * + * @author Vincent Siveton +@@ -65,18 +63,12 @@ public class HelpGeneratorMojo extends AbstractGeneratorMojo { + * + * @since 2.6 + */ +- @Parameter +- private String helpPackageName; +- +- /** +- * Velocity component. +- */ +- @Component +- private VelocityComponent velocity; +- +- String getHelpPackageName() { +- String packageName = null; +- if (StringUtils.isNotBlank(helpPackageName)) { ++ @Parameter ++ private String helpPackageName; ++ ++ String getHelpPackageName() { ++ String packageName = null; ++ if (StringUtils.isNotBlank(helpPackageName)) { + packageName = helpPackageName; + } + +@@ -98,23 +90,8 @@ public class HelpGeneratorMojo extends AbstractGeneratorMojo { + } + return name; + } +- +- @Override +- protected void generate() throws MojoExecutionException { +- PluginHelpGenerator pluginHelpGenerator = new PluginHelpGenerator() +- .setMavenProject(project) +- .setHelpPackageName(getHelpPackageName()) +- .setGoalPrefix(goalPrefix) +- .setVelocityComponent(velocity); +- +- try { +- pluginHelpGenerator.execute(outputDirectory); +- } catch (GeneratorException e) { +- throw new MojoExecutionException(e.getMessage(), e); +- } +- +- if (!project.getCompileSourceRoots().contains(outputDirectory.getAbsolutePath())) { +- project.addCompileSourceRoot(outputDirectory.getAbsolutePath()); +- } +- } +-} ++ ++ @Override ++ protected void generate() throws MojoExecutionException { ++ } ++} +diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java +index c3806af..9772df9 100644 +--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java ++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java +@@ -24,18 +24,16 @@ import java.io.InputStream; + import java.io.InputStreamReader; + import java.io.OutputStreamWriter; + import java.io.StringWriter; +-import java.io.Writer; +- +-import org.apache.maven.project.MavenProject; +-import org.apache.velocity.VelocityContext; +-import org.codehaus.plexus.logging.AbstractLogEnabled; +-import org.codehaus.plexus.logging.Logger; +-import org.codehaus.plexus.logging.console.ConsoleLogger; +-import org.codehaus.plexus.util.io.CachingOutputStream; +-import org.codehaus.plexus.velocity.VelocityComponent; +- +-import static java.nio.charset.StandardCharsets.UTF_8; +- ++import java.io.Writer; ++ ++import org.apache.maven.project.MavenProject; ++import org.codehaus.plexus.logging.AbstractLogEnabled; ++import org.codehaus.plexus.logging.Logger; ++import org.codehaus.plexus.logging.console.ConsoleLogger; ++import org.codehaus.plexus.util.io.CachingOutputStream; ++ ++import static java.nio.charset.StandardCharsets.UTF_8; ++ + /** + * Generates an HelpMojo class from help-class-source.vm template. + * The generated mojo reads help content from META-INF/maven/${groupId}/${artifactId}/plugin-help.xml +@@ -51,13 +49,12 @@ public class PluginHelpGenerator extends AbstractLogEnabled { + private static final String HELP_MOJO_CLASS_NAME = "HelpMojo"; + + private String helpPackageName; +- private String goalPrefix; +- private MavenProject mavenProject; +- private boolean useMaven4Api; +- private VelocityComponent velocityComponent; +- +- /** +- * Default constructor ++ private String goalPrefix; ++ private MavenProject mavenProject; ++ private boolean useMaven4Api; ++ ++ /** ++ * Default constructor + */ + public PluginHelpGenerator() { + this.enableLogging(new ConsoleLogger(Logger.LEVEL_INFO, "PluginHelpGenerator")); +@@ -92,17 +89,12 @@ public class PluginHelpGenerator extends AbstractLogEnabled { + + public PluginHelpGenerator setHelpPackageName(String helpPackageName) { + this.helpPackageName = helpPackageName; +- return this; +- } +- +- public PluginHelpGenerator setVelocityComponent(VelocityComponent velocityComponent) { +- this.velocityComponent = velocityComponent; +- return this; +- } +- +- public PluginHelpGenerator setGoalPrefix(String goalPrefix) { +- this.goalPrefix = goalPrefix; +- return this; ++ return this; ++ } ++ ++ public PluginHelpGenerator setGoalPrefix(String goalPrefix) { ++ this.goalPrefix = goalPrefix; ++ return this; + } + + public PluginHelpGenerator setMavenProject(MavenProject mavenProject) { +@@ -112,33 +104,14 @@ public class PluginHelpGenerator extends AbstractLogEnabled { + + // ---------------------------------------------------------------------- + // Private methods +- // ---------------------------------------------------------------------- +- +- private String getHelpClassSources(String pluginHelpPath) throws IOException { +- VelocityContext context = new VelocityContext(); +- boolean useAnnotations = +- mavenProject.getArtifactMap().containsKey("org.apache.maven.plugin-tools:maven-plugin-annotations"); +- +- context.put("helpPackageName", helpPackageName); +- context.put("pluginHelpPath", pluginHelpPath); +- context.put("artifactId", mavenProject.getArtifactId()); +- // TODO: evaluate prefix from deserialized plugin +- context.put("goalPrefix", goalPrefix); +- context.put("useAnnotations", useAnnotations); +- +- StringWriter stringWriter = new StringWriter(); +- +- // plugin-tools sources are UTF-8 (and even ASCII in this case)) +- try (InputStream is = Thread.currentThread() +- .getContextClassLoader() +- .getResourceAsStream(useMaven4Api ? "help-class-source-v4.vm" : "help-class-source.vm"); // +- InputStreamReader isReader = new InputStreamReader(is, UTF_8)) { +- // isReader = +- velocityComponent.getEngine().evaluate(context, stringWriter, "", isReader); +- } +- // Apply OS lineSeparator instead of template's lineSeparator to have consistent separators for +- // all source files. +- return stringWriter.toString().replaceAll("(\r\n|\n|\r)", System.lineSeparator()); ++ // ---------------------------------------------------------------------- ++ ++ private String getHelpClassSources(String pluginHelpPath) throws IOException { ++ StringWriter stringWriter = new StringWriter(); ++ ++ // Apply OS lineSeparator instead of template's lineSeparator to have consistent separators for ++ // all source files. ++ return stringWriter.toString().replaceAll("(\r\n|\n|\r)", System.lineSeparator()); + } + + /** +-- +2.46.0 + diff --git a/SOURCES/0001-Port-to-plexus-utils-3.0.24.patch b/SOURCES/0001-Port-to-plexus-utils-3.0.24.patch deleted file mode 100644 index a553bef..0000000 --- a/SOURCES/0001-Port-to-plexus-utils-3.0.24.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 690138ca262b03d7e43336dd9bfee2ca0e1b03f9 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 12 May 2016 09:36:10 +0200 -Subject: [PATCH 3/3] Port to plexus-utils 3.0.24 - ---- - .../maven/tools/plugin/generator/PluginHelpGenerator.java | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java -index 23c3ed9..7543496 100644 ---- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java -+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java -@@ -302,7 +302,15 @@ public class PluginHelpGenerator - return; - } - -- Properties properties = PropertyUtils.loadProperties( tmpPropertiesFile ); -+ Properties properties; -+ try -+ { -+ properties = PropertyUtils.loadProperties( tmpPropertiesFile ); -+ } -+ catch ( IOException exc ) -+ { -+ properties = new Properties(); -+ } - - String helpPackageName = properties.getProperty( "helpPackageName" ); - --- -2.14.3 - diff --git a/SOURCES/0002-Remove-dependency-on-jtidy.patch b/SOURCES/0002-Remove-dependency-on-jtidy.patch new file mode 100644 index 0000000..cc8a8f7 --- /dev/null +++ b/SOURCES/0002-Remove-dependency-on-jtidy.patch @@ -0,0 +1,154 @@ +From fd02c57beb987437b4fb10066e22831a17119873 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 12:56:04 +0200 +Subject: [PATCH 2/3] Remove dependency on jtidy + +Forwarded: not-needed +--- + .../plugin/generator/GeneratorUtils.java | 85 +++++-------------- + .../PluginDescriptorFilesGenerator.java | 19 ++--- + 2 files changed, 26 insertions(+), 78 deletions(-) + +diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +index 8b04522..2621b9f 100644 +--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java ++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +@@ -48,13 +48,12 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor; + import org.apache.maven.plugin.descriptor.PluginDescriptor; + import org.apache.maven.project.MavenProject; + import org.apache.maven.reporting.MavenReport; +-import org.codehaus.plexus.component.repository.ComponentDependency; +-import org.codehaus.plexus.util.StringUtils; +-import org.codehaus.plexus.util.xml.XMLWriter; +-import org.w3c.tidy.Tidy; +- +-/** +- * Convenience methods to play with Maven plugins. ++import org.codehaus.plexus.component.repository.ComponentDependency; ++import org.codehaus.plexus.util.StringUtils; ++import org.codehaus.plexus.util.xml.XMLWriter; ++ ++/** ++ * Convenience methods to play with Maven plugins. + * + * @author jdcasey + */ +@@ -222,58 +221,12 @@ public final class GeneratorUtils { + } + matcher.appendTail(decoded); + +- return decoded.toString(); +- } +- +- /** +- * Fixes some javadoc comment to become a valid XHTML snippet. +- * +- * @param description Javadoc description with HTML tags, may be null. +- * @return The description with valid XHTML tags, never null. +- * @deprecated Redundant for java extractor +- */ +- @Deprecated +- public static String makeHtmlValid(String description) { +- +- if (description == null || description.isEmpty()) { +- return ""; +- } +- +- String commentCleaned = decodeJavadocTags(description); +- +- // Using jTidy to clean comment +- Tidy tidy = new Tidy(); +- tidy.setDocType("loose"); +- tidy.setXHTML(true); +- tidy.setXmlOut(true); +- tidy.setInputEncoding("UTF-8"); +- tidy.setOutputEncoding("UTF-8"); +- tidy.setMakeClean(true); +- tidy.setNumEntities(true); +- tidy.setQuoteNbsp(false); +- tidy.setQuiet(true); +- tidy.setShowWarnings(true); +- +- ByteArrayOutputStream out = new ByteArrayOutputStream(commentCleaned.length() + 256); +- tidy.parse(new ByteArrayInputStream(commentCleaned.getBytes(StandardCharsets.UTF_8)), out); +- commentCleaned = new String(out.toByteArray(), StandardCharsets.UTF_8); +- +- if (commentCleaned == null || commentCleaned.isEmpty()) { +- return ""; +- } +- +- // strip the header/body stuff +- String ls = System.getProperty("line.separator"); +- int startPos = commentCleaned.indexOf("" + ls) + 6 + ls.length(); +- int endPos = commentCleaned.indexOf(ls + ""); +- commentCleaned = commentCleaned.substring(startPos, endPos); +- +- return commentCleaned; +- } +- +- /** +- * Converts a HTML fragment as extracted from a javadoc comment to a plain text string. This method tries to retain +- * as much of the text formatting as possible by means of the following transformations: ++ return decoded.toString(); ++ } ++ ++ /** ++ * Converts a HTML fragment as extracted from a javadoc comment to a plain text string. This method tries to retain ++ * as much of the text formatting as possible by means of the following transformations: + *
    + *
  • List items are converted to leading tabs (U+0009), followed by the item number/bullet, another tab and + * finally the item contents. Each tab denotes an increase of indentation.
    • +@@ -298,13 +251,13 @@ public final class GeneratorUtils { + final StringBuilder sb = new StringBuilder(); + + HTMLEditorKit.Parser parser = new ParserDelegator(); +- HTMLEditorKit.ParserCallback htmlCallback = new MojoParserCallback(sb); +- +- try { +- parser.parse(new StringReader(makeHtmlValid(html)), htmlCallback, true); +- } catch (IOException e) { +- throw new RuntimeException(e); +- } ++ HTMLEditorKit.ParserCallback htmlCallback = new MojoParserCallback(sb); ++ ++ try { ++ parser.parse(new StringReader(html), htmlCallback, true); ++ } catch (IOException e) { ++ throw new RuntimeException(e); ++ } + + return sb.toString().replace('\"', '\''); // for CDATA + } +diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java +index f8c9820..9dd3179 100644 +--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java ++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java +@@ -200,18 +200,13 @@ public class PluginDescriptorFilesGenerator implements Generator { + * @param containsXhtmlValue + * @param text + * @return the normalized text value (i.e. potentially converted to XHTML) +- */ +- private static String getTextValue(DescriptorType type, boolean containsXhtmlValue, String text) { +- final String xhtmlText; +- if (!containsXhtmlValue) // text comes from legacy extractor +- { +- xhtmlText = GeneratorUtils.makeHtmlValid(text); +- } else { +- xhtmlText = text; +- } +- if (type != DescriptorType.XHTML) { +- return new HtmlToPlainTextConverter().convert(text); +- } else { ++ */ ++ private static String getTextValue(DescriptorType type, boolean containsXhtmlValue, String text) { ++ final String xhtmlText; ++ xhtmlText = text; ++ if (type != DescriptorType.XHTML) { ++ return new HtmlToPlainTextConverter().convert(text); ++ } else { + return xhtmlText; + } + } +-- +2.46.0 + diff --git a/SOURCES/0003-Disable-reporting.patch b/SOURCES/0003-Disable-reporting.patch new file mode 100644 index 0000000..0d6bec4 --- /dev/null +++ b/SOURCES/0003-Disable-reporting.patch @@ -0,0 +1,89 @@ +From 24dcb6a3b37bc82826c7846ea69e1c42f5351f2d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 12:57:13 +0200 +Subject: [PATCH 3/3] Disable reporting + +Forwarded: not-needed +--- + .../plugin/generator/GeneratorUtils.java | 61 +++---------------- + 1 file changed, 7 insertions(+), 54 deletions(-) + +diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +index 2621b9f..c24ccdb 100644 +--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java ++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +@@ -44,10 +44,9 @@ import java.util.regex.Pattern; + + import org.apache.maven.artifact.Artifact; + import org.apache.maven.artifact.DependencyResolutionRequiredException; +-import org.apache.maven.plugin.descriptor.MojoDescriptor; +-import org.apache.maven.plugin.descriptor.PluginDescriptor; +-import org.apache.maven.project.MavenProject; +-import org.apache.maven.reporting.MavenReport; ++import org.apache.maven.plugin.descriptor.MojoDescriptor; ++import org.apache.maven.plugin.descriptor.PluginDescriptor; ++import org.apache.maven.project.MavenProject; + import org.codehaus.plexus.component.repository.ComponentDependency; + import org.codehaus.plexus.util.StringUtils; + import org.codehaus.plexus.util.xml.XMLWriter; +@@ -500,53 +499,7 @@ public final class GeneratorUtils { + packageName = entry.getKey(); + } + } +- +- return packageName; +- } +- +- /** +- * @param impl a Mojo implementation, not null +- * @param project a MavenProject instance, could be null +- * @return true is the Mojo implementation implements MavenReport, +- * false otherwise. +- * @throws IllegalArgumentException if any +- */ +- @SuppressWarnings("unchecked") +- public static boolean isMavenReport(String impl, MavenProject project) throws IllegalArgumentException { +- if (impl == null) { +- throw new IllegalArgumentException("mojo implementation should be declared"); +- } +- +- ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); +- if (project != null) { +- List classPathStrings; +- try { +- classPathStrings = project.getCompileClasspathElements(); +- if (project.getExecutionProject() != null) { +- classPathStrings.addAll(project.getExecutionProject().getCompileClasspathElements()); +- } +- } catch (DependencyResolutionRequiredException e) { +- throw new IllegalArgumentException(e); +- } +- +- List urls = new ArrayList<>(classPathStrings.size()); +- for (String classPathString : classPathStrings) { +- try { +- urls.add(new File(classPathString).toURL()); +- } catch (MalformedURLException e) { +- throw new IllegalArgumentException(e); +- } +- } +- +- classLoader = new URLClassLoader(urls.toArray(new URL[urls.size()]), classLoader); +- } +- +- try { +- Class clazz = Class.forName(impl, false, classLoader); +- +- return MavenReport.class.isAssignableFrom(clazz); +- } catch (ClassNotFoundException e) { +- return false; +- } +- } +-} ++ ++ return packageName; ++ } ++} +-- +2.46.0 + diff --git a/SPECS/maven-plugin-tools.spec b/SPECS/maven-plugin-tools.spec index 6a4f7e5..baafea7 100644 --- a/SPECS/maven-plugin-tools.spec +++ b/SPECS/maven-plugin-tools.spec @@ -1,48 +1,47 @@ +%bcond_with bootstrap + Name: maven-plugin-tools -Version: 3.6.0 -Release: 3%{?dist} +Version: 3.9.0 +Release: 19%{?dist} Summary: Maven Plugin Tools -License: ASL 2.0 -URL: http://maven.apache.org/plugin-tools/ +License: Apache-2.0 +URL: https://maven.apache.org/plugin-tools/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0001-Port-to-plexus-utils-3.0.24.patch +Patch: 0001-Disable-help-MOJO-generation.patch +Patch: 0002-Remove-dependency-on-jtidy.patch +Patch: 0003-Disable-reporting.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(com.thoughtworks.qdox:qdox) -BuildRequires: mvn(net.sf.jtidy:jtidy) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.ant:ant-launcher) -BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) -BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-repository-metadata) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) -BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common) -BuildRequires: mvn(org.apache.velocity:velocity) -BuildRequires: mvn(org.beanshell:bsh) +BuildRequires: mvn(org.apache.maven:maven-settings) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-ant-factory) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) -BuildRequires: mvn(org.codehaus.plexus:plexus-bsh-factory) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.codehaus.plexus:plexus-velocity) -BuildRequires: mvn(org.easymock:easymock) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +%endif %description The Maven Plugin Tools contains the necessary tools to be able to produce Maven @@ -69,13 +68,6 @@ Summary: Maven Plugin Tool for Annotations %description annotations This package provides Java 5 annotation tools for use with Apache Maven. -%package ant -Summary: Maven Plugin Tool for Ant -Provides: maven-shared-plugin-tools-ant = 0:%{version}-%{release} - -%description ant -Descriptor extractor for plugins written in Ant. - %package api Summary: Maven Plugin Tools APIs Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release} @@ -84,13 +76,6 @@ Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release} The Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins. -%package beanshell -Summary: Maven Plugin Tool for Beanshell -Provides: maven-shared-plugin-tools-beanshell = 0:%{version}-%{release} - -%description beanshell -Descriptor extractor for plugins written in Beanshell. - %package generators Summary: Maven Plugin Tools Generators @@ -105,58 +90,39 @@ Provides: maven-shared-plugin-tools-java = 0:%{version}-%{release} %description java Descriptor extractor for plugins written in Java. -%package model -Summary: Maven Plugin Metadata Model -Provides: maven-shared-plugin-tools-model = 0:%{version}-%{release} +%package javadoc +Summary: API documentation for %{name} -%description model -The Maven Plugin Metadata Model provides an API to play with the Metadata -model. - -%package -n maven-script -Summary: Maven Script Mojo Support - -%description -n maven-script -Maven Script Mojo Support lets developer write Maven plugins/goals -with scripting languages instead of compiled Java. - -%package -n maven-script-ant -Summary: Maven Ant Mojo Support - -%description -n maven-script-ant -This package provides %{summary}, which write Maven plugins with -Ant scripts. - -%package -n maven-script-beanshell -Summary: Maven Beanshell Mojo Support - -%description -n maven-script-beanshell -This package provides %{summary}, which write Maven plugins with -Beanshell scripts. - -# This "javadocs" package violates packaging guidelines as of Sep 6 2012. The -# subpackage name "javadocs" instead of "javadoc" is intentional. There was a -# consensus that current naming scheme should be kept, even if it doesn't -# conform to the guidelines. mizdebsk, September 2012 -%package javadocs -Summary: Javadoc for %{name} - -%description javadocs +%description javadoc API documentation for %{name}. - %prep -%setup -q -%patch0 -p1 +%autosetup -p1 +find -name '*.java' -exec sed -i 's/\r//' {} + -%pom_remove_plugin :maven-enforcer-plugin +rm -r maven-plugin-tools-api/src/test/resources/javadoc %pom_xpath_inject "pom:project/pom:properties" " UTF-8 UTF-8" -# Remove test dependencies because tests are skipped anyways. -%pom_xpath_remove "pom:dependency[pom:scope='test']" +%pom_xpath_remove "pom:execution[pom:id='generated-helpmojo']" maven-plugin-plugin + +%pom_disable_module maven-script +%pom_disable_module maven-plugin-report-plugin + +%pom_remove_dep -r :maven-reporting-impl +%pom_remove_dep -r :maven-reporting-api +%pom_remove_dep -r :plexus-velocity +%pom_remove_dep -r :velocity +%pom_remove_dep -r :jtidy +%pom_remove_plugin -r :spotless-maven-plugin + +%pom_remove_dep org.junit:junit-bom +%pom_remove_dep :maven-plugin-tools-ant maven-plugin-plugin +%pom_remove_dep :maven-plugin-tools-beanshell maven-plugin-plugin + +rm maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java %build %mvn_build -s -f @@ -164,50 +130,129 @@ API documentation for %{name}. %install %mvn_install - %files -f .mfiles-maven-plugin-tools %license LICENSE NOTICE %files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations +%license LICENSE NOTICE %files -n maven-plugin-plugin -f .mfiles-maven-plugin-plugin %files annotations -f .mfiles-maven-plugin-tools-annotations %license LICENSE NOTICE -%files ant -f .mfiles-maven-plugin-tools-ant - %files api -f .mfiles-maven-plugin-tools-api %license LICENSE NOTICE -%files beanshell -f .mfiles-maven-plugin-tools-beanshell - %files generators -f .mfiles-maven-plugin-tools-generators %files java -f .mfiles-maven-plugin-tools-java -%files model -f .mfiles-maven-plugin-tools-model +%files javadoc -f .mfiles-javadoc %license LICENSE NOTICE -%files -n maven-script -f .mfiles-maven-script - -%files -n maven-script-ant -f .mfiles-maven-script-ant -%license LICENSE NOTICE - -%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell -%license LICENSE NOTICE - -%files javadocs -f .mfiles-javadoc -%license LICENSE NOTICE - - %changelog +* Mon Dec 30 2024 Mikolaj Izdebski - 3.9.0-17 +- Use %%autosetup -C + +* Fri Nov 29 2024 Mikolaj Izdebski - 3.9.0-16 +- Update javapackages test plan to f42 + +* Tue Jul 30 2024 Mikolaj Izdebski - 3.9.0-8 +- Drop unneeded Obsoletes + +* Thu Jul 18 2024 Fedora Release Engineering - 3.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.9.0-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.9.0-5 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.9.0-2 +- Rebuild + +* Wed Aug 16 2023 Marian Koncek - 3.9.0-1 +- Update to upstream version 3.9.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.6.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.6.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Aug 22 2022 Mikolaj Izdebski - 3.6.4-3 +- Rename javadocs subpackage to javadoc + +* Thu Jul 21 2022 Fedora Release Engineering - 3.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Apr 28 2022 Mikolaj Izdebski - 3.6.4-1 +- Update to upstream version 3.6.4 + +* Sat Feb 05 2022 Jiri Vanek - 3.6.0-12 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.6.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.6.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.6.0-9 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 0:3.6.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 22 2020 Fabio Valentini - 0:3.6.0-7 +- Disable unused ant scripting support. + +* Tue Jul 28 2020 Fedora Release Engineering - 0:3.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 0:3.6.0-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 14 2020 Fabio Valentini - 0:3.6.0-4 +- Ignore jTidy crashes when generating maven plugin descriptors. + +* Mon Apr 20 2020 Mikolaj Izdebski - 3.6.0-4 +- Disable beanshell modules + +* Sun Mar 29 2020 Fabio Valentini - 0:3.6.0-3 +- Disable unused beanshell support. + +* Fri Mar 27 2020 Fabio Valentini - 0:3.6.0-2 +- Rebuild for fixed maven-parent. + +* Thu Feb 27 2020 Jayashree Huttanagoudar - 0:3.6.0-1 +- Update to upstream version 3.6.0. +- Section related to javadoc is removed because in the latest upstream source javadoc module is removed. + +* Wed Jan 29 2020 Fedora Release Engineering - 0:3.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 3.6.0-3 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 0:3.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 3.6.0-2 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 0:3.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 02 2019 Marian Koncek - 0:3.6.0-1 - Update to upstream version 3.6.0