diff --git a/.gitignore b/.gitignore index 23ab49c..72469a3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,3 @@ /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 -/modello-2.1.2-source-release.zip 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/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch b/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch deleted file mode 100644 index 5b845c9..0000000 --- a/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch +++ /dev/null @@ -1,184 +0,0 @@ -From f892c4e5906fcacaec99a146a2a36dd4ca5d5166 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Sun, 27 Aug 2023 07:49:01 +0200 -Subject: [PATCH] Revert "Switch to codehaus plexus-build-api 1.2.0 (#345)" - -This reverts commit c689155598257f225963b9332f57fe72dfd78753. ---- - modello-core/pom.xml | 2 +- - .../codehaus/modello/plugin/AbstractModelloGenerator.java | 2 +- - modello-maven-plugin/pom.xml | 2 +- - .../modello/maven/AbstractModelloGeneratorMojo.java | 2 +- - .../codehaus/modello/maven/ModelloConvertersMojoTest.java | 8 +------- - .../org/codehaus/modello/maven/ModelloJavaMojoTest.java | 8 +------- - modello-plugins/modello-plugin-java/pom.xml | 2 +- - .../codehaus/modello/AbstractModelloGeneratorTest.java | 6 ------ - pom.xml | 4 ++-- - 9 files changed, 9 insertions(+), 27 deletions(-) - -diff --git a/modello-core/pom.xml b/modello-core/pom.xml -index 636c03fe..7f9adf39 100644 ---- a/modello-core/pom.xml -+++ b/modello-core/pom.xml -@@ -13,7 +13,7 @@ - - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api - - -diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java -index bb59b439..334e16e8 100644 ---- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java -+++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java -@@ -43,7 +43,6 @@ import org.codehaus.modello.model.ModelField; - import org.codehaus.modello.model.Version; - import org.codehaus.plexus.PlexusConstants; - import org.codehaus.plexus.PlexusContainer; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.component.repository.exception.ComponentLookupException; - import org.codehaus.plexus.context.Context; - import org.codehaus.plexus.context.ContextException; -@@ -51,6 +50,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; - import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; - import org.codehaus.plexus.util.StringUtils; - import org.codehaus.plexus.util.io.CachingWriter; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Jason van Zyl -diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml -index 3687fb05..57227449 100644 ---- a/modello-maven-plugin/pom.xml -+++ b/modello-maven-plugin/pom.xml -@@ -121,7 +121,7 @@ - modello-plugin-velocity - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api - - -diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java -index 762b5784..51b75a12 100644 ---- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java -+++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java -@@ -41,8 +41,8 @@ import org.codehaus.modello.ModelloParameterConstants; - import org.codehaus.modello.core.ModelloCore; - import org.codehaus.modello.model.Model; - import org.codehaus.modello.model.ModelValidationException; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.util.StringUtils; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Trygve Laugstøl -diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java -index 779f178d..23f466d3 100644 ---- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java -+++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java -@@ -26,10 +26,9 @@ import java.io.File; - import java.util.Arrays; - - import org.codehaus.modello.core.ModelloCore; --import org.codehaus.plexus.ContainerConfiguration; - import org.codehaus.plexus.PlexusTestCase; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.util.FileUtils; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Brett Porter -@@ -99,9 +98,4 @@ public class ModelloConvertersMojoTest extends PlexusTestCase { - - assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); - } -- -- @Override -- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { -- containerConfiguration.setClassPathScanning("cache"); -- } - } -diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java -index f15b4031..bb5bb7cf 100644 ---- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java -+++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java -@@ -26,10 +26,9 @@ import java.io.File; - import java.util.Arrays; - - import org.codehaus.modello.core.ModelloCore; --import org.codehaus.plexus.ContainerConfiguration; - import org.codehaus.plexus.PlexusTestCase; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.util.FileUtils; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Trygve Laugstøl -@@ -97,9 +96,4 @@ public class ModelloJavaMojoTest extends PlexusTestCase { - assertFalse( - "The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); - } -- -- @Override -- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { -- containerConfiguration.setClassPathScanning("cache"); -- } - } -diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml -index ea94c3c6..6ba7c01f 100644 ---- a/modello-plugins/modello-plugin-java/pom.xml -+++ b/modello-plugins/modello-plugin-java/pom.xml -@@ -17,7 +17,7 @@ - plexus-utils - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api - - -diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java -index f46cece1..e71231fb 100644 ---- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java -+++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java -@@ -32,7 +32,6 @@ import java.io.Reader; - import java.util.Optional; - import java.util.Properties; - --import org.codehaus.plexus.ContainerConfiguration; - import org.codehaus.plexus.PlexusTestCase; - import org.codehaus.plexus.util.FileUtils; - import org.codehaus.plexus.util.ReaderFactory; -@@ -108,9 +107,4 @@ public abstract class AbstractModelloGeneratorTest extends PlexusTestCase { - new File(getOutputDirectory(), generatedXsdName)); - return saxParser; - } -- -- @Override -- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { -- containerConfiguration.setClassPathScanning("cache"); -- } - } -diff --git a/pom.xml b/pom.xml -index 88f8ed6f..9a4ac6df 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -347,9 +347,9 @@ - 4.0.0 - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api -- 1.2.0 -+ 0.0.7 - - - junit --- -2.41.0 - diff --git a/changelog b/changelog deleted file mode 100644 index ab10cdb..0000000 --- a/changelog +++ /dev/null @@ -1,274 +0,0 @@ -* Wed Aug 21 2024 Mikolaj Izdebski - 2.1.2-10 -- Fix for Sisu 0.9.0.M3 - -* Wed Jul 24 2024 Mikolaj Izdebski - 2.1.2-9 -- Install license files in licensedir instead of docdir - -* Thu Jul 18 2024 Fedora Release Engineering - 2.1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 2.1.2-7 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 2.1.2-6 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 2.1.2-5 -- bump of release for for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 2.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 2.1.2-2 -- Convert License tag to SPDX format - -* Mon Aug 28 2023 Mikolaj Izdebski - 2.1.2-1 -- Update to upstream version 2.1.2 - -* 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 - -* Fri Mar 31 2023 Mikolaj Izdebski - 2.0.0-5 -- Rebuild with no changes - -* Tue Mar 21 2023 Mikolaj Izdebski - 2.0.0-4 -- Port to Google Guice 5 - -* Thu Jan 19 2023 Fedora Release Engineering - 2.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* 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 - -* Thu Jan 20 2022 Fedora Release Engineering - 1.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.11-5 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 0:1.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0:1.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 0:1.11-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu May 14 2020 Fabio Valentini - 0:1.11-1 -- Update to version 1.11. - -* Wed Jan 29 2020 Fedora Release Engineering - 0:1.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.11-2 -- Mass rebuild for javapackages-tools 201902 - -* Tue Aug 20 2019 Fabio Valentini - 0:1.10.0-1 -- Update to version 1.10.0. - -* Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 26 2019 Marian Koncek - 1.11-1 -- Update to upstream version 1.11 - -* Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 -- Mass rebuild for javapackages-tools 201901 - -* Sat Apr 13 2019 Mikolaj Izdebski - 1.10.0-1 -- Update to upstream version 1.10.0 - -* Fri Feb 01 2019 Fedora Release Engineering - 0:1.9.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Severin Gehwolf - 0:1.9.1-7 -- Add explicit requires on javapackages-tools for modello script. - -* Tue Jul 17 2018 Mikolaj Izdebski - 0:1.9.1-6 -- Allow conditionally building without snakeyaml - -* Fri Jul 13 2018 Fedora Release Engineering - 0:1.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 0:1.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Nov 27 2017 Mikolaj Izdebski - 0:1.9.1-3 -- Contitionally allow building without jackson - -* Wed Jul 26 2017 Fedora Release Engineering - 0:1.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 29 2017 Michael Simacek - 0:1.9.1-1 -- Update to upstream version 1.9.1 - -* Fri Feb 10 2017 Fedora Release Engineering - 0:1.8.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jun 15 2016 Mikolaj Izdebski - 0:1.8.3-4 -- Regenerate build-requires -- Remove old obsoletes/provides - -* Thu Feb 04 2016 Fedora Release Engineering - 0:1.8.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0:1.8.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 26 2015 Michael Simacek - 0:1.8.3-1 -- Update to upstream version 1.8.3 - -* Mon Nov 3 2014 Mikolaj Izdebski - 0:1.8.2-1 -- Update to upstream version 1.8.2 - -* Sat Jun 07 2014 Fedora Release Engineering - 0:1.8.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.8.1-4 -- Use Requires: java-headless rebuild (#1067528) - -* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.8.1-3 -- Backport upstream patches for MODELLO-284 and MODELLO-285 - -* Mon Jan 27 2014 Mikolaj Izdebski - 0:1.8.1-2 -- Use Maven 3.x APIs - -* Mon Aug 19 2013 Mikolaj Izdebski - 0:1.8.1-1 -- Update to upstream version 1.8.1 - -* Sat Aug 03 2013 Fedora Release Engineering - 0:1.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Apr 19 2013 Mikolaj Izdebski - 0:1.7-2 -- Build with xmvn -- Use better description -- Simplify build-requires -- Update to current packaging guidelines - -* Thu Feb 21 2013 Mikolaj Izdebski - 0:1.7-1 -- Update to upstream version 1.7 - -* Mon Feb 18 2013 Mikolaj Izdebski - 0:1.6-1 -- Update to upstream version 1.6 - -* Thu Feb 14 2013 Fedora Release Engineering - 0:1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 0:1.5-6 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-5 -- Add JPP depmap for maven-project to override versionless depmap -- Add missing BR/R: maven-project -- Remove unneeded BR: jpa_api - -* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-4 -- Fix license tag -- Install text of Apache license - -* Fri Jul 20 2012 Fedora Release Engineering - 0:1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0:1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Aug 8 2011 Alexander Kurtakov 0:1.5-1 -- Update to upstream 1.5. - -* Tue Feb 08 2011 Fedora Release Engineering - 0:1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jan 26 2011 Alexander Kurtakov 0:1.4.1-1 -- Update to upstream 1.4.1. - -* Wed Dec 1 2010 Stanislav Ochotnicky - 0:1.4-3 -- Fix pom filenames (remove poms of integration tests) Resolves rhbz#655818 -- Use jpackage_script macro to generate script - -* Thu Aug 26 2010 Stanislav Ochotnicky - 0:1.4-2 -- Remove dtdparser BR/R - -* Tue Jul 20 2010 Stanislav Ochotnicky - 0:1.4-1 -- Update to latest upstream version -- Re-enable javadoc generation -- Remove old workarounds/patches - -* Mon May 24 2010 Yong Yang 1.1-2 -- Fix JPP pom name -- Disable javadoc:javadoc due to the failure of maven-doxia - -* Mon May 24 2010 Yong Yang 1.1-1 -- Upgrade to 1.1 - -* Fri May 21 2010 Yong Yang 1.0.1-1 -- Upgrade to 1.0.1 - -* Thu Aug 20 2009 Andrew Overholt 1.0-0.4.a15.0.1 -- Update to alpha 15 courtesy Deepak Bhole - -* Sat Jul 25 2009 Fedora Release Engineering - 0:1.0-0.3.a8.4.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:1.0-0.2.a8.4.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a8.4.4 -- drop repotag - -* Tue Mar 20 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.3 -- disable gcj support - -* Tue Mar 13 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.2 -- Change license to MIT to reflex the actual license specified in the - source headers. -- fix various rpmlint issues - -* Mon Feb 26 2007 Tania Bento 0:1.0-0.1.a8.4jpp.1 -- Fixed %%Release. -- Fixed %%License. -- Fixed %%BuildRoot. -- Removed %%Vendor. -- Removed %%Distribution. -- Defined _with_gcj_support and gcj_support. -- Fixed instructions on how to generate the source drop. - -* Fri Dec 01 2006 Deepak Bhole 1.0-0.a8.4jpp -- Added an obsoletes for older versions of the plugin - -* Thu Oct 19 2006 Deepak Bhole 1.0-0.a8.3jpp -- Update for maven2 9jpp -- Merge maven-plugin subpackage into the main one - -* Mon Sep 11 2006 Ralph Apel - 0:1.0-0.a8.2jpp -- Add gcj_support option -- Add post/postun Requires for javadoc -- Don't omit maven-plugin upload - -* Fri Jun 23 2006 Deepak Bhole - 0:1.0-0.a8.1jpp -- Upgrade to 1.0-alpha-8 -- Remove ant build, add maven2 build - -* Thu Jun 01 2006 Fernando Nasser - 0:1.0-0.a4.2jpp -- First JPP 1.7 build - -* Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a4.1jpp -- First JPackage build diff --git a/modello.spec b/modello.spec index ff2325f..c42f701 100644 --- a/modello.spec +++ b/modello.spec @@ -1,44 +1,45 @@ %bcond_with bootstrap Name: modello -Version: 2.1.2 -Release: %autorelease +Version: 2.0.0 +Release: 3%{?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, -# and are licensed under a 5-clause BSD license (Plexus in SPDX). -License: MIT AND Apache-2.0 AND Plexus +# and are licensed under a 5-clause BSD license. +License: MIT and ASL 2.0 and BSD URL: https://codehaus-plexus.github.io/modello -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch 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 -Patch: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch +Patch0: 0001-Remove-dependency-on-Jsoup.patch + +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(com.google.inject:guice) +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.velocity:velocity-engine-core) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +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.codehaus.plexus:plexus:pom:) 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 -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 2.1.2-23 + +# Explicit javapackages-tools requires since modello script uses +# /usr/share/java-utils/java-functions +Requires: javapackages-tools %description Modello is a Data Model toolkit in use by the Apache Maven Project. @@ -49,16 +50,18 @@ 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 +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + %prep -%autosetup -p1 -C +%setup -q +%patch0 -p1 cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :maven-enforcer-plugin - -%pom_remove_dep :plexus-xml modello-core -%pom_remove_dep :sisu-guice modello-core -%pom_add_dep com.google.inject:guice modello-core %pom_remove_dep :jackson-bom %pom_disable_module modello-plugin-jackson modello-plugins @@ -69,20 +72,252 @@ cp -p %{SOURCE1} LICENSE %pom_disable_module modello-plugin-snakeyaml modello-plugins %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin -%pom_disable_module modello-test - %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) -%mvn_build -j -f +%mvn_build -f %install %mvn_install -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:sisu/org.eclipse.sisu.plexus:sisu/org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api0:guava:velocity/velocity-engine-core %{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 -%license LICENSE +%doc LICENSE %{_bindir}/modello +%files javadoc -f .mfiles-javadoc +%doc LICENSE + %changelog -%autochangelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* 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 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.11-5 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 0:1.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0:1.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 0:1.11-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 14 2020 Fabio Valentini - 0:1.11-1 +- Update to version 1.11. + +* Wed Jan 29 2020 Fedora Release Engineering - 0:1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.11-2 +- Mass rebuild for javapackages-tools 201902 + +* Tue Aug 20 2019 Fabio Valentini - 0:1.10.0-1 +- Update to version 1.10.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 26 2019 Marian Koncek - 1.11-1 +- Update to upstream version 1.11 + +* Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 +- Mass rebuild for javapackages-tools 201901 + +* Sat Apr 13 2019 Mikolaj Izdebski - 1.10.0-1 +- Update to upstream version 1.10.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 0:1.9.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Severin Gehwolf - 0:1.9.1-7 +- Add explicit requires on javapackages-tools for modello script. + +* Tue Jul 17 2018 Mikolaj Izdebski - 0:1.9.1-6 +- Allow conditionally building without snakeyaml + +* Fri Jul 13 2018 Fedora Release Engineering - 0:1.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 0:1.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Nov 27 2017 Mikolaj Izdebski - 0:1.9.1-3 +- Contitionally allow building without jackson + +* Wed Jul 26 2017 Fedora Release Engineering - 0:1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 29 2017 Michael Simacek - 0:1.9.1-1 +- Update to upstream version 1.9.1 + +* Fri Feb 10 2017 Fedora Release Engineering - 0:1.8.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jun 15 2016 Mikolaj Izdebski - 0:1.8.3-4 +- Regenerate build-requires +- Remove old obsoletes/provides + +* Thu Feb 04 2016 Fedora Release Engineering - 0:1.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0:1.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Michael Simacek - 0:1.8.3-1 +- Update to upstream version 1.8.3 + +* Mon Nov 3 2014 Mikolaj Izdebski - 0:1.8.2-1 +- Update to upstream version 1.8.2 + +* Sat Jun 07 2014 Fedora Release Engineering - 0:1.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.8.1-4 +- Use Requires: java-headless rebuild (#1067528) + +* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.8.1-3 +- Backport upstream patches for MODELLO-284 and MODELLO-285 + +* Mon Jan 27 2014 Mikolaj Izdebski - 0:1.8.1-2 +- Use Maven 3.x APIs + +* Mon Aug 19 2013 Mikolaj Izdebski - 0:1.8.1-1 +- Update to upstream version 1.8.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 19 2013 Mikolaj Izdebski - 0:1.7-2 +- Build with xmvn +- Use better description +- Simplify build-requires +- Update to current packaging guidelines + +* Thu Feb 21 2013 Mikolaj Izdebski - 0:1.7-1 +- Update to upstream version 1.7 + +* Mon Feb 18 2013 Mikolaj Izdebski - 0:1.6-1 +- Update to upstream version 1.6 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0:1.5-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-5 +- Add JPP depmap for maven-project to override versionless depmap +- Add missing BR/R: maven-project +- Remove unneeded BR: jpa_api + +* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-4 +- Fix license tag +- Install text of Apache license + +* Fri Jul 20 2012 Fedora Release Engineering - 0:1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Aug 8 2011 Alexander Kurtakov 0:1.5-1 +- Update to upstream 1.5. + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 26 2011 Alexander Kurtakov 0:1.4.1-1 +- Update to upstream 1.4.1. + +* Wed Dec 1 2010 Stanislav Ochotnicky - 0:1.4-3 +- Fix pom filenames (remove poms of integration tests) Resolves rhbz#655818 +- Use jpackage_script macro to generate script + +* Thu Aug 26 2010 Stanislav Ochotnicky - 0:1.4-2 +- Remove dtdparser BR/R + +* Tue Jul 20 2010 Stanislav Ochotnicky - 0:1.4-1 +- Update to latest upstream version +- Re-enable javadoc generation +- Remove old workarounds/patches + +* Mon May 24 2010 Yong Yang 1.1-2 +- Fix JPP pom name +- Disable javadoc:javadoc due to the failure of maven-doxia + +* Mon May 24 2010 Yong Yang 1.1-1 +- Upgrade to 1.1 + +* Fri May 21 2010 Yong Yang 1.0.1-1 +- Upgrade to 1.0.1 + +* Thu Aug 20 2009 Andrew Overholt 1.0-0.4.a15.0.1 +- Update to alpha 15 courtesy Deepak Bhole + +* Sat Jul 25 2009 Fedora Release Engineering - 0:1.0-0.3.a8.4.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.0-0.2.a8.4.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a8.4.4 +- drop repotag + +* Tue Mar 20 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.3 +- disable gcj support + +* Tue Mar 13 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.2 +- Change license to MIT to reflex the actual license specified in the + source headers. +- fix various rpmlint issues + +* Mon Feb 26 2007 Tania Bento 0:1.0-0.1.a8.4jpp.1 +- Fixed %%Release. +- Fixed %%License. +- Fixed %%BuildRoot. +- Removed %%Vendor. +- Removed %%Distribution. +- Defined _with_gcj_support and gcj_support. +- Fixed instructions on how to generate the source drop. + +* Fri Dec 01 2006 Deepak Bhole 1.0-0.a8.4jpp +- Added an obsoletes for older versions of the plugin + +* Thu Oct 19 2006 Deepak Bhole 1.0-0.a8.3jpp +- Update for maven2 9jpp +- Merge maven-plugin subpackage into the main one + +* Mon Sep 11 2006 Ralph Apel - 0:1.0-0.a8.2jpp +- Add gcj_support option +- Add post/postun Requires for javadoc +- Don't omit maven-plugin upload + +* Fri Jun 23 2006 Deepak Bhole - 0:1.0-0.a8.1jpp +- Upgrade to 1.0-alpha-8 +- Remove ant build, add maven2 build + +* Thu Jun 01 2006 Fernando Nasser - 0:1.0-0.a4.2jpp +- First JPP 1.7 build + +* Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a4.1jpp +- First JPackage build diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index ae17c0c..8f6c9cb 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 execute: how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf index a1e7bfd..72ff510 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,5 +1,20 @@ summary: Basic smoke test discover: - how: fmf + how: shell + tests: + - name: /smoke/generate-stax-reader + test: | + set -x + PATH=/usr/lib/jvm/java-11-openjdk/bin:${PATH} + modello plans/smoke.mdo java test-src 1.0.0 foo 8 + javac -d test-bin test-src/smoke/* + modello plans/smoke.mdo stax-reader test-src 1.0.0 foo 8 + javac -d test-bin -cp test-bin test-src/smoke/io/stax/* + find test-src test-bin + test -f test-bin/smoke/SomeBean.class + test -f test-bin/smoke/io/stax/SmokeStaxReader.class +prepare: + how: install + package: java-11-openjdk-devel execute: how: tmt diff --git a/tests/Sanity/smoke/smoke.mdo b/plans/smoke.mdo similarity index 100% rename from tests/Sanity/smoke/smoke.mdo rename to plans/smoke.mdo diff --git a/sources b/sources index 975aeff..962387a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-2.1.2-source-release.zip) = 2824bcd3fbf8244fbec527e06f1be9aa17a176e4fd4159c228b576f62f94592c19fd39581fa4cd211c4ddc07b86d3595c992cf0a7405e341513bdd74261f4ecd +SHA512 (modello-2.0.0-source-release.zip) = 69934156fe0e1eab6ef26f02e87b0aab0de2c74642f2cd93ca8556004f918643f578449c9d322b0388d9ff6730f83265a72592cab7544095d11042aacab285a3 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf deleted file mode 100644 index bd1bd91..0000000 --- a/tests/Sanity/smoke/main.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: modello smoke test -description: | - Test basic functionality of modello. -require: - - modello - - java-21-openjdk-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh deleted file mode 100755 index c5cca84..0000000 --- a/tests/Sanity/smoke/runtest.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# Author: Mikolaj Izdebski -. /usr/share/beakerlib/beakerlib.sh - -rlJournalStart - - PATH=/usr/lib/jvm/java-21-openjdk/bin:${PATH} - - rlPhaseStartTest "check for presence of modello command" - rlAssertRpm modello - rlAssertBinaryOrigin modello modello - rlPhaseEnd - - rlPhaseStartTest "display modello usage" - rlRun -s "modello" 1 - rlAssertGrep "Usage: modello" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "generate STAX reader" - rlRun "modello smoke.mdo java test-src 1.0.0 foo 8" - rlRun "javac -d test-bin test-src/smoke/*" - rlAssertExists test-bin/smoke/SomeBean.class - rlRun "modello smoke.mdo stax-reader test-src 1.0.0 foo 8" - rlRun "javac -d test-bin -cp test-bin test-src/smoke/io/stax/*" - rlAssertExists test-bin/smoke/io/stax/SmokeStaxReader.class - rlPhaseEnd - -rlJournalEnd -rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index 99fd67e..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,4 +0,0 @@ -contact: Mikolaj Izdebski -framework: beakerlib -test: ./runtest.sh -tier: 0