diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec index a202b8c..d67cd83 100644 --- a/apache-commons-modeler.spec +++ b/apache-commons-modeler.spec @@ -3,19 +3,20 @@ Name: apache-%{short_name} Version: 2.0.1 -Release: 25%{?dist} +Release: 49%{?dist} Summary: Model MBeans utility classes -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: http://commons.apache.org/%{base_name}/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz # POM file based on the one from an unreleased upstream snapstream Source1: pom.xml -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-digester:commons-digester) -BuildRequires: mvn(commons-logging:commons-logging-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -43,18 +44,24 @@ sed -i 's/\r//' NOTICE.txt # Copy pom file into place cp -p %{SOURCE1} . +# Full commons-logging is a transitive dependency (through commons-digester) +%pom_remove_dep :commons-logging-api + +# xml-apis is part of JDK +%pom_remove_dep :xml-apis + # Remove redundant dep on mx4j %pom_remove_dep mx4j:mx4j-jmx # Fix ant dependency %pom_remove_dep ant:ant -%pom_add_dep org.apache.ant:ant:1.8 +%pom_add_dep org.apache.ant:ant:1.10 %mvn_alias : org.apache.commons:%{short_name} %mvn_file : %{name} %{short_name} %build -%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 +%mvn_build -- -Dcommons.packageId=modeler %install %mvn_install @@ -66,6 +73,72 @@ cp -p %{SOURCE1} . %doc LICENSE.txt NOTICE.txt %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.0.1-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 30 2025 jiri vanek - 2.0.1-46 +- Rrevert to jdk21 + +* Tue Jul 29 2025 jiri vanek - 2.0.1-45 +- Rebuilt for java-25-openjdk as preffered jdk + +* Wed Jul 23 2025 Fedora Release Engineering - 2.0.1-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 2.0.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 24 2024 Miroslav Suchý - 2.0.1-42 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 2.0.1-40 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 2.0.1-39 +- Port to apache-commons-logging 1.3.0 + +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 2.0.1-33 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 2.0.1-32 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 18 2020 Fabio Valentini - 2.0.1-27 +- Set javac source and target to 1.8 to fix Java 11 builds. + +* Fri Jul 10 2020 Jiri Vanek - 2.0.1-26 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/pom.xml b/pom.xml index 014a0cd..cb08d1a 100644 --- a/pom.xml +++ b/pom.xml @@ -197,6 +197,37 @@ + + + org.moditect + moditect-maven-plugin + ${commons.moditect-maven-plugin.version} + + + add-module-infos + package + + add-module-info + + + ${moditect.java.version} + +--ignore-missing-deps + --multi-release=${moditect.java.version} + + ${project.build.directory} + true + false + + + ${commons.module.name} + ${commons.moditect-maven-plugin.addServiceUses} + + + + + +