Update to upstream version 3.6.4
This commit is contained in:
Mikolaj Izdebski
parent
b568f08a08
commit
e9ade24419
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@
|
||||
/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
|
||||
/maven-plugin-tools-3.6.4-source-release.zip
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4d7b7bbd40fb82ef78f0a27135a8dc9075d132ea Mon Sep 17 00:00:00 2001
|
||||
From 61004624dc5027f116cd816add736c978da4ddaf 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
|
||||
@ -9,7 +9,7 @@ Subject: [PATCH 1/3] Disable help MOJO generation
|
||||
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
|
||||
index 7cc472e5..a51430d1 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;
|
||||
@ -34,8 +34,8 @@ index 767567b..1004867 100644
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@@ -77,7 +69,7 @@ public class HelpGeneratorMojo
|
||||
*/
|
||||
@@ -79,7 +71,7 @@ public class HelpGeneratorMojo
|
||||
@Override
|
||||
protected Generator createGenerator()
|
||||
{
|
||||
- return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setVelocityComponent( this.velocity );
|
||||
@ -43,7 +43,7 @@ index 767567b..1004867 100644
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -86,16 +78,6 @@ public class HelpGeneratorMojo
|
||||
@@ -89,16 +81,6 @@ public class HelpGeneratorMojo
|
||||
public void execute()
|
||||
throws MojoExecutionException
|
||||
{
|
||||
@ -61,10 +61,10 @@ index 767567b..1004867 100644
|
||||
|
||||
}
|
||||
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
|
||||
index 6e777c08..3d3f8c59 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
|
||||
@@ -65,22 +65,11 @@ public class PluginDescriptorGenerator
|
||||
public void execute( File destinationDirectory, PluginToolsRequest request )
|
||||
throws GeneratorException
|
||||
{
|
||||
@ -80,7 +80,7 @@ index 1375cae..9e3d556 100644
|
||||
- // write plugin-help.xml help-descriptor
|
||||
- MavenProject mavenProject = request.getProject();
|
||||
-
|
||||
- f = new File( mavenProject.getBuild().getOutputDirectory(),
|
||||
- f = new File( destinationDirectory,
|
||||
- PluginHelpGenerator.getPluginHelpPath( mavenProject ) );
|
||||
-
|
||||
- writeDescriptor( f, request, true );
|
||||
@ -88,5 +88,5 @@ index 1375cae..9e3d556 100644
|
||||
catch ( IOException e )
|
||||
{
|
||||
--
|
||||
2.25.2
|
||||
2.35.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 39be64eff05c5db20b863ac971d2de5707ae8017 Mon Sep 17 00:00:00 2001
|
||||
From 6953b37ee5a7c0566d2e11e7141768f8a4c03fa2 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
|
||||
@ -8,18 +8,18 @@ Subject: [PATCH 2/3] Remove dependency on jtidy
|
||||
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
|
||||
index e9ec47fe..1393b507 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;
|
||||
@@ -52,7 +52,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
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
@@ -262,58 +261,6 @@ public final class GeneratorUtils
|
||||
return decoded.toString();
|
||||
}
|
||||
|
||||
@ -53,7 +53,7 @@ index 771b08b..0346778 100644
|
||||
- try
|
||||
- {
|
||||
- ByteArrayOutputStream out = new ByteArrayOutputStream( commentCleaned.length() + 256 );
|
||||
- tidy.parse( new ByteArrayInputStream( commentCleaned.getBytes( "UTF-8" ) ), out );
|
||||
- tidy.parse( new ByteArrayInputStream( commentCleaned.getBytes( UTF_8 ) ), out );
|
||||
- commentCleaned = out.toString( "UTF-8" );
|
||||
- }
|
||||
- catch ( UnsupportedEncodingException e )
|
||||
@ -78,7 +78,7 @@ index 771b08b..0346778 100644
|
||||
/**
|
||||
* 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
|
||||
@@ -345,7 +292,7 @@ public final class GeneratorUtils
|
||||
|
||||
try
|
||||
{
|
||||
@ -88,5 +88,5 @@ index 771b08b..0346778 100644
|
||||
catch ( IOException e )
|
||||
{
|
||||
--
|
||||
2.25.2
|
||||
2.35.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 8d455cd296ab9b3d762ddac71b3f51df234b66c1 Mon Sep 17 00:00:00 2001
|
||||
From 3eeaf5c2131d6a13dc15e116a8d08de57298289e 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
|
||||
@ -8,10 +8,10 @@ Subject: [PATCH 3/3] Disable reporting
|
||||
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
|
||||
index 1393b507..3f8d05e4 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;
|
||||
@@ -48,7 +48,6 @@ 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;
|
||||
@ -19,7 +19,7 @@ index 0346778..6ac66f8 100644
|
||||
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
|
||||
@@ -605,65 +604,4 @@ public final class GeneratorUtils
|
||||
return packageName;
|
||||
}
|
||||
|
||||
@ -86,5 +86,5 @@ index 0346778..6ac66f8 100644
|
||||
-
|
||||
}
|
||||
--
|
||||
2.25.2
|
||||
2.35.1
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: maven-plugin-tools
|
||||
Version: 3.6.0
|
||||
Release: 12%{?dist}
|
||||
Version: 3.6.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Maven Plugin Tools
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugin-tools/
|
||||
@ -22,21 +22,22 @@ 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(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:maven-settings)
|
||||
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
|
||||
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.eclipse.sisu:org.eclipse.sisu.plexus)
|
||||
BuildRequires: mvn(org.ow2.asm:asm)
|
||||
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -109,10 +110,6 @@ API documentation for %{name}.
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<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
|
||||
@ -125,6 +122,9 @@ API documentation for %{name}.
|
||||
%pom_remove_dep -r :doxia-sink-api
|
||||
%pom_remove_dep -r :doxia-site-renderer
|
||||
|
||||
%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/Plugin{Help,Xdoc}Generator.java
|
||||
rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
|
||||
|
||||
@ -159,6 +159,9 @@ rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 28 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.4-1
|
||||
- Update to upstream version 3.6.4
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.6.0-12
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (maven-plugin-tools-3.6.0-source-release.zip) = d0028acaf5a9a083230272fa49a93c1acb9a6f8677d5609649bb95e4f27340d692b14e1987b0ddba218bc7afbd38652d04660607a97b6a932d3e4b36734dfbc3
|
||||
SHA512 (maven-plugin-tools-3.6.4-source-release.zip) = d6a9c46ad324d77258cb2ccdddf7d3673734f9412c2863d21cde10a3853c1bcd1d15427851b49660d19c2707e2116d10aace13876c656d23c178998717970c07
|
||||
|
||||
Loading…
Reference in New Issue
Block a user