diff --git a/0001-Remove-dependency-on-Jsoup.patch b/0001-Remove-dependency-on-Jsoup.patch new file mode 100644 index 0000000..4b0b20d --- /dev/null +++ b/0001-Remove-dependency-on-Jsoup.patch @@ -0,0 +1,52 @@ +From 12cc1a306dc83b9bd6b49486e0c2e7403c569f40 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 22 Apr 2022 18:25:53 +0200 +Subject: [PATCH] Remove dependency on Jsoup + +--- + modello-plugins/modello-plugin-xdoc/pom.xml | 5 ----- + .../org/codehaus/modello/plugin/xdoc/XdocGenerator.java | 6 +----- + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/modello-plugins/modello-plugin-xdoc/pom.xml b/modello-plugins/modello-plugin-xdoc/pom.xml +index 8e6705ad..2d3ad6b5 100644 +--- a/modello-plugins/modello-plugin-xdoc/pom.xml ++++ b/modello-plugins/modello-plugin-xdoc/pom.xml +@@ -27,11 +27,6 @@ + org.codehaus.plexus + plexus-utils + +- +- org.jsoup +- jsoup +- 1.14.3 +- + + org.xmlunit + xmlunit-core +diff --git a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java +index ad3bc2d1..5ff5b952 100644 +--- a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java ++++ b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java +@@ -56,8 +56,6 @@ import org.codehaus.plexus.util.StringUtils; + import org.codehaus.plexus.util.WriterFactory; + import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter; + import org.codehaus.plexus.util.xml.XMLWriter; +-import org.jsoup.Jsoup; +-import org.jsoup.nodes.Document; + + /** + * @author Jason van Zyl +@@ -787,8 +785,6 @@ public class XdocGenerator + */ + private static String rewrite( String text ) + { +- Document document = Jsoup.parseBodyFragment( text ); +- document.outputSettings().syntax( Document.OutputSettings.Syntax.xml ); +- return document.body().html(); ++ return text; + } + } +-- +2.35.1 + diff --git a/modello.spec b/modello.spec index ee9b3f6..c39f191 100644 --- a/modello.spec +++ b/modello.spec @@ -8,11 +8,13 @@ Summary: Modello Data Model toolkit # Some parts of the project are derived from the Exolab project, # and are licensed under a 5-clause BSD license. License: MIT and ASL 2.0 and BSD - URL: https://codehaus-plexus.github.io/modello + Source0: https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: https://www.apache.org/licenses/LICENSE-2.0.txt +Patch0: 0001-Remove-dependency-on-Jsoup.patch + BuildArch: noarch BuildRequires: maven-local @@ -30,7 +32,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) -BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) %endif @@ -56,6 +57,7 @@ API documentation for %{name}. %prep %setup -q +%patch0 -p1 cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin @@ -88,6 +90,7 @@ cp -p %{SOURCE1} LICENSE %changelog * Fri Apr 22 2022 Mikolaj Izdebski - 2.0.0-1 - Update to upstream version 2.0.0 +- Remove dependency on Jsoup * Sat Feb 05 2022 Jiri Vanek - 1.11-8 - Rebuilt for java-17-openjdk as system jdk