Compare commits

..

1 commit

2 changed files with 5 additions and 58 deletions

View file

@ -3,10 +3,9 @@
Name: apache-%{short_name}
Version: 2.0.1
Release: 49%{?dist}
Release: 40%{?dist}
Summary: Model MBeans utility classes
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
License: Apache-2.0
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
@ -15,7 +14,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 +54,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,28 +72,7 @@ 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
* Sat Mar 02 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

31
pom.xml
View file

@ -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>