diff --git a/.gitignore b/.gitignore index bf64fe1..80d4ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/modello-1.11-source-release.zip +SOURCES/modello-2.1.2-source-release.zip diff --git a/.modello.metadata b/.modello.metadata index f26b191..9d8554c 100644 --- a/.modello.metadata +++ b/.modello.metadata @@ -1 +1 @@ -a3ddeb4321878fcd8501e94738c556e9f0f6e98b SOURCES/modello-1.11-source-release.zip +aa0db1bded5af1b2f5756ec2c340060d03c46c1e SOURCES/modello-2.1.2-source-release.zip diff --git a/SOURCES/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch b/SOURCES/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch new file mode 100644 index 0000000..5b845c9 --- /dev/null +++ b/SOURCES/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch @@ -0,0 +1,184 @@ +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/SPECS/modello.spec b/SPECS/modello.spec index b6cbf9a..2c267fd 100644 --- a/SPECS/modello.spec +++ b/SPECS/modello.spec @@ -1,33 +1,43 @@ +%bcond_with bootstrap + Name: modello -Version: 1.11 -Release: 2%{?dist} +Version: 2.1.2 +Release: 20%{?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 (Plexus in SPDX). +License: MIT AND Apache-2.0 AND Plexus +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 + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(junit:junit) +BuildRequires: mvn(com.google.inject:guice) +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.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.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-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) -# Explicit javapackages-tools requires since modello script uses -# /usr/share/java-utils/java-functions -Requires: javapackages-tools +%endif %description Modello is a Data Model toolkit in use by the Apache Maven Project. @@ -39,19 +49,22 @@ from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc API documentation for %{name}. %prep -%setup -q +%autosetup -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 :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 %pom_disable_module modello-plugin-jsonschema modello-plugins %pom_remove_dep :modello-plugin-jackson modello-maven-plugin @@ -60,26 +73,117 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %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 -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: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 %files -f .mfiles -%doc LICENSE +%license LICENSE %{_bindir}/modello %files javadoc -f .mfiles-javadoc -%doc LICENSE +%license LICENSE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 2.1.2-18 +- Drop explicit requires on javapackages-tools + +* 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 @@ -89,6 +193,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml * 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.