diff --git a/.gitignore b/.gitignore
index 5b2eb60..8eddb0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@
 /bcel-6.7.0-src.tar.gz
 /bcel-6.8.0-src.tar.gz
 /bcel-6.8.1-src.tar.gz
-/bcel-6.10.0-src.tar.gz
diff --git a/bcel.spec b/bcel.spec
index 54856cc..27f8f67 100644
--- a/bcel.spec
+++ b/bcel.spec
@@ -1,5 +1,5 @@
 Name:           bcel
-Version:        6.10.0
+Version:        6.8.1
 Release:        %autorelease
 Summary:        Byte Code Engineering Library
 License:        Apache-2.0
@@ -9,12 +9,10 @@ ExclusiveArch:  %{java_arches} noarch
 
 Source0:        http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz
 
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 6.8.1-14
 
 %description
 The Byte Code Engineering Library (formerly known as JavaClass) is
@@ -32,6 +30,12 @@ being used successfully in several projects such as compilers,
 optimizers, obsfuscators and analysis tools, the most popular probably
 being the Xalan XSLT processor at Apache.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
@@ -43,7 +47,7 @@ being the Xalan XSLT processor at Apache.
 %mvn_file : %{name}
 
 %build
-%mvn_build -j -f
+%mvn_build -f
 
 %install
 %mvn_install
@@ -52,5 +56,8 @@ being the Xalan XSLT processor at Apache.
 %doc RELEASE-NOTES.txt
 %license LICENSE.txt NOTICE.txt
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt NOTICE.txt
+
 %changelog
 %autochangelog
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index ae17c0c..86bfcea 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f42
 execute:
   how: tmt
diff --git a/sources b/sources
index 2a1c63f..7bcd686 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bcel-6.10.0-src.tar.gz) = 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14
+SHA512 (bcel-6.8.1-src.tar.gz) = 1a38f4603bfe8692e4fc71a911fbb37ddc30ee5afa270d4b36f0325879a555df2cab34e2abf38645a3c7b780e30dec516a0eac21a0d7e18ff412a5762282360e
diff --git a/tests/Sanity/upstream-tests/main.fmf b/tests/Sanity/upstream-tests/main.fmf
index a3a52fb..c957ccd 100644
--- a/tests/Sanity/upstream-tests/main.fmf
+++ b/tests/Sanity/upstream-tests/main.fmf
@@ -5,4 +5,3 @@ require:
   - bcel
   - javapackages-tools
   - maven
-  - cpio
diff --git a/tests/Sanity/upstream-tests/runtest.sh b/tests/Sanity/upstream-tests/runtest.sh
index 9c38473..b38cb6c 100755
--- a/tests/Sanity/upstream-tests/runtest.sh
+++ b/tests/Sanity/upstream-tests/runtest.sh
@@ -38,7 +38,7 @@ rlJournalStart
   rlPhaseEnd
 
   rlPhaseStartTest "run tests"
-    rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,ConstantPoolModuleAccessTestCase,BCELifierTestCase"
+    rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,BCELifierTestCase"
     rlAssertGrep "BUILD SUCCESS" $rlRun_LOG
     rlAssertGrep "Failures: 0, Errors: 0" $rlRun_LOG
   rlPhaseEnd