diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index 77b71ee..525a33e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/plexus-xml-3.0.0.tar.gz
-/plexus-testing-1.3.0.tar.gz
+SOURCES/plexus-testing-1.3.0.tar.gz
diff --git a/.plexus-testing.metadata b/.plexus-testing.metadata
new file mode 100644
index 0000000..e1388cf
--- /dev/null
+++ b/.plexus-testing.metadata
@@ -0,0 +1 @@
+5ccd296b84b92aeeee4db948d317b8f5772b9590 SOURCES/plexus-testing-1.3.0.tar.gz
diff --git a/plexus-testing.spec b/SPECS/plexus-testing.spec
similarity index 67%
rename from plexus-testing.spec
rename to SPECS/plexus-testing.spec
index 38df7a4..f0e25ee 100644
--- a/plexus-testing.spec
+++ b/SPECS/plexus-testing.spec
@@ -2,7 +2,7 @@
 
 Name:           plexus-testing
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        Plexus Testing
 License:        Apache-2.0
 URL:            https://github.com/codehaus-plexus/plexus-testing
@@ -26,10 +26,14 @@ BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
 The Plexus Testing contains the necessary classes to be able to test
 Plexus components.
 
-%{?javadoc_package}
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%autosetup -p1 -n %{name}-%{name}-%{version}
 
 # Some tests rely on Jakarta Injection API, which is not packaged
 rm src/test/java/org/codehaus/plexus/testing/TestJakartaComponent.java
@@ -45,16 +49,17 @@ rm src/test/java/org/codehaus/plexus/testing/PlexusTestJakartaTest.java
 %doc README.md
 %license LICENSE
 
+%files javadoc -f .mfiles-javadoc
+
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-4
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-7
+- Update javapackages test plan to f42
 
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-3
-- Bump release for Aug 2024 java mass rebuild
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-2
-- Bump release for June 2024 mass rebuild
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-2
+- bump of release for for java-21-openjdk as system jdk
 
 * Fri Feb 02 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-1
 - Initial packaging
diff --git a/ci.fmf b/ci.fmf
deleted file mode 100644
index c5aa0e0..0000000
--- a/ci.fmf
+++ /dev/null
@@ -1 +0,0 @@
-resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 9512778..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
deleted file mode 100644
index f37b73f..0000000
--- a/plans/javapackages.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: c10s
-execute:
-  how: tmt
diff --git a/sources b/sources
deleted file mode 100644
index 589cb68..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (plexus-testing-1.3.0.tar.gz) = 4a3fddcbf00a8aca14767946bb9682670384673c844aa9eeb3cdc49e14e1406091d6644506fd2d7af10c1e07bd788e771ef8ecaa6e8b3efcd67467786ce4aa4e