Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-plugin-tools for
openSUSE:Factory checked in at 2023-07-25 11:51:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-plugin-tools (Old)
and /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1467 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-plugin-tools"
Tue Jul 25 11:51:43 2023 rev:8 rq:1100556 version:3.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-plugin-bootstrap.changes
2022-05-13 23:03:35.523146312 +0200
+++
/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1467/maven-plugin-plugin-bootstrap.changes
2023-07-25 11:53:35.386326015 +0200
@@ -1,0 +2,6 @@
+Mon Jul 24 21:05:56 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * 0004-Remove-dependency-on-jtidy.patch
+
+-------------------------------------------------------------------
maven-plugin-plugin.changes: same change
maven-plugin-tools.changes: same change
New:
----
0004-Remove-dependency-on-jtidy.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-plugin-plugin-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.SoW9c3/_old 2023-07-25 11:53:36.442332198 +0200
+++ /var/tmp/diff_new_pack.SoW9c3/_new 2023-07-25 11:53:36.446332222 +0200
@@ -30,6 +30,7 @@
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
+Patch3: 0004-Remove-dependency-on-jtidy.patch
# The maven-plugin-plugin is used to generate those descriptors, which
# creates a circular dependency of maven-plugin-plugin on itself.
# We generated those ones outside the rpm build for a bootstrap package.
@@ -70,6 +71,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch20 -p1
%pom_remove_plugin -r :maven-enforcer-plugin
++++++ maven-plugin-plugin.spec ++++++
--- /var/tmp/diff_new_pack.SoW9c3/_old 2023-07-25 11:53:36.470332362 +0200
+++ /var/tmp/diff_new_pack.SoW9c3/_new 2023-07-25 11:53:36.474332386 +0200
@@ -28,6 +28,7 @@
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
+Patch3: 0004-Remove-dependency-on-jtidy.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: unzip
@@ -78,6 +79,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%pom_remove_plugin -r :maven-enforcer-plugin
++++++ maven-plugin-tools.spec ++++++
--- /var/tmp/diff_new_pack.SoW9c3/_old 2023-07-25 11:53:36.506332573 +0200
+++ /var/tmp/diff_new_pack.SoW9c3/_new 2023-07-25 11:53:36.510332597 +0200
@@ -28,6 +28,7 @@
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
+Patch3: 0004-Remove-dependency-on-jtidy.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
BuildRequires: atinject
@@ -38,7 +39,6 @@
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: jdom2
-BuildRequires: jtidy
BuildRequires: junit
BuildRequires: maven-lib
BuildRequires: maven-reporting-api
@@ -157,6 +157,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%pom_remove_plugin -r :maven-enforcer-plugin
@@ -169,6 +170,8 @@
%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
+%pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators
+
%{mvn_package} :maven-plugin-tools __noinstall
%{mvn_package} :maven-script __noinstall
%{mvn_package} :{*} @1
@@ -184,7 +187,6 @@
guava/guava \
guice/google-guice-no_aop \
jdom2/jdom2 \
- jtidy \
junit \
maven/maven-artifact \
maven/maven-compat \
++++++ 0004-Remove-dependency-on-jtidy.patch ++++++
---
maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
2018-10-29 10:41:50.000000000 +0100
+++
maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
2023-07-24 23:08:19.511756145 +0200
@@ -544,11 +544,11 @@
{
description =
"<strong>" + getBundle( locale ).getString(
"report.plugin.goal.deprecated" ) + "</strong> "
- + GeneratorUtils.makeHtmlValid(
mojo.getDeprecated() );
+ + mojo.getDeprecated();
}
else if ( StringUtils.isNotEmpty( mojo.getDescription() ) )
{
- description = GeneratorUtils.makeHtmlValid(
mojo.getDescription() );
+ description = mojo.getDescription();
}
else
{
---
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
2018-10-29 10:41:50.000000000 +0100
+++
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
2023-07-24 22:39:51.914568518 +0200
@@ -51,7 +51,6 @@
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.
@@ -255,58 +254,6 @@
}
/**
- * 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:
* <ul>
@@ -337,7 +284,7 @@
try
{
- parser.parse( new StringReader( makeHtmlValid( html ) ),
htmlCallback, true );
+ parser.parse( new StringReader( html ), htmlCallback, true );
}
catch ( IOException e )
{
---
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
2018-10-29 10:41:50.000000000 +0100
+++
maven-plugin-tools-3.6.0/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
2023-07-24 22:49:33.765883927 +0200
@@ -202,7 +202,7 @@
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.deprecated" )
);
w.endElement(); // p
w.startElement( "div" );
- w.writeMarkup( GeneratorUtils.makeHtmlValid(
mojoDescriptor.getDeprecated() ) );
+ w.writeMarkup( mojoDescriptor.getDeprecated() );
w.endElement(); // div
}
@@ -212,7 +212,7 @@
w.startElement( "div" );
if ( StringUtils.isNotEmpty( mojoDescriptor.getDescription() ) )
{
- w.writeMarkup( GeneratorUtils.makeHtmlValid(
mojoDescriptor.getDescription() ) );
+ w.writeMarkup( mojoDescriptor.getDescription() );
}
else
{
@@ -470,14 +470,14 @@
{
w.startElement( "div" );
w.writeMarkup( format(
"pluginxdoc.mojodescriptor.parameter.deprecated",
- GeneratorUtils.makeHtmlValid(
parameter.getDeprecated() ) ) );
+ parameter.getDeprecated() ) );
w.endElement(); // div
}
w.startElement( "div" );
if ( StringUtils.isNotEmpty( parameter.getDescription() ) )
{
- w.writeMarkup( GeneratorUtils.makeHtmlValid(
parameter.getDescription() ) );
+ w.writeMarkup( parameter.getDescription() );
}
else
{
@@ -689,11 +689,11 @@
if ( StringUtils.isNotEmpty( parameter.getDeprecated() ) )
{
description = format(
"pluginxdoc.mojodescriptor.parameter.deprecated",
- GeneratorUtils.makeHtmlValid(
parameter.getDeprecated() ) );
+ parameter.getDeprecated() );
}
else if ( StringUtils.isNotEmpty( parameter.getDescription() ) )
{
- description = GeneratorUtils.makeHtmlValid(
parameter.getDescription() );
+ description = parameter.getDescription();
}
else
{
++++++ maven-plugin-plugin-bootstrap-resouces.patch ++++++
--- /var/tmp/diff_new_pack.SoW9c3/_old 2023-07-25 11:53:36.558332877 +0200
+++ /var/tmp/diff_new_pack.SoW9c3/_new 2023-07-25 11:53:36.562332901 +0200
@@ -388,7 +388,7 @@
+</plugin>
---
maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml
1970-01-01 01:00:00.000000000 +0100
+++
maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml
2019-11-25 11:05:03.978261704 +0100
-@@ -0,0 +1,1062 @@
+@@ -0,0 +1,1056 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+ <name>${project.name}</name>
@@ -1168,12 +1168,6 @@
+ <version>3.6.0</version>
+ </dependency>
+ <dependency>
-+ <groupId>net.sf.jtidy</groupId>
-+ <artifactId>jtidy</artifactId>
-+ <type>jar</type>
-+ <version>r938</version>
-+ </dependency>
-+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>dom3-xml-apis</artifactId>
+ <type>jar</type>
