.gitignore

@@ -1 +0,0 @@
-SOURCES/modello-1.11-source-release.zip

.modello.metadata

@@ -1 +0,0 @@
-a3ddeb4321878fcd8501e94738c556e9f0f6e98b SOURCES/modello-1.11-source-release.zip

SOURCES/0001-Remove-dependency-on-Jsoup.patch

@@ -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
+

SPECS/modello.spec

@@ -1,30 +1,42 @@
+%bcond_with bootstrap
+
 Name:           modello
-Version:        1.11
+Version:        2.0.0
 Release:        2%{?dist}
 Summary:        Modello Data Model toolkit
-# The majority of files are under MIT license, but some of them are
-# ASL 2.0 or BSD-licensed.
-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
+# The majority of files are under MIT license, but some of them are ASL 2.0.
+# 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
+ExclusiveArch:  %{java_arches} noarch
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-javac)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.jsoup:jsoup)
+BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
+BuildRequires:  mvn(org.sonatype.sisu:sisu-guice::no_aop:)
+%endif
+
 # Explicit javapackages-tools requires since modello script uses
 # /usr/share/java-utils/java-functions
 Requires:         javapackages-tools
@@ -38,20 +50,20 @@ architecture, various types of code and descriptors can be generated
 from the single model, including Java POJOs, XML
 marshallers/unmarshallers, XSD and documentation.
 
-%package javadoc
+%package        javadoc
 Summary:        Javadoc for %{name}
 
-%description javadoc
+%description    javadoc
 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
-# Avoid using Maven 2.x APIs
-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
@@ -62,12 +74,12 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
 
 %build
 # skip tests because we have too old xmlunit in Fedora now (1.0.8)
-%mvn_build -f -- -Dmaven.version=3.1.1
+%mvn_build -f
 
 %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
@@ -77,9 +89,50 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
 %doc LICENSE
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* 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
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-5
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.11-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu May 14 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.11-1
+- Update to version 1.11.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-2
 - Mass rebuild for javapackages-tools 201902
 
+* Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.0-1
+- Update to version 1.10.0.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 1.11-1
 - Update to upstream version 1.11
 
@@ -89,6 +142,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
 * Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.0-1
 - Update to upstream version 1.10.0
 
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.9.1-7
 - Add explicit requires on javapackages-tools for modello script.