packages/modello
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!5 Update to 2.0.0

Browse Source 
From: @wu-leilei 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2023-08-25 02:29:57 +00:00 committed by Gitee
commit be68112474
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 61 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

BIN
modello-1.11-source-release.zip
View File

Binary file not shown.

BIN
modello-2.0.0-source-release.zip Normal file
View File

Binary file not shown.

11
modello.spec
View File

@ -1,5 +1,5 @@
Name: modello
Version: 1.11
Version: 2.0.0
Release: 1
Epoch: 0
Summary: Modello Data Model toolkit
@ -7,6 +7,7 @@ License: ASL 2.0 and BSD and MIT
URL: http://codehaus-plexus.github.io/modello
Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: 0001-Remove-dependency-on-Jsoup.patch
BuildArch: noarch
@ -20,6 +21,8 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.jsoup:jsoup)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) mvn(org.yaml:snakeyaml)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:)
BuildRequires: xmlunit
Requires: javapackages-tools
@ -45,6 +48,7 @@ install -p %{SOURCE1} LICENSE
%pom_remove_plugin :maven-site-plugin
sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
%pom_remove_dep :jackson-bom
%pom_disable_module modello-plugin-jackson modello-plugins
%pom_disable_module modello-plugin-jsonschema modello-plugins
%pom_remove_dep :modello-plugin-jackson modello-maven-plugin
@ -58,7 +62,7 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
%install
%mvn_install
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice-no_aop:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true
%files -f .mfiles
%doc LICENSE
@ -67,6 +71,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
%files help -f .mfiles-javadoc
%changelog
* Tue Aug 22 2023 wulei <wu_lei@hoperun.com> - 0:2.0.0-1
- Update to 2.0.0
* Tue Feb 08 2022 Ge Wang <wangge20@huawei.com> - 0:1.11-1
- Update to version 1.11