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 5b2eb60..3b95841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,2 @@
-/results_*
-/*.src.rpm
-
-/bcel-5.2-src.tar.gz
-/bcel-1592769.tar.xz
-/bcel-6.1-src.tar.gz
-/bcel-6.2-src.tar.gz
-/bcel-6.3-src.tar.gz
-/bcel-6.3.1-src.tar.gz
-/bcel-6.4.1-src.tar.gz
-/bcel-6.5.0-src.tar.gz
-/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
+bcel-5.2-src.tar.gz
+bcel-jakarta-site2.tar.gz
diff --git a/bcel-5.2-build.xml b/bcel-5.2-build.xml
new file mode 100644
index 0000000..1327969
--- /dev/null
+++ b/bcel-5.2-build.xml
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================================= WARNING ================================
+ Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.
+ ==========================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Proxy used :
+ Proxy host [${proxy.host}]
+ Proxy port [${proxy.port}]
+ Proxy user [${proxy.username}]
+
+
+
+ Proxy not used.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Jakarta-Site2 module is not present! Please check
+ to make sure that you have checked it out from CVS.
+
+ <http://jakarta.apache.org/site/jakarta-site2.html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bcel-5.2-jpp-depmap.xml b/bcel-5.2-jpp-depmap.xml
new file mode 100644
index 0000000..f515b68
--- /dev/null
+++ b/bcel-5.2-jpp-depmap.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ regexp
+ regexp
+ 1.2
+
+
+ JPP
+ regexp
+ regexp.jar
+ 1.2
+
+
+
\ No newline at end of file
diff --git a/bcel-5.2-project_properties.patch b/bcel-5.2-project_properties.patch
new file mode 100644
index 0000000..73734fb
--- /dev/null
+++ b/bcel-5.2-project_properties.patch
@@ -0,0 +1,11 @@
+--- project.properties.sav 2007-06-26 15:21:10.000000000 +0200
++++ project.properties 2007-06-26 15:21:35.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ maven.changes.issue.template = %URL%/bugzilla/show_bug.cgi?id=%ISSUE%
+
+-maven.xdoc.jsl = ../commons-build/commons-site.jsl
++maven.xdoc.jsl = file:${basedir}/commons-build/commons-site.jsl
+ maven.xdoc.date = left
+ maven.xdoc.poweredby.image = maven-feather.png
+ maven.xdoc.version = ${pom.currentVersion}
diff --git a/bcel-5.2.pom b/bcel-5.2.pom
new file mode 100644
index 0000000..02a5b6e
--- /dev/null
+++ b/bcel-5.2.pom
@@ -0,0 +1,11 @@
+
+ 4.0.0
+ bcel
+ bcel
+ 5.2
+
+ regexp
+ regexp
+ 1.4
+
+
diff --git a/bcel-MANIFEST.MF b/bcel-MANIFEST.MF
new file mode 100644
index 0000000..2170afd
--- /dev/null
+++ b/bcel-MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.2
+Created-By: 1.7.0_b147-icedtea-mockbuild_2011_11_10_18_56-b00 (Oracle
+ Corporation)
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.apache.bcel
+Export-Package: org.apache.bcel;version="5.2.0",org.apache.bcel.classf
+ ile;version="5.2.0",org.apache.bcel.generic;version="5.2.0",org.apach
+ e.bcel.util;version="5.2.0",org.apache.bcel.verifier;version="5.2.0",
+ org.apache.bcel.verifier.exc;version="5.2.0",org.apache.bcel.verifier
+ .statics;version="5.2.0",org.apache.bcel.verifier.structurals;version
+ ="5.2.0"
+Bundle-Version: 5.2.0.v201005080400
+Bundle-ManifestVersion: 2
diff --git a/bcel.spec b/bcel.spec
index 54856cc..886259f 100644
--- a/bcel.spec
+++ b/bcel.spec
@@ -1,20 +1,97 @@
+# Copyright (c) 2000-2007, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#Fedora currently does not support maven
+%global _without_maven 1
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%global with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%global without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
Name: bcel
-Version: 6.10.0
-Release: %autorelease
+Version: 5.2
+Release: 11%{?dist}
+Epoch: 0
Summary: Byte Code Engineering Library
-License: Apache-2.0
-URL: https://commons.apache.org/proper/commons-bcel/
+License: ASL 2.0
+Source0: %{name}-%{version}-src.tar.gz
+#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_2
+#tar czvf bcel-5.2-src.tar.gz BCEL_5_2
+Source1: pom-maven2jpp-depcat.xsl
+Source2: pom-maven2jpp-newdepmap.xsl
+Source3: pom-maven2jpp-mapdeps.xsl
+Source4: %{name}-%{version}-jpp-depmap.xml
+#Source5: commons-build.tar.gz
+Source5: bcel-jakarta-site2.tar.gz
+Source6: %{name}-%{version}-build.xml
+Source7: %{name}-%{version}.pom
+Source8: %{name}-MANIFEST.MF
+
+Patch0: %{name}-%{version}-project_properties.patch
+URL: http://jakarta.apache.org/%{name}/
+Group: Development/Libraries
+Requires: regexp
+BuildRequires: zip
+BuildRequires: ant
+%if %{with_maven}
+BuildRequires: maven >= 0:1.1
+BuildRequires: saxon
+BuildRequires: saxon-scripts
+BuildRequires: maven-plugins-base
+BuildRequires: maven-plugin-changelog
+BuildRequires: maven-plugin-changes
+BuildRequires: maven-plugin-developer-activity
+BuildRequires: maven-plugin-jxr
+BuildRequires: maven-plugin-license
+BuildRequires: maven-plugin-pmd
+BuildRequires: maven-plugin-test
+BuildRequires: maven-plugin-xdoc
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
+%else
+BuildRequires: jdom
+BuildRequires: velocity
+BuildRequires: jakarta-commons-collections
+BuildRequires: apache-commons-lang
+#excalibur-avalong-logkit should be used once Maven is supported in Fedora
+BuildRequires: avalon-logkit
+#BuildRequires: excalibur-avalon-logkit
+BuildRequires: werken-xpath
+#BuildRequires: ant-apache-regexp
+%endif
+BuildRequires: regexp
+BuildRequires: jpackage-utils >= 0:1.7.2
BuildArch: noarch
-ExclusiveArch: %{java_arches} noarch
-
-Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz
-
-BuildRequires: maven-local-openjdk25
-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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
The Byte Code Engineering Library (formerly known as JavaClass) is
@@ -32,25 +109,297 @@ 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: Javadoc for %{name}
+Group: Documentation
+BuildRequires: java-javadoc
+Requires: java-javadoc
+
+%description javadoc
+%{summary}.
+
+%package manual
+Summary: Manual for %{name}
+Group: Documentation
+
+%description manual
+%{summary}.
+
%prep
-%autosetup -p1 -C
+#cat <' > $DEPCAT
+echo '' >> $DEPCAT
+for p in $(find . -name project.xml); do
+ pushd $(dirname $p)
+ /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+ popd
+done
+echo >> $DEPCAT
+echo '' >> $DEPCAT
+/usr/bin/saxon $DEPCAT %{SOURCE2} > %{name}-%{version}-depmap.new.xml
+
+for p in $(find . -name project.xml); do
+ pushd $(dirname $p)
+ %{__cp} -pr project.xml project.xml.orig
+ /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} \
+ map="%{SOURCE4}"
+ popd
+done
+
+export MAVEN_HOME_LOCAL="$(pwd)/.maven"
+
+maven -e \
+ -Dmaven.repo.remote=file:/usr/share/maven/repository \
+ -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
+ jar:jar javadoc:generate xdoc:transform
+%else
+#ant -Dregexp.jar="file://$(build-classpath regexp)" jar javadoc
+ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
+ -Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
+ -Dregexp.jar="file://$(build-classpath regexp)" \
+ jar javadoc xdocs
+%endif
%install
-%mvn_install
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE8} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF
-%files -f .mfiles
-%doc RELEASE-NOTES.txt
-%license LICENSE.txt NOTICE.txt
+# jars
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__install} -m 0644 target/%{name}-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}.jar
+# depmap frags
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%add_to_maven_depmap org.apache.bcel %{name} %{version} JPP %{name}
+# pom
+%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
+%{__install} -m 0644 %{SOURCE7} \
+ %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+# javadoc
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
+%if %{with_maven}
+%{__cp} -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%{__rm} -rf target/docs/apidocs
+%else
+%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%{__rm} -rf dist/docs/api
+%endif
+
+# manual
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
+%if %{with_maven}
+%{__cp} -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%else
+%{__cp} -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%endif
+%{__cp} LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+%{__rm} -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
+%files
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%{_javadir}/%{name}.jar
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}
+
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}
%changelog
-%autochangelog
+* Sun Jun 24 2012 Gerard Ryan - 0:5.2-11
+- Inject OSGI Manifest.
+
+* Wed Jan 11 2012 Ville Skyttä - 0:5.2-10
+- Specify explicit source encoding to fix build with Java 7.
+- Install jar and javadocs unversioned.
+- Crosslink with JDK javadocs.
+
+* Mon Feb 07 2011 Fedora Release Engineering - 0:5.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jul 13 2010 Alexander Kurtakov 0:5.2-8
+- Use global.
+- Drop gcj_support.
+- Fix groups.
+- Fix build.
+
+* Fri Jul 24 2009 Fedora Release Engineering - 0:5.2-7.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering - 0:5.2-6.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 04 2008 Permaine Cheung 0:5.2-5.1
+- Do not install poms in /usr/share/maven2/default_poms
+
+* Wed Jul 9 2008 Tom "spot" Callaway - 0:5.2-5
+- drop repotag
+
+* Tue Feb 19 2008 Fedora Release Engineering - 0:5.2-4jpp.2
+- Autorebuild for GCC 4.3
+
+* Tue Jan 22 2008 Permaine Cheung 0:5.2-3jpp.1
+- Merge with upstream
+
+* Mon Jan 07 2008 Permaine Cheung 0:5.2-2jpp.2
+- Fixed unowned directory (Bugzilla 246185)
+
+* Fri Nov 16 2007 Ralph Apel 0:5.2-3jpp
+- Install poms unconditionally
+- Add pom in ./maven2/default_poms
+- Add org.apache.bcel:bcel depmap frag
+
+* Wed Sep 19 2007 Permaine Cheung 0:5.2-2jpp.1
+- Update to 5.2 in Fedora
+
+* Mon Sep 4 2007 Jason Corley 0:5.2-2jpp
+- use official 5.2 release tarballs and location
+- change vendor and distribution to macros
+- add missing requires on and maven-plugin-test, maven-plugins-base, and
+ maven-plugin-xdoc
+- macro bracket fixes
+- remove demo subpackage (examples are not included in the distribution tarball)
+- build in mock
+
+* Wed Jun 27 2007 Ralph Apel 0:5.2-1jpp
+- Upgrade to 5.2
+- Drop bootstrap option: not necessary any more
+- Add pom and depmap frags
+
+* Fri Feb 09 2007 Ralph Apel 0:5.1-10jpp
+- Fix empty-%%post and empty-%%postun
+- Fix no-cleaning-of-buildroot
+
+* Fri Feb 09 2007 Ralph Apel 0:5.1-9jpp
+- Optionally build without maven
+- Add bootstrap option
+
+* Thu Aug 10 2006 Matt Wringe 0:5.1-8jpp
+- Add missing requires for Javadoc task
+
+* Sun Jul 23 2006 Matt Wringe 0:5.1-7jpp
+- Add conditional native compilation
+- Change spec file encoding from ISO-8859-1 to UTF-8
+- Add missing BR werken.xpath and ant-apache-regexp
+
+* Tue Apr 11 2006 Ralph Apel 0:5.1-6jpp
+- First JPP-1.7 release
+- Use tidyed sources from svn
+- Add resources to build the manual
+- Add examples to -demo subpackage
+- Build with maven by default
+- Add option to build with straight ant
+
+* Fri Nov 19 2004 David Walluck 0:5.1-5jpp
+- rebuild to fix packager
+
+* Sat Nov 06 2004 David Walluck 0:5.1-4jpp
+- rebuild with javac 1.4.2
+
+* Sat Oct 16 2004 David Walluck 0:5.1-3jpp
+- rebuild for JPackage 1.6
+
+* Fri Aug 20 2004 Ralph Apel 0:5.1-2jpp
+- Build with ant-1.6.2
+
+* Sun May 11 2003 David Walluck 0:5.1-1jpp
+- 5.1
+- update for JPackage 1.5
+
+* Mon Mar 24 2003 Nicolas Mailhot - 5.0-6jpp
+- For jpackage-utils 1.5
+
+* Tue Feb 25 2003 Ville Skyttä - 5.0-5jpp
+- Rebuild to get docdir right on modern distros.
+- Fix License tag and source file perms.
+- Built with IBM's 1.3.1SR3 (doesn't build with Sun's 1.4.1_01).
+
+* Tue Jun 11 2002 Henri Gomez 5.0-4jpp
+- use sed instead of bash 2.x extension in link area to make spec compatible
+ with distro using bash 1.1x
+
+* Tue May 07 2002 Guillaume Rousse 5.0-3jpp
+- vendor, distribution, group tags
+
+* Wed Jan 23 2002 Guillaume Rousse 5.0-2jpp
+- section macro
+- no dependencies for manual and javadoc package
+
+* Tue Jan 22 2002 Henri Gomez 5.0-1jpp
+- bcel is now a jakarta apache project
+- dependency on jakarta-regexp instead of gnu.regexp
+- created manual package
+
+* Sat Dec 8 2001 Guillaume Rousse 4.4.1-2jpp
+- javadoc into javadoc package
+- Requires: and BuildRequires: gnu.regexp
+
+* Wed Nov 21 2001 Christian Zoffoli 4.4.1-1jpp
+- removed packager tag
+- new jpp extension
+- 4.4.1
+
+* Thu Oct 11 2001 Guillaume Rousse 4.4.0-2jpp
+- first unified release
+- used lower case for name
+- used original tarball
+- s/jPackage/JPackage
+
+* Mon Aug 27 2001 Guillaume Rousse 4.4.0-1mdk
+- first Mandrake release
diff --git a/changelog b/changelog
deleted file mode 100644
index 3aca486..0000000
--- a/changelog
+++ /dev/null
@@ -1,292 +0,0 @@
-* Wed Jul 17 2024 Fedora Release Engineering - 6.8.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek - 6.8.1-2
-- Rebuilt for java-21-openjdk as system jdk
-
-* Thu Feb 01 2024 Mikolaj Izdebski - 6.8.1-1
-- Update to upstream version 6.8.1
-
-* Tue Jan 23 2024 Fedora Release Engineering - 6.8.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering - 6.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 11 2023 Marian Koncek - 6.8.0-1
-- Update to upstream version 6.8.0
-
-* Fri Sep 01 2023 Mikolaj Izdebski - 6.7.0-3
-- Convert License tag to SPDX format
-
-* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-2
-- Add missing build-requires
-
-* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-1
-- Update to upstream version 6.7.0
-
-* Wed Jul 19 2023 Fedora Release Engineering - 6.5.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering - 6.5.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Dec 01 2022 Mikolaj Izdebski - 6.5.0-3
-- Fix arbitrary bytecode produced via out-of-bounds writing
-- Resolves: CVE-2022-42920
-
-* Wed Jul 20 2022 Fedora Release Engineering - 6.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sun Apr 24 2022 Mikolaj Izdebski - 6.5.0-1
-- Update to upstream version 6.5.0
-
-* Sat Feb 05 2022 Jiri Vanek - 6.4.1-9
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering - 6.4.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering - 6.4.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jun 28 2021 Mikolaj Izdebski - 6.4.1-6
-- Remove dependency on jna
-
-* Tue Jan 26 2021 Fedora Release Engineering - 0:6.4.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering - 0:6.4.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek - 0:6.4.1-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jan 28 2020 Fedora Release Engineering - 0:6.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Nov 05 2019 Mikolaj Izdebski - 6.4.1-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Oct 16 2019 Marian Koncek - 6.4.1-1
-- Update to upstream version 6.4.1
-
-* Fri Oct 04 2019 Fabio Valentini - 0:6.4.1-1
-- Update to version 6.4.1.
-
-* Wed Jul 24 2019 Fedora Release Engineering - 0:6.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski - 6.3.1-2
-- Mass rebuild for javapackages-tools 201901
-
-* Mon May 06 2019 Marian Koncek - 0:6.3.1-1
-- Update to upstream version 6.3.1
-- Fixes: RHBZ #1692150
-
-* Tue Feb 05 2019 Marian Koncek - 0:6.3-1
-- Update to upstream version 6.3
-- Fixes: RHBZ #1670025
-
-* Thu Jan 31 2019 Fedora Release Engineering - 0:6.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering - 0:6.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering - 0:6.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Dec 10 2017 Michael Simacek - 0:6.2-1
-- Update to upstream version 6.2
-
-* Fri Sep 22 2017 Mikolaj Izdebski - 0:6.1-2
-- Conditionally build without jna
-
-* Tue Sep 19 2017 Michael Simacek - 0:6.1-1
-- Update to upstream version 6.1
-
-* Wed Jul 26 2017 Fedora Release Engineering - 0:6.0-0.7.20140406svn1592769
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering - 0:6.0-0.6.20140406svn1592769
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering - 0:6.0-0.5.20140406svn1592769
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering - 0:6.0-0.4.20140406svn1592769
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 11 2014 Mikolaj Izdebski - 0:6.0-0.3.20140406svn1592769
-- Add alias for apache:bcel
-
-* Sat Jun 07 2014 Fedora Release Engineering - 0:6.0-0.2.20140406svn1592769
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May 06 2014 Michael Simacek - 0:6.0-0.1.20140406svn1592769
-- Update to upstream snapshot compatible with Java 8
-
-* Sat Aug 03 2013 Fedora Release Engineering - 0:5.2-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Jun 14 2013 Mikolaj Izdebski - 0:5.2-16
-- Complete spec file rewrite
-- Build with Maven instead of Ant
-- Remove manual subpackage
-
-* Wed Feb 13 2013 Fedora Release Engineering - 0:5.2-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Nov 13 2012 Tom Callaway - 0:5.2-14
-- Package NOTICE.txt
-
-* Tue Aug 21 2012 Andy Grimm - 0:5.2-13
-- This package should not own _mavendepmapfragdir (RHBZ#850005)
-- Build with maven, and clean up deprecated spec constructs
-- Fix pom file (See http://jira.codehaus.org/browse/MEV-592)
-
-* Wed Jul 18 2012 Fedora Release Engineering - 0:5.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jun 24 2012 Gerard Ryan - 0:5.2-11
-- Inject OSGI Manifest.
-
-* Wed Jan 11 2012 Ville Skyttä - 0:5.2-10
-- Specify explicit source encoding to fix build with Java 7.
-- Install jar and javadocs unversioned.
-- Crosslink with JDK javadocs.
-
-* Mon Feb 07 2011 Fedora Release Engineering - 0:5.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jul 13 2010 Alexander Kurtakov 0:5.2-8
-- Use global.
-- Drop gcj_support.
-- Fix groups.
-- Fix build.
-
-* Fri Jul 24 2009 Fedora Release Engineering - 0:5.2-7.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Feb 23 2009 Fedora Release Engineering - 0:5.2-6.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Dec 04 2008 Permaine Cheung 0:5.2-5.1
-- Do not install poms in /usr/share/maven2/default_poms
-
-* Wed Jul 9 2008 Tom "spot" Callaway - 0:5.2-5
-- drop repotag
-
-* Tue Feb 19 2008 Fedora Release Engineering - 0:5.2-4jpp.2
-- Autorebuild for GCC 4.3
-
-* Tue Jan 22 2008 Permaine Cheung 0:5.2-3jpp.1
-- Merge with upstream
-
-* Mon Jan 07 2008 Permaine Cheung 0:5.2-2jpp.2
-- Fixed unowned directory (Bugzilla 246185)
-
-* Fri Nov 16 2007 Ralph Apel 0:5.2-3jpp
-- Install poms unconditionally
-- Add pom in ./maven2/default_poms
-- Add org.apache.bcel:bcel depmap frag
-
-* Wed Sep 19 2007 Permaine Cheung 0:5.2-2jpp.1
-- Update to 5.2 in Fedora
-
-* Mon Sep 4 2007 Jason Corley 0:5.2-2jpp
-- use official 5.2 release tarballs and location
-- change vendor and distribution to macros
-- add missing requires on and maven-plugin-test, maven-plugins-base, and
- maven-plugin-xdoc
-- macro bracket fixes
-- remove demo subpackage (examples are not included in the distribution tarball)
-- build in mock
-
-* Wed Jun 27 2007 Ralph Apel 0:5.2-1jpp
-- Upgrade to 5.2
-- Drop bootstrap option: not necessary any more
-- Add pom and depmap frags
-
-* Fri Feb 09 2007 Ralph Apel 0:5.1-10jpp
-- Fix empty-%%post and empty-%%postun
-- Fix no-cleaning-of-buildroot
-
-* Fri Feb 09 2007 Ralph Apel 0:5.1-9jpp
-- Optionally build without maven
-- Add bootstrap option
-
-* Thu Aug 10 2006 Matt Wringe 0:5.1-8jpp
-- Add missing requires for Javadoc task
-
-* Sun Jul 23 2006 Matt Wringe 0:5.1-7jpp
-- Add conditional native compilation
-- Change spec file encoding from ISO-8859-1 to UTF-8
-- Add missing BR werken.xpath and ant-apache-regexp
-
-* Tue Apr 11 2006 Ralph Apel 0:5.1-6jpp
-- First JPP-1.7 release
-- Use tidyed sources from svn
-- Add resources to build the manual
-- Add examples to -demo subpackage
-- Build with maven by default
-- Add option to build with straight ant
-
-* Fri Nov 19 2004 David Walluck 0:5.1-5jpp
-- rebuild to fix packager
-
-* Sat Nov 06 2004 David Walluck 0:5.1-4jpp
-- rebuild with javac 1.4.2
-
-* Sat Oct 16 2004 David Walluck 0:5.1-3jpp
-- rebuild for JPackage 1.6
-
-* Fri Aug 20 2004 Ralph Apel 0:5.1-2jpp
-- Build with ant-1.6.2
-
-* Sun May 11 2003 David Walluck 0:5.1-1jpp
-- 5.1
-- update for JPackage 1.5
-
-* Mon Mar 24 2003 Nicolas Mailhot - 5.0-6jpp
-- For jpackage-utils 1.5
-
-* Tue Feb 25 2003 Ville Skyttä - 5.0-5jpp
-- Rebuild to get docdir right on modern distros.
-- Fix License tag and source file perms.
-- Built with IBM's 1.3.1SR3 (doesn't build with Sun's 1.4.1_01).
-
-* Tue Jun 11 2002 Henri Gomez 5.0-4jpp
-- use sed instead of bash 2.x extension in link area to make spec compatible
- with distro using bash 1.1x
-
-* Tue May 07 2002 Guillaume Rousse 5.0-3jpp
-- vendor, distribution, group tags
-
-* Wed Jan 23 2002 Guillaume Rousse 5.0-2jpp
-- section macro
-- no dependencies for manual and javadoc package
-
-* Tue Jan 22 2002 Henri Gomez 5.0-1jpp
-- bcel is now a jakarta apache project
-- dependency on jakarta-regexp instead of gnu.regexp
-- created manual package
-
-* Sat Dec 8 2001 Guillaume Rousse 4.4.1-2jpp
-- javadoc into javadoc package
-- Requires: and BuildRequires: gnu.regexp
-
-* Wed Nov 21 2001 Christian Zoffoli 4.4.1-1jpp
-- removed packager tag
-- new jpp extension
-- 4.4.1
-
-* Thu Oct 11 2001 Guillaume Rousse 4.4.0-2jpp
-- first unified release
-- used lower case for name
-- used original tarball
-- s/jPackage/JPackage
-
-* Mon Aug 27 2001 Guillaume Rousse 4.4.0-1mdk
-- first Mandrake release
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 7b6e38f..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
---- !Policy
-product_versions:
- - fedora-*
-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}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
deleted file mode 100644
index ae17c0c..0000000
--- a/plans/javapackages.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
- how: fmf
- url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
- ref: f43
-execute:
- how: tmt
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
deleted file mode 100644
index a1e7bfd..0000000
--- a/plans/smoke.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
- how: fmf
-execute:
- how: tmt
diff --git a/pom-maven2jpp-depcat.xsl b/pom-maven2jpp-depcat.xsl
new file mode 100644
index 0000000..92834cc
--- /dev/null
+++ b/pom-maven2jpp-depcat.xsl
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ERROR
+
+
+
+
+
+
+
+
+
+ JPP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ERROR
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ERROR
+
+
+
+
+
+ .jar
+ .
+
+
+ .jar
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom-maven2jpp-mapdeps.xsl b/pom-maven2jpp-mapdeps.xsl
new file mode 100644
index 0000000..566a1da
--- /dev/null
+++ b/pom-maven2jpp-mapdeps.xsl
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom-maven2jpp-newdepmap.xsl b/pom-maven2jpp-newdepmap.xsl
new file mode 100644
index 0000000..3b8dbfa
--- /dev/null
+++ b/pom-maven2jpp-newdepmap.xsl
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sources b/sources
index 2a1c63f..a66fbdd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (bcel-6.10.0-src.tar.gz) = 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14
+15c882886f67f90ee773cb526b84b4fa bcel-5.2-src.tar.gz
+2c511b30e00109b501c6f3bd757a1ce1 bcel-jakarta-site2.tar.gz
diff --git a/tests/Sanity/upstream-tests/main.fmf b/tests/Sanity/upstream-tests/main.fmf
deleted file mode 100644
index a3a52fb..0000000
--- a/tests/Sanity/upstream-tests/main.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: BCEL upstream tests
-description: |
- Run BCEL upstream tests that are packaged in the SRPM.
-require:
- - bcel
- - javapackages-tools
- - maven
- - cpio
diff --git a/tests/Sanity/upstream-tests/runtest.sh b/tests/Sanity/upstream-tests/runtest.sh
deleted file mode 100755
index 9c38473..0000000
--- a/tests/Sanity/upstream-tests/runtest.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-# Author: Mikolaj Izdebski
-. /usr/share/beakerlib/beakerlib.sh
-
-rlJournalStart
-
- rlPhaseStartSetup
- rlAssertRpm bcel
- rlRun "pushd \$(mktemp -d)"
- rlPhaseEnd
-
- rlPhaseStartTest "prepare test sources"
- rlFetchSrcForInstalled bcel
- srpm=$(echo bcel-*.src.rpm)
- rlAssertExists ${srpm}
- rlRun "rpm2cpio ${srpm} | cpio -id"
- tarball=$(echo bcel-*.tar.gz)
- rlAssertExists ${tarball}
- rlRun "tar xf ${tarball}"
- basedir=$(echo bcel-*-src)
- rlAssertExists ${basedir}/
- jar=$(find-jar bcel)
- rlAssertExists ${jar}
- rlRun "mkdir ${basedir}/target"
- rlRun "ln -s ${jar} ${basedir}/target/classes"
- rlPhaseEnd
-
- mvn="mvn -V -B -f ${basedir}"
-
- rlPhaseStartTest "compile test sources"
- rlRun -s "${mvn} compiler:testCompile"
- rlAssertGrep "BUILD SUCCESS" $rlRun_LOG
- rlPhaseEnd
-
- rlPhaseStartTest "generate test resources"
- rlRun -s "${mvn} resources:testResources"
- rlAssertGrep "BUILD SUCCESS" $rlRun_LOG
- rlPhaseEnd
-
- rlPhaseStartTest "run tests"
- rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,ConstantPoolModuleAccessTestCase,BCELifierTestCase"
- rlAssertGrep "BUILD SUCCESS" $rlRun_LOG
- rlAssertGrep "Failures: 0, Errors: 0" $rlRun_LOG
- rlPhaseEnd
-
-rlJournalEnd
-rlJournalPrintText
diff --git a/tests/main.fmf b/tests/main.fmf
deleted file mode 100644
index 4116d53..0000000
--- a/tests/main.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-contact: Mikolaj Izdebski
-framework: beakerlib
-test: ./runtest.sh
-tier: 0
-component: bcel