rpms/modello
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove dependency on Jsoup

Browse Source
This commit is contained in:
Mikolaj Izdebski 2022-04-22 18:27:02 +02:00
parent 914fee37b7
commit 1e3b2371f6
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
0001-Remove-dependency-on-Jsoup.patch Normal file
View File

@ -0,0 +1,52 @@
From 12cc1a306dc83b9bd6b49486e0c2e7403c569f40 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>1.14.3</version>
- </dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
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 <a href="mailto:jason@modello.org">Jason van Zyl</a>
@@ -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

7
modello.spec
View File

@ -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 <mizdebsk@redhat.com> - 2.0.0-1
- Update to upstream version 2.0.0
- Remove dependency on Jsoup
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.11-8
- Rebuilt for java-17-openjdk as system jdk