apache-commons-modeler.spec

@@ -3,20 +3,19 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          49%{?dist}
+Release:          30%{?dist}
 Summary:          Model MBeans utility classes
-# Automatically converted from old format: ASL 2.0 - review is highly recommended.
+License:          ASL 2.0
-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-openjdk25
+BuildRequires:  maven-local
 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:)
@@ -44,24 +43,18 @@ 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.10
+%pom_add_dep org.apache.ant:ant:1.8
 
 %mvn_alias : org.apache.commons:%{short_name}
 %mvn_file : %{name} %{short_name}
 
 %build
-%mvn_build -- -Dcommons.packageId=modeler
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
@@ -73,57 +66,6 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-49
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 2.0.1-46
-- Rrevert to jdk21
-
-* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 2.0.1-45
-- Rebuilt for java-25-openjdk as preffered jdk
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-44
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-43
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.1-42
-- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-41
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.0.1-40
-- Rebuilt for java-21-openjdk as system jdk
-
-* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-39
-- Port to apache-commons-logging 1.3.0
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-38
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-36
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.1-33
-- Rebuilt for Drop i686 JDKs
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.1-32
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

pom.xml

@@ -197,37 +197,6 @@
           </ignorePathsToDelete>
         </configuration>
       </plugin>
-<!-- copied from parent to be modified-->
-          <plugin>
-            <groupId>org.moditect</groupId>
-            <artifactId>moditect-maven-plugin</artifactId>
-            <version>${commons.moditect-maven-plugin.version}</version>
-            <executions>
-              <execution>
-                <id>add-module-infos</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>add-module-info</goal>
-                </goals>
-                <configuration>
-                  <jvmVersion>${moditect.java.version}</jvmVersion>
-                  <jdepsExtraArgs>
-<!-- added config--><arg>--ignore-missing-deps</arg> <!-- added config-->
-                    <arg>--multi-release=${moditect.java.version}</arg>
-                  </jdepsExtraArgs>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                  <overwriteExistingFiles>true</overwriteExistingFiles>
-                  <failOnWarning>false</failOnWarning>
-                  <module>
-                    <moduleInfo>
-                      <name>${commons.module.name}</name>
-                      <addServiceUses>${commons.moditect-maven-plugin.addServiceUses}</addServiceUses>
-                    </moduleInfo>
-                  </module>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
     </plugins>
   </build>