Compare commits
No commits in common. "c9s" and "c8-stream-201902" have entirely different histories.
c9s
...
c8-stream-
@ -1 +0,0 @@
|
||||
1
|
||||
13
.gitignore
vendored
13
.gitignore
vendored
@ -1,12 +1 @@
|
||||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/maven-plugin-tools-2.1-src.tar.gz
|
||||
/maven-plugin-tools-2.6.tar.xz
|
||||
/maven-plugin-tools-2.7-source-release.zip
|
||||
/maven-plugin-tools-3.1-source-release.zip
|
||||
/maven-plugin-tools-3.3-source-release.zip
|
||||
/maven-plugin-tools-3.4-source-release.zip
|
||||
/maven-plugin-tools-3.5-source-release.zip
|
||||
/maven-plugin-tools-3.5.1-source-release.zip
|
||||
/maven-plugin-tools-3.6.0-source-release.zip
|
||||
SOURCES/maven-plugin-tools-3.6.0-source-release.zip
|
||||
|
||||
1
.maven-plugin-tools.metadata
Normal file
1
.maven-plugin-tools.metadata
Normal file
@ -0,0 +1 @@
|
||||
16e6909001190b589583443487167dff52c6f520 SOURCES/maven-plugin-tools-3.6.0-source-release.zip
|
||||
@ -1,92 +0,0 @@
|
||||
From 4d7b7bbd40fb82ef78f0a27135a8dc9075d132ea Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Mon, 27 Apr 2020 12:52:15 +0200
|
||||
Subject: [PATCH 1/3] Disable help MOJO generation
|
||||
|
||||
---
|
||||
.../plugin/plugin/HelpGeneratorMojo.java | 20 +------------------
|
||||
.../generator/PluginDescriptorGenerator.java | 11 ----------
|
||||
2 files changed, 1 insertion(+), 30 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 767567b..1004867 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,8 +28,6 @@ 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.Generator;
|
||||
-import org.apache.maven.tools.plugin.generator.PluginHelpGenerator;
|
||||
-import org.codehaus.plexus.velocity.VelocityComponent;
|
||||
|
||||
/**
|
||||
* Generates a <code>HelpMojo</code> class.
|
||||
@@ -58,12 +56,6 @@ public class HelpGeneratorMojo
|
||||
@Parameter
|
||||
private String helpPackageName;
|
||||
|
||||
- /**
|
||||
- * Velocity component.
|
||||
- */
|
||||
- @Component
|
||||
- private VelocityComponent velocity;
|
||||
-
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@@ -77,7 +69,7 @@ public class HelpGeneratorMojo
|
||||
*/
|
||||
protected Generator createGenerator()
|
||||
{
|
||||
- return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setVelocityComponent( this.velocity );
|
||||
+ return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -86,16 +78,6 @@ public class HelpGeneratorMojo
|
||||
public void execute()
|
||||
throws MojoExecutionException
|
||||
{
|
||||
- // force value for this plugin
|
||||
- skipErrorNoDescriptorsFound = true;
|
||||
-
|
||||
- super.execute();
|
||||
-
|
||||
- if ( !project.getCompileSourceRoots().contains( outputDirectory.getAbsolutePath() ) && !skip )
|
||||
- {
|
||||
- project.addCompileSourceRoot( outputDirectory.getAbsolutePath() );
|
||||
- }
|
||||
-
|
||||
}
|
||||
|
||||
}
|
||||
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
|
||||
index 1375cae..9e3d556 100644
|
||||
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
|
||||
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
|
||||
@@ -66,22 +66,11 @@ public class PluginDescriptorGenerator
|
||||
public void execute( File destinationDirectory, PluginToolsRequest request )
|
||||
throws GeneratorException
|
||||
{
|
||||
- // eventually rewrite help mojo class to match actual package name
|
||||
- PluginHelpGenerator.rewriteHelpMojo( request, log );
|
||||
-
|
||||
try
|
||||
{
|
||||
// write complete plugin.xml descriptor
|
||||
File f = new File( destinationDirectory, "plugin.xml" );
|
||||
writeDescriptor( f, request, false );
|
||||
-
|
||||
- // write plugin-help.xml help-descriptor
|
||||
- MavenProject mavenProject = request.getProject();
|
||||
-
|
||||
- f = new File( mavenProject.getBuild().getOutputDirectory(),
|
||||
- PluginHelpGenerator.getPluginHelpPath( mavenProject ) );
|
||||
-
|
||||
- writeDescriptor( f, request, true );
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
--
|
||||
2.25.2
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From 39be64eff05c5db20b863ac971d2de5707ae8017 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Mon, 27 Apr 2020 12:56:04 +0200
|
||||
Subject: [PATCH 2/3] Remove dependency on jtidy
|
||||
|
||||
---
|
||||
.../plugin/generator/GeneratorUtils.java | 55 +------------------
|
||||
1 file changed, 1 insertion(+), 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 771b08b..0346778 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
|
||||
@@ -51,7 +51,6 @@ 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.
|
||||
@@ -254,58 +253,6 @@ public final class GeneratorUtils
|
||||
return decoded.toString();
|
||||
}
|
||||
|
||||
- /**
|
||||
- * Fixes some javadoc comment to become a valid XHTML snippet.
|
||||
- *
|
||||
- * @param description Javadoc description with HTML tags, may be <code>null</code>.
|
||||
- * @return The description with valid XHTML tags, never <code>null</code>.
|
||||
- */
|
||||
- public static String makeHtmlValid( String description )
|
||||
- {
|
||||
- if ( StringUtils.isEmpty( description ) )
|
||||
- {
|
||||
- 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( false );
|
||||
- try
|
||||
- {
|
||||
- ByteArrayOutputStream out = new ByteArrayOutputStream( commentCleaned.length() + 256 );
|
||||
- tidy.parse( new ByteArrayInputStream( commentCleaned.getBytes( "UTF-8" ) ), out );
|
||||
- commentCleaned = out.toString( "UTF-8" );
|
||||
- }
|
||||
- catch ( UnsupportedEncodingException e )
|
||||
- {
|
||||
- // cannot happen as every JVM must support UTF-8, see also class javadoc for java.nio.charset.Charset
|
||||
- }
|
||||
-
|
||||
- if ( StringUtils.isEmpty( commentCleaned ) )
|
||||
- {
|
||||
- return "";
|
||||
- }
|
||||
-
|
||||
- // strip the header/body stuff
|
||||
- String ls = System.getProperty( "line.separator" );
|
||||
- int startPos = commentCleaned.indexOf( "<body>" + ls ) + 6 + ls.length();
|
||||
- int endPos = commentCleaned.indexOf( ls + "</body>" );
|
||||
- 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:
|
||||
@@ -337,7 +284,7 @@ public final class GeneratorUtils
|
||||
|
||||
try
|
||||
{
|
||||
- parser.parse( new StringReader( makeHtmlValid( html ) ), htmlCallback, true );
|
||||
+ parser.parse( new StringReader( html ), htmlCallback, true );
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
--
|
||||
2.25.2
|
||||
|
||||
@ -1,90 +0,0 @@
|
||||
From 8d455cd296ab9b3d762ddac71b3f51df234b66c1 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Mon, 27 Apr 2020 12:57:13 +0200
|
||||
Subject: [PATCH 3/3] Disable reporting
|
||||
|
||||
---
|
||||
.../plugin/generator/GeneratorUtils.java | 62 -------------------
|
||||
1 file changed, 62 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 0346778..6ac66f8 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
|
||||
@@ -47,7 +47,6 @@ import org.apache.maven.model.Dependency;
|
||||
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;
|
||||
@@ -592,65 +591,4 @@ public final class GeneratorUtils
|
||||
return packageName;
|
||||
}
|
||||
|
||||
- /**
|
||||
- * @param impl a Mojo implementation, not null
|
||||
- * @param project a MavenProject instance, could be null
|
||||
- * @return <code>true</code> is the Mojo implementation implements <code>MavenReport</code>,
|
||||
- * <code>false</code> 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<String> classPathStrings;
|
||||
- try
|
||||
- {
|
||||
- classPathStrings = project.getCompileClasspathElements();
|
||||
- if ( project.getExecutionProject() != null )
|
||||
- {
|
||||
- classPathStrings.addAll( project.getExecutionProject().getCompileClasspathElements() );
|
||||
- }
|
||||
- }
|
||||
- catch ( DependencyResolutionRequiredException e )
|
||||
- {
|
||||
- throw new IllegalArgumentException( e );
|
||||
- }
|
||||
-
|
||||
- List<URL> 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;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
}
|
||||
--
|
||||
2.25.2
|
||||
|
||||
33
SOURCES/0001-Port-to-plexus-utils-3.0.24.patch
Normal file
33
SOURCES/0001-Port-to-plexus-utils-3.0.24.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 690138ca262b03d7e43336dd9bfee2ca0e1b03f9 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
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
|
||||
|
||||
@ -1,28 +1,22 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: maven-plugin-tools
|
||||
Version: 3.6.0
|
||||
Release: 12%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Maven Plugin Tools
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugin-tools/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch1: 0001-Disable-help-MOJO-generation.patch
|
||||
Patch2: 0002-Remove-dependency-on-jtidy.patch
|
||||
Patch3: 0003-Disable-reporting.patch
|
||||
Patch0: 0001-Port-to-plexus-utils-3.0.24.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: mvn(com.thoughtworks.qdox:qdox)
|
||||
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.surefire:maven-surefire-common)
|
||||
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:maven-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
@ -30,14 +24,25 @@ 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.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.ow2.asm:asm)
|
||||
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
||||
%endif
|
||||
|
||||
%description
|
||||
The Maven Plugin Tools contains the necessary tools to be able to produce Maven
|
||||
@ -64,6 +69,13 @@ 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}
|
||||
@ -72,6 +84,13 @@ 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
|
||||
|
||||
@ -86,6 +105,35 @@ 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}
|
||||
|
||||
%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
|
||||
@ -99,9 +147,7 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch0 -p1
|
||||
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
|
||||
@ -110,24 +156,7 @@ API documentation for %{name}.
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
|
||||
|
||||
# Remove test dependencies because tests are skipped anyways.
|
||||
%pom_xpath_remove -r "pom:dependency[pom:scope='test']"
|
||||
%pom_remove_dep -r :easymock
|
||||
|
||||
%pom_xpath_remove "pom:execution[pom:id='generated-helpmojo']" maven-plugin-plugin
|
||||
|
||||
%pom_disable_module maven-script
|
||||
|
||||
%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_dep -r :doxia-sink-api
|
||||
%pom_remove_dep -r :doxia-site-renderer
|
||||
|
||||
rm maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/Plugin{Help,Xdoc}Generator.java
|
||||
rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
|
||||
|
||||
%pom_xpath_remove "pom:dependency[pom:scope='test']"
|
||||
|
||||
%build
|
||||
%mvn_build -s -f
|
||||
@ -140,82 +169,45 @@ rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport
|
||||
%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
|
||||
%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 Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.6.0-12
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-11
|
||||
- Rebuild to workaround DistroBaker issue
|
||||
|
||||
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-10
|
||||
- Bootstrap Maven for CentOS Stream 9
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-9
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.6.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Aug 22 2020 Fabio Valentini <decathorpe@gmail.com> - 0:3.6.0-7
|
||||
- Disable unused ant scripting support.
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.6.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:3.6.0-5
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Thu May 14 2020 Fabio Valentini <decathorpe@gmail.com> - 0:3.6.0-4
|
||||
- Ignore jTidy crashes when generating maven plugin descriptors.
|
||||
|
||||
* Mon Apr 20 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-4
|
||||
- Disable beanshell modules
|
||||
|
||||
* Sun Mar 29 2020 Fabio Valentini <decathorpe@gmail.com> - 0:3.6.0-3
|
||||
- Disable unused beanshell support.
|
||||
|
||||
* Fri Mar 27 2020 Fabio Valentini <decathorpe@gmail.com> - 0:3.6.0-2
|
||||
- Rebuild for fixed maven-parent.
|
||||
|
||||
* Thu Feb 27 2020 Jayashree Huttanagoudar <jhuttana@redhat.com> - 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 <releng@fedoraproject.org> - 0:3.5.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-3
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.5.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.5.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Jan 02 2019 Marian Koncek <mkoncek@redhat.com> - 0:3.6.0-1
|
||||
- Update to upstream version 3.6.0
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_contexts:
|
||||
- osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
|
||||
@ -1,7 +0,0 @@
|
||||
summary: Run javapackages-specific tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
|
||||
ref: c9s
|
||||
execute:
|
||||
how: tmt
|
||||
Loading…
Reference in New Issue
Block a user