diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec index d67cd83..c771a1b 100644 --- a/apache-commons-modeler.spec +++ b/apache-commons-modeler.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 2.0.1 -Release: 49%{?dist} +Release: 43%{?dist} Summary: Model MBeans utility classes # Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 @@ -15,7 +15,7 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short # POM file based on the one from an unreleased upstream snapstream Source1: pom.xml -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local BuildRequires: mvn(commons-digester:commons-digester) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) @@ -55,7 +55,7 @@ cp -p %{SOURCE1} . # Fix ant dependency %pom_remove_dep ant:ant -%pom_add_dep org.apache.ant:ant:1.10 +%pom_add_dep org.apache.ant:ant:1.8 %mvn_alias : org.apache.commons:%{short_name} %mvn_file : %{name} %{short_name} @@ -73,18 +73,6 @@ 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 diff --git a/pom.xml b/pom.xml index cb08d1a..014a0cd 100644 --- a/pom.xml +++ b/pom.xml @@ -197,37 +197,6 @@ - - - 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} - - - - - -