Compare commits

...
Sign in to create a new pull request.

20 commits

Author SHA1 Message Date
Fedora Release Engineering
3f0a143e49 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:47:35 +00:00
Jiri Vanek
4ef57d943f Bumped to jdk25 2026-01-06 12:46:38 +01:00
Jiri Vanek
d40de57f97 Rrevert to jdk21
during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
your package failed to build. Is preemptively reverted back to versioned jdk21
2025-07-30 14:03:39 +02:00
Jiri Vanek
088db4cba0 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-29 19:07:44 +02:00
Fedora Release Engineering
bc7feb4b0e Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:06:22 +00:00
Fedora Release Engineering
c083665ccf Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 11:17:02 +00:00
Miroslav Suchý
2c3ccb6403 convert ASL 2.0 license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-24 15:25:44 +02:00
Fedora Release Engineering
7f65550759 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 17:12:10 +00:00
Jiri Vanek
a75c26dfb8 Rebuilt for java-21-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java21
2024-02-27 14:47:04 +01:00
Mikolaj Izdebski
e82cc0a182 Port to apache-commons-logging 1.3.0 2024-02-01 05:40:46 +01:00
Fedora Release Engineering
bed22414ab Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 23:14:42 +00:00
Fedora Release Engineering
ba724aa8f1 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 13:15:18 +00:00
Fedora Release Engineering
1b8402a752 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 13:29:53 +00:00
Fedora Release Engineering
898f9071a4 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 21:55:14 +00:00
Fedora Release Engineering
d382229633 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 21:00:37 +00:00
Jiri
a2a56cee3c Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
2022-07-08 14:30:59 +02:00
Jiri
6130099ae7 Rebuilt for java-17-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java17
2022-02-05 19:29:31 +01:00
Fedora Release Engineering
e7f5396da4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 21:25:44 +00:00
Fedora Release Engineering
af8dc848d2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 17:43:41 +00:00
Fedora Release Engineering
42f36dca37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 12:47:41 +00:00
2 changed files with 98 additions and 6 deletions

View file

@ -3,19 +3,20 @@
Name: apache-%{short_name}
Version: 2.0.1
Release: 29%{?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 -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
%mvn_build -- -Dcommons.packageId=modeler
%install
%mvn_install
@ -66,6 +73,60 @@ 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
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

31
pom.xml
View file

@ -197,6 +197,37 @@
</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>