.gitignore

@@ -5,4 +5,3 @@
 /jaf-1.2.2.tar.gz
 /jaf-2.1.0.tar.gz
 /jaf-2.1.1.tar.gz
-/jaf-2.1.2.tar.gz

gating.yaml

@@ -5,5 +5,4 @@ decision_contexts:
   - bodhi_update_push_testing
   - bodhi_update_push_stable
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

jakarta-activation.spec

@@ -1,28 +1,21 @@
-%bcond_with bootstrap
-
 Name:           jakarta-activation
-Version:        2.1.2
-Release:        4%{?dist}
+Version:        2.1.1
+Release:        2%{?dist}
 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
+# spec is licensed under (EPL-2.0 and GPLv2 with exceptions) but is not shipped
+License:        BSD
 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:
@@ -45,8 +38,7 @@ pushd api
 # remove custom doclet configuration
 %pom_remove_plugin :maven-javadoc-plugin
 
-%pom_remove_plugin -r :buildnumber-maven-plugin
-%pom_remove_plugin -r :maven-enforcer-plugin
+%pom_remove_plugin :buildnumber-maven-plugin
 popd
 
 %build
@@ -67,24 +59,6 @@ popd
 %license LICENSE.md NOTICE.md
 
 %changelog
-* 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
-
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

plans/Smoke.java

@@ -1,15 +0,0 @@
-import jakarta.activation.DataHandler;
-import jakarta.activation.DataSource;
-import jakarta.activation.MimeType;
-import jakarta.activation.MimeTypeParseException;
-
-public class Smoke
-{
-	public static void main(String[] args)
-	{
-		System.out.println(DataHandler.class.getCanonicalName());
-		System.out.println(DataSource.class.getCanonicalName());
-		System.out.println(MimeType.class.getCanonicalName());
-		System.out.println(MimeTypeParseException.class.getCanonicalName());
-	}
-}

plans/javapackages.fmf

@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
-  ref: f40
+  ref: f38
 execute:
   how: tmt

plans/smoke.fmf

@@ -1,17 +0,0 @@
-summary: Basic smoke test
-prepare:
-  how: install
-  package:
-    - java-1.8.0-openjdk-devel
-    - xmvn-tools
-discover:
-  how: shell
-  tests:
-    - name: /smoke/classpath-import
-      test: |
-        CLASSPATH+=":$(xmvn-resolve jakarta.activation:jakarta.activation-api)"
-        export CLASSPATH
-        /usr/lib/jvm/java-1.8.0-openjdk/bin/javac plans/Smoke.java
-        /usr/lib/jvm/java-1.8.0-openjdk/bin/java -cp "${CLASSPATH}:plans" Smoke
-execute:
-  how: tmt

sources

@@ -1 +1 @@
-SHA512 (jaf-2.1.2.tar.gz) = cb4b9e56bfef7455b5f126bcde2c27756202843548c710afd3882b07f05b42a8eb816d0820d00eb67f79a53e396e71f53ec806fddc692f50b18e1c37deea72bc
+SHA512 (jaf-2.1.1.tar.gz) = 23bb5fa6e1b6ee40686e6ea85a4d0a380a2f2ecf3132274b2ad827da3e5466e279f85c5953d97555cf7f75f03623a967c9a45b23e60230bec85a8a856f21a427