.gitignore

@@ -1 +1 @@
-SOURCES/jaf-1.2.2.tar.gz
+SOURCES/jaf-2.1.2.tar.gz

.jakarta-activation.metadata

@@ -1 +1 @@
-34af0b68133cadd23f16f2b34d2031b8d3a97959 SOURCES/jaf-1.2.2.tar.gz
+d47047df898a5d89014a31e9096d900cb2ed3d39 SOURCES/jaf-2.1.2.tar.gz

SPECS/jakarta-activation.spec

@@ -1,19 +1,28 @@
+%bcond_with bootstrap
+
 Name:           jakarta-activation
-Version:        1.2.2
+Version:        2.1.2
 Release:        6%{?dist}
-Summary:        Jakarta Activation Specification and Implementation
-License:        BSD
-URL:            https://eclipse-ee4j.github.io/jaf/
+Summary:        Jakarta Activation API
+# the whole project is licensed under (EPL-2.0 or BSD)
+# the source code additionally can be licensed under GPLv2 with exceptions
+# we only ship built source code
+License:        EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only WITH Classpath-exception-2.0
+URL:            https://jakartaee.github.io/jaf-api/
 BuildArch:      noarch
+%if 0%{?java_arches:1}
+ExclusiveArch:  %{java_arches} noarch
+%endif
 
 Source0:        https://github.com/eclipse-ee4j/jaf/archive/%{version}/jaf-%{version}.tar.gz
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
-BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+%endif
 
 %description
 Jakarta Activation lets you take advantage of standard services to:
@@ -28,52 +37,80 @@ Summary:        Javadoc for %{name}
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n jaf-%{version}
+%setup -q -n jaf-api-%{version}
 
+pushd api
 %pom_remove_parent
-%pom_disable_module demo
-
-%pom_remove_plugin :directory-maven-plugin
-sed -i 's/${main.basedir}/${basedir}/' pom.xml
 
 # remove custom doclet configuration
-%pom_remove_plugin :maven-javadoc-plugin activation
+%pom_remove_plugin :maven-javadoc-plugin
 
-# set bundle version manually instead of with osgiversion-maven-plugin
-# (the plugin is only used to strip off -SNAPSHOT or -Mx qualifiers)
-%pom_remove_plugin :osgiversion-maven-plugin
-sed -i "s/\${activation.osgiversion}/%{version}/g" activation/pom.xml
+%pom_remove_plugin -r :buildnumber-maven-plugin
+%pom_remove_plugin -r :maven-enforcer-plugin
+popd
 
 %build
-# javadoc temporairly disabled due to https://github.com/fedora-java/xmvn/issues/58
-%mvn_build -j
+pushd api
+%mvn_build
+popd
 
 %install
+pushd api
 %mvn_install
+popd
 
-%files -f .mfiles
+%files -f api/.mfiles
 %doc README.md
 %license LICENSE.md NOTICE.md
 
-# javadoc temporairly disabled due to https://github.com/fedora-java/xmvn/issues/58
-#%files javadoc -f .mfiles-javadoc
-%files javadoc
+%files javadoc -f api/.mfiles-javadoc
 %license LICENSE.md NOTICE.md
 
 %changelog
-* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 1.2.2-6
-- Rebuild with regenerated Requires on Java
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.1.2-6
+- Bump release for Aug 2024 java mass rebuild
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.2-5
+- Bump release for June 2024 mass rebuild
 
-* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-4
-- Temporarily disable javadoc generation
-- Resolves: rhbz#1976997
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-2
+- Convert License tag to SPDX format
+
+* Fri Aug 18 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-1
+- Update to upstream version 2.1.2
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 2.1.1-3
+- Change license, reduce dependencies
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Dec 22 2022 Marian Koncek <mkoncek@redhat.com> - 2.1.1-1
+- Update to upstream version 2.1.1
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.2.2-6
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-3
+- Temporarily disable javadoc generation
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -90,4 +127,3 @@ sed -i "s/\${activation.osgiversion}/%{version}/g" activation/pom.xml
 
 * Wed May 20 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2.1-5
 - Package unretired and renamed from jaf.
-