diff --git a/.gitignore b/.gitignore index 72469a3..38214fe 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /modello-1.10.0-source-release.zip /modello-1.11-source-release.zip /modello-2.0.0-source-release.zip +/modello-2.1.1-source-release.zip diff --git a/0001-Remove-dependency-on-Jsoup.patch b/0001-Remove-dependency-on-Jsoup.patch deleted file mode 100644 index 4b0b20d..0000000 --- a/0001-Remove-dependency-on-Jsoup.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 dce2266..024871f 100644 --- a/modello.spec +++ b/modello.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: modello -Version: 2.0.0 -Release: 6%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Summary: Modello Data Model toolkit # 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, @@ -13,8 +13,6 @@ 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 @@ -26,14 +24,18 @@ BuildRequires: mvn(com.google.inject:guice) 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-enforcer-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.codehaus.plexus:plexus-compiler-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) 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) %endif @@ -58,7 +60,6 @@ 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 @@ -75,6 +76,11 @@ cp -p %{SOURCE1} LICENSE %pom_disable_module modello-plugin-snakeyaml modello-plugins %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin +# Requires velocity >= 2 +%pom_disable_module modello-plugin-velocity modello-plugins +%pom_remove_dep :modello-plugin-velocity modello-maven-plugin +rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java + %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) %mvn_build -f @@ -92,6 +98,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* Mon Aug 21 2023 Mikolaj Izdebski - 2.1.1-1 +- Update to upstream version 2.1.1 + * Thu Jul 20 2023 Fedora Release Engineering - 2.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 962387a..1eea067 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-2.0.0-source-release.zip) = 69934156fe0e1eab6ef26f02e87b0aab0de2c74642f2cd93ca8556004f918643f578449c9d322b0388d9ff6730f83265a72592cab7544095d11042aacab285a3 +SHA512 (modello-2.1.1-source-release.zip) = 928ecf83d7555bba534fc0ad0a71ac245d1508ee09de5db5ae84eb5e982b9a7fad8d5e7370641a1d93316f558ee151535f0c48e53a56ed31df54d6d628a7bb77 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8