Rebuilt for java-25-openjdk as preffered jdk

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,15 @@
-bcel-5.2-src.tar.gz
-bcel-jakarta-site2.tar.gz
+/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-build.xml

@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 5.2
-  on date June 26 2007, time 1708-->
-<project default="jar" name="bcel" basedir=".">
-  <!--Load local and user build preferences-->
-  <property file="build.properties"></property>
-  <!--Build properties-->
-  <property name="defaulttargetdir" value="${basedir}/target"></property>
-  <property name="libdir" value="${basedir}/lib"></property>
-  <property name="classesdir" value="${basedir}/target/classes"></property>
-  <property name="distdir" value="${basedir}/dist"></property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
-  <property name="final.name" value="bcel-5.2"></property>
-  <property name="proxy.host" value=""></property>
-  <property name="proxy.port" value=""></property>
-  <property name="proxy.username" value=""></property>
-  <property name="proxy.password" value=""></property>
-  <path id="build.classpath">
-    <pathelement location="${libdir}/regexp.jar"></pathelement>
-  </path>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}"></mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
-    </condition>
-    <!--Test if JUNIT is present in ANT classpath-->
-    <available property="Junit.present" classname="junit.framework.Test"></available>
-    <!--Test if user defined a proxy-->
-    <condition property="useProxy">
-      <and>
-        <isset property="proxy.host"></isset>
-        <not>
-          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
-        </not>
-      </and>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="get-deps">
-    <mkdir dir="${classesdir}"></mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/java"></pathelement>
-      </src>
-      <classpath refid="build.classpath"></classpath>
-    </javac>
-    <mkdir dir="${classesdir}/META-INF"></mkdir>
-    <copy todir="${classesdir}/META-INF">
-      <fileset dir="${basedir}/.">
-        <include name="NOTICE.txt"></include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}"></delete>
-    <delete dir="${distdir}"></delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist"></mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures."></fail>
-  </target>
-  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"></target>
-  <target name="junit-present" unless="Junit.present" depends="init">
-    <echo>================================= WARNING ================================</echo>
-    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="compile-tests" if="Junit.present" depends="junit-present,compile"></target>
-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-    <mkdir dir="${javadocdir}"></mkdir>
-    <tstamp>
-      <format pattern="2002-yyyy" property="year"></format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
-    <property name="title" value="jakarta-bcel 5.2 API"></property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.bcel.*">
-      <classpath>
-        <path refid="build.classpath"></path>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="get-dep-regexp.jar" description="o Download the dependency : regexp.jar" unless="regexp.jar" depends="init,setProxy,noProxy,get-custom-dep-regexp.jar">
-    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
-    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/regexp.jar"></get>
-  </target>
-  <target name="get-custom-dep-regexp.jar" if="regexp.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
-    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="${regexp.jar}"></get>
-  </target>
-  <target name="get-deps" unless="noget" depends="get-dep-regexp.jar"></target>
-  <target name="setProxy" if="useProxy" depends="init">
-    <!--Proxy settings works only with a JDK 1.2 and higher.-->
-    <echo>Proxy used :</echo>
-    <echo>Proxy host [${proxy.host}]</echo>
-    <echo>Proxy port [${proxy.port}]</echo>
-    <echo>Proxy user [${proxy.username}]</echo>
-    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
-  </target>
-  <target name="noProxy" unless="useProxy" depends="init">
-    <echo>Proxy not used.</echo>
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
-  </target>
-  <!-- can rename this target when we get the docs sorted out -->
-
-  <!-- ================================================================== -->
-  <!-- D O C S                                                            -->
-  <!-- ================================================================== -->
-  
-  <target 
-    name="check_for_jdom">
-    
-    <available 
-      property="jdom.present"
-      classname="org.jdom.JDOMException">
-      <classpath>
-        <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
-      </classpath>
-    </available>
-  </target>
-    
-  <target 
-    depends="check_for_jdom" 
-    name="docs-prepare-error" 
-    unless="jdom.present">
-    
-    <echo>
-      The Jakarta-Site2 module is not present! Please check
-      to make sure that you have checked it out from CVS.
-
-      &lt;http://jakarta.apache.org/site/jakarta-site2.html&gt;
-    </echo>
-  </target>
-
-  <target 
-    name="xdocs"
-    depends="docs-prepare-error"
-    description="--> generates the HTML documentation"
-    if="jdom.present">
-
-    <taskdef 
-      name="anakia"
-      classname="org.apache.velocity.anakia.AnakiaTask">
-      <classpath>
-        <fileset dir="${jakarta.site2}/lib">
-          <include name="*.jar"/>
-        </fileset>
-      </classpath>
-    </taskdef>
-        
-    <anakia 
-      basedir="${docs.src}" 
-      destdir="${docs.dest}/"
-      extension=".html" 
-      style="./site.vsl"
-      projectFile="stylesheets/project.xml"
-      excludes="**/stylesheets/** empty.xml"
-      includes="**/*.xml"
-      lastModifiedCheck="true"
-      templatePath="${jakarta.site2}/xdocs/stylesheets">
-    </anakia>
-
-    <copy 
-      todir="${docs.dest}/images" 
-      filtering="no">
-      
-      <fileset dir="${docs.src}/images">
-        <include name="**/*.gif"/>
-        <include name="**/*.jpeg"/>
-        <include name="**/*.jpg"/>
-      </fileset>
-    </copy>
-  </target>
-
-</project>

bcel-5.2-jpp-depmap.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<depset>
-   <dependency>
-      <maven>
-         <groupId>regexp</groupId>
-         <artifactId>regexp</artifactId>
-         <version>1.2</version>
-      </maven>
-      <jpp>
-         <groupId>JPP</groupId>
-         <artifactId>regexp</artifactId>
-         <jar>regexp.jar</jar>
-         <version>1.2</version>
-      </jpp>
-   </dependency>
-</depset>

bcel-5.2-project_properties.patch

@@ -1,11 +0,0 @@
---- 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}

bcel-5.2.pom

@@ -1,11 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>bcel</groupId>
-  <artifactId>bcel</artifactId>
-  <version>5.2</version>
-  <dependencies>
-    <groupId>regexp</groupId>
-    <artifactId>regexp</artifactId>
-    <version>1.4</version>
-  </dependencies>
-</project>

bcel.spec

@@ -1,95 +1,20 @@
-# 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:        5.2
-Release:        8%{?dist}
-Epoch:          0
+Version:        6.10.0
+Release:        %autorelease
 Summary:        Byte Code Engineering Library
-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
-
-Patch0:         %{name}-%{version}-project_properties.patch
-URL:            http://jakarta.apache.org/%{name}/
-Group:          Development/Libraries
-Requires:       regexp
-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
+License:        Apache-2.0
+URL:            https://commons.apache.org/proper/commons-bcel/
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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
 
 %description
 The Byte Code Engineering Library (formerly known as JavaClass) is
@@ -107,282 +32,25 @@ 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
-
-%description javadoc
-%{summary}.
-
-%package manual
-Summary:        Manual for %{name}
-Group:          Documentation
-
-%description manual
-%{summary}.
-
 %prep
-#cat <<EOT
-#
-#                If you dont want to build with maven,
-#                give rpmbuild option '--without maven'
-#
-#EOT
+%autosetup -p1 -C
 
-%setup -q -n BCEL_5_2
-gzip -dc %{SOURCE5} | tar xf -
-# remove all binary libs
-#find . -name "*.jar" -exec rm -f {} \;
-for j in $(find . -name "*.jar"); do
-    %{__mv} $j ${j}.no
-done
-%if %{without_maven}
-mkdir jakarta-site2/lib
-pushd jakarta-site2/lib/
-  build-jar-repository -s -p . jdom
-  build-jar-repository -s -p . velocity
-  build-jar-repository -s -p . commons-collections
-  build-jar-repository -s -p . commons-lang
-  build-jar-repository -s -p . avalon-logkit
-  build-jar-repository -s -p . werken-xpath
-popd
-%endif
-cp %{SOURCE6} build.xml
-%patch0 -b .sav
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :spotbugs-maven-plugin
+%pom_remove_plugin :jacoco-maven-plugin
 
-# fix wrong-file-end-of-line-encoding
-sed -i 's/\r//' docs/verifier/V_API_SD.eps docs/eps/classloader.fig
+%mvn_alias : bcel: apache:
+%mvn_file : %{name}
 
 %build
-%if %{with_maven}
-export DEPCAT="$(pwd)/%{name}-%{version}-depcat.new.xml"
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-        /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
-    popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $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
+%mvn_build -j -f
 
 %install
-%{__rm} -rf %{buildroot}
-# jars
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__install} -m 0644 target/%{name}-%{version}.jar \
-    %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(
-    cd %{buildroot}%{_javadir}
-    for jar in *-%{version}*; do 
-        %{__ln_s} ${jar} `echo $jar | %{__sed}  "s|-%{version}||g"`
-    done
-)
-# 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
+%mvn_install
 
-# javadoc
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
-%{__cp} -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__rm} -rf target/docs/apidocs
-%else
-%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__rm} -rf dist/docs/api
-%endif
-%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-# 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
-
-%files
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/LICENSE.txt 
-%{_javadir}/*
-%{_datadir}/maven2/poms/*
-%{_mavendepmapfragdir}
-
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
-
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
+%files -f .mfiles
+%doc RELEASE-NOTES.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
-* Tue Jul 13 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.2-8
-- Use global.
-- Drop gcj_support.
-- Fix groups.
-- Fix build.
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-7.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-6.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Dec 04 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-5.1
-- Do not install poms in /usr/share/maven2/default_poms
-
-* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:5.2-5
-- drop repotag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:5.2-4jpp.2
-- Autorebuild for GCC 4.3
-
-* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-3jpp.1
-- Merge with upstream
-
-* Mon Jan 07 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.2
-- Fixed unowned directory (Bugzilla 246185)
-
-* Fri Nov 16 2007 Ralph Apel <r.apel@r-apel.de> 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 <pcheung at redhat.com> 0:5.2-2jpp.1
-- Update to 5.2 in Fedora
-
-* Mon Sep  4 2007 Jason Corley <jason.corley@gmail.com> 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 <r.apel@r-apel.de> 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 <r.apel@r-apel.de> 0:5.1-10jpp
-- Fix empty-%%post and empty-%%postun
-- Fix no-cleaning-of-buildroot
-
-* Fri Feb 09 2007 Ralph Apel <r.apel@r-apel.de> 0:5.1-9jpp
-- Optionally build without maven
-- Add bootstrap option
-
-* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp
-- Add missing requires for Javadoc task
-
-* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> 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 <r.apel@r-apel.de> 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 <david@jpackage.org> 0:5.1-5jpp
-- rebuild to fix packager
-
-* Sat Nov 06 2004 David Walluck <david@jpackage.org> 0:5.1-4jpp
-- rebuild with javac 1.4.2
-
-* Sat Oct 16 2004 David Walluck <david@jpackage.org> 0:5.1-3jpp
-- rebuild for JPackage 1.6
-
-* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:5.1-2jpp
-- Build with ant-1.6.2
-
-* Sun May 11 2003 David Walluck <david@anti-microsoft.org> 0:5.1-1jpp
-- 5.1
-- update for JPackage 1.5
-
-* Mon Mar 24 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> - 5.0-6jpp
-- For jpackage-utils 1.5
-
-* Tue Feb 25 2003 Ville Skyttä <ville.skytta at iki.fi> - 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 <hgomez@slib.fr> 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 <guillomovitch@users.sourceforge.net> 5.0-3jpp 
-- vendor, distribution, group tags
-
-* Wed Jan 23 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 5.0-2jpp 
-- section macro
-- no dependencies for manual and javadoc package
-
-* Tue Jan 22 2002 Henri Gomez <hgomez@slib.fr> 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 <guillomovitch@users.sourceforge.net> 4.4.1-2jpp
-- javadoc into javadoc package
-- Requires: and BuildRequires: gnu.regexp
-
-* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 4.4.1-1jpp
-- removed packager tag
-- new jpp extension
-- 4.4.1
-
-* Thu Oct 11 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 4.4.0-2jpp
-- first unified release
-- used lower case for name
-- used original tarball
-- s/jPackage/JPackage
-
-* Mon Aug 27 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 4.4.0-1mdk
-- first Mandrake release
+%autochangelog

changelog

@@ -0,0 +1,292 @@
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 6.8.1-2
+- Rebuilt for java-21-openjdk as system jdk
+
+* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.1-1
+- Update to upstream version 6.8.1
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 11 2023 Marian Koncek <mkoncek@redhat.com> - 6.8.0-1
+- Update to upstream version 6.8.0
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.7.0-3
+- Convert License tag to SPDX format
+
+* Fri Aug 18 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.7.0-2
+- Add missing build-requires
+
+* Fri Aug 18 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.7.0-1
+- Update to upstream version 6.7.0
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Dec 01 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.5.0-3
+- Fix arbitrary bytecode produced via out-of-bounds writing
+- Resolves: CVE-2022-42920
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.5.0-1
+- Update to upstream version 6.5.0
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 6.4.1-9
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.4.1-6
+- Remove dependency on jna
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:6.4.1-3
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.4.1-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Oct 16 2019 Marian Koncek <mkoncek@redhat.com> - 6.4.1-1
+- Update to upstream version 6.4.1
+
+* Fri Oct 04 2019 Fabio Valentini <decathorpe@gmail.com> - 0:6.4.1-1
+- Update to version 6.4.1.
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.3.1-2
+- Mass rebuild for javapackages-tools 201901
+
+* Mon May 06 2019 Marian Koncek <mkoncek@redhat.com> - 0:6.3.1-1
+- Update to upstream version 6.3.1
+- Fixes: RHBZ #1692150
+
+* Tue Feb 05 2019 Marian Koncek <mkoncek@redhat.com> - 0:6.3-1
+- Update to upstream version 6.3
+- Fixes: RHBZ #1670025
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Dec 10 2017 Michael Simacek <msimacek@redhat.com> - 0:6.2-1
+- Update to upstream version 6.2
+
+* Fri Sep 22 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:6.1-2
+- Conditionally build without jna
+
+* Tue Sep 19 2017 Michael Simacek <msimacek@redhat.com> - 0:6.1-1
+- Update to upstream version 6.1
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.0-0.7.20140406svn1592769
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.0-0.6.20140406svn1592769
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.0-0.5.20140406svn1592769
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:6.0-0.4.20140406svn1592769
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 11 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:6.0-0.3.20140406svn1592769
+- Add alias for apache:bcel
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:6.0-0.2.20140406svn1592769
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May 06 2014 Michael Simacek <msimacek@redhat.com> - 0:6.0-0.1.20140406svn1592769
+- Update to upstream snapshot compatible with Java 8
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:5.2-16
+- Complete spec file rewrite
+- Build with Maven instead of Ant
+- Remove manual subpackage
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Nov 13 2012 Tom Callaway <spot@fedoraproject.org> - 0:5.2-14
+- Package NOTICE.txt
+
+* Tue Aug 21 2012 Andy Grimm <agrimm@gmail.com> - 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 <rel-eng@lists.fedoraproject.org> - 0:5.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Jun 24 2012 Gerard Ryan <galileo@fedoraproject.org> - 0:5.2-11
+- Inject OSGI Manifest.
+
+* Wed Jan 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 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 <rel-eng@lists.fedoraproject.org> - 0:5.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jul 13 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.2-8
+- Use global.
+- Drop gcj_support.
+- Fix groups.
+- Fix build.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-7.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-6.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 04 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-5.1
+- Do not install poms in /usr/share/maven2/default_poms
+
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:5.2-5
+- drop repotag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:5.2-4jpp.2
+- Autorebuild for GCC 4.3
+
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-3jpp.1
+- Merge with upstream
+
+* Mon Jan 07 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.2
+- Fixed unowned directory (Bugzilla 246185)
+
+* Fri Nov 16 2007 Ralph Apel <r.apel@r-apel.de> 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 <pcheung at redhat.com> 0:5.2-2jpp.1
+- Update to 5.2 in Fedora
+
+* Mon Sep  4 2007 Jason Corley <jason.corley@gmail.com> 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 <r.apel@r-apel.de> 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 <r.apel@r-apel.de> 0:5.1-10jpp
+- Fix empty-%%post and empty-%%postun
+- Fix no-cleaning-of-buildroot
+
+* Fri Feb 09 2007 Ralph Apel <r.apel@r-apel.de> 0:5.1-9jpp
+- Optionally build without maven
+- Add bootstrap option
+
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp
+- Add missing requires for Javadoc task
+
+* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> 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 <r.apel@r-apel.de> 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 <david@jpackage.org> 0:5.1-5jpp
+- rebuild to fix packager
+
+* Sat Nov 06 2004 David Walluck <david@jpackage.org> 0:5.1-4jpp
+- rebuild with javac 1.4.2
+
+* Sat Oct 16 2004 David Walluck <david@jpackage.org> 0:5.1-3jpp
+- rebuild for JPackage 1.6
+
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:5.1-2jpp
+- Build with ant-1.6.2
+
+* Sun May 11 2003 David Walluck <david@anti-microsoft.org> 0:5.1-1jpp
+- 5.1
+- update for JPackage 1.5
+
+* Mon Mar 24 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> - 5.0-6jpp
+- For jpackage-utils 1.5
+
+* Tue Feb 25 2003 Ville Skyttä <ville.skytta@iki.fi> - 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 <hgomez@slib.fr> 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 <guillomovitch@users.sourceforge.net> 5.0-3jpp
+- vendor, distribution, group tags
+
+* Wed Jan 23 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 5.0-2jpp
+- section macro
+- no dependencies for manual and javadoc package
+
+* Tue Jan 22 2002 Henri Gomez <hgomez@slib.fr> 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 <guillomovitch@users.sourceforge.net> 4.4.1-2jpp
+- javadoc into javadoc package
+- Requires: and BuildRequires: gnu.regexp
+
+* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 4.4.1-1jpp
+- removed packager tag
+- new jpp extension
+- 4.4.1
+
+* Thu Oct 11 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 4.4.0-2jpp
+- first unified release
+- used lower case for name
+- used original tarball
+- s/jPackage/JPackage
+
+* Mon Aug 27 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 4.4.0-1mdk
+- first Mandrake release

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,9 @@
+--- !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}

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
+execute:
+  how: tmt

plans/smoke.fmf

@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+  how: fmf
+execute:
+  how: tmt

pom-maven2jpp-depcat.xsl

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="*[name() != 'dependencies']|*/text()">
-     <xsl:apply-templates/>
- </xsl:template>
- <xsl:template match="//dependencies">
-  <xsl:for-each select="./dependency">
-   <xsl:element name="dependency">
-    <xsl:element name="maven">
-     <xsl:choose>
-      <xsl:when test="./groupId">
-       <xsl:copy-of select="./groupId"/>
-       <xsl:copy-of select="./artifactId"/>
-      </xsl:when>
-      <xsl:when test="./id">
-       <xsl:choose>
-        <xsl:when test="substring-before(./id/text(),':') != ''">
-         <xsl:element name="groupId">
-          <xsl:value-of select="substring-before(./id/text(),':')"/>
-         </xsl:element>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-         <xsl:element name="groupId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-        </xsl:otherwise>
-       </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-ERROR
-      </xsl:otherwise>
-     </xsl:choose>
-     <xsl:for-each select="./*">
-      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
-       <xsl:copy-of select="."/>
-      </xsl:if>
-     </xsl:for-each>
-    </xsl:element>
-    <xsl:element name="jpp">
-     <xsl:element name="groupId">JPP</xsl:element>
-     <xsl:choose>
-      <xsl:when test="./artifactId">
-       <xsl:copy-of select="./artifactId"/>
-      </xsl:when>
-      <xsl:when test="./id">
-       <xsl:choose>
-        <xsl:when test="substring-after(./id/text(),':') != ''">
-         <xsl:element name="artifactId">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-        </xsl:otherwise>
-       </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-ERROR
-      </xsl:otherwise>
-     </xsl:choose>
-     <xsl:element name="jar">
-      <xsl:choose>
-       <xsl:when test="./artifactId">
-        <xsl:value-of select="./artifactId/text()"/>
-       </xsl:when>
-       <xsl:when test="./id">
-        <xsl:choose>
-         <xsl:when test="substring-after(./id/text(),':') != ''">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:when>
-         <xsl:otherwise>
-          <xsl:value-of select="./id/text()"/>
-         </xsl:otherwise>
-        </xsl:choose>
-       </xsl:when>
-       <xsl:otherwise>
-ERROR
-       </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-       <xsl:when test="./type">
-        <xsl:choose>
-         <xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
-         <xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
-        </xsl:choose>
-       </xsl:when>
-       <xsl:otherwise>.jar</xsl:otherwise>
-      </xsl:choose>
-     </xsl:element>
-     <xsl:for-each select="./*">
-      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
-       <xsl:copy-of select="."/>
-      </xsl:if>
-     </xsl:for-each>
-    </xsl:element>
-   </xsl:element>
-  </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>

pom-maven2jpp-mapdeps.xsl

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="map" /> 
- <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="/project" >
-  <xsl:element name="project">
-   <xsl:copy-of select="child::*[not(self::dependencies)]"/>
-   <xsl:if test="not(./dependencies)">
-    <xsl:element name="dependencies">
-     <xsl:for-each select="document($map)//add/dependency">
-       <xsl:copy-of select="."/>
-     </xsl:for-each>
-    </xsl:element>
-   </xsl:if>
-   <xsl:apply-templates select="dependencies"/>
-  </xsl:element>
- </xsl:template>
- <xsl:template match="dependencies" >
-  <xsl:element name="dependencies">
-   <xsl:for-each select="dependency">
-    <xsl:if test="./artifactId">
-     <xsl:call-template name="replace">
-      <xsl:with-param name="artifact" select="./artifactId/text()"/>
-     </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="./id">
-     <xsl:choose>
-      <xsl:when test="substring-after(./id/text(),':') != ''">
-       <xsl:call-template name="replace">
-        <xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
-       </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:call-template name="replace">
-        <xsl:with-param name="artifact" select="./id/text()"/>
-       </xsl:call-template>
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:if>
-   </xsl:for-each>
-   <xsl:for-each select="document($map)//add/dependency">
-    <xsl:copy-of select="."/>
-   </xsl:for-each>
-  </xsl:element>
- </xsl:template>
- <xsl:template name="replace">
-  <xsl:param name="artifact"/>
-  <xsl:variable name="this" select="."/>
-  <xsl:element name="dependency">
-   <xsl:choose>
-    <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
-     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
-      <xsl:copy-of select="../jpp/*"/>
-      <xsl:copy-of select="$this/properties"/>
-     </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:copy-of select="./*"/>
-    </xsl:otherwise>
-   </xsl:choose>
-  </xsl:element>
-  <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
-   <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
-    <xsl:for-each select="../add/dependency">
-     <xsl:element name="dependency">
-      <xsl:copy-of select="./*"/>
-      <xsl:copy-of select="$this/properties"/>
-     </xsl:element>
-    </xsl:for-each>
-   </xsl:for-each>
-  </xsl:if>
- </xsl:template>
-</xsl:stylesheet>

pom-maven2jpp-newdepmap.xsl

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:saxon="http://icl.com/saxon"
-	extension-element-prefixes="saxon">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="/" >
-  <xsl:element name="depset">
-   <saxon:group select="//dependency" group-by="./maven/artifactId">
-    <xsl:sort select="./maven/artifactId"/>
-    <xsl:element name="dependency">
-     <xsl:element name="maven">
-      <xsl:copy-of select="./maven/*[name() != 'properties']"/>
-     </xsl:element>
-     <xsl:element name="jpp">
-      <xsl:copy-of select="./jpp/*[name() != 'properties']"/>
-     </xsl:element>
-    </xsl:element>
-    <saxon:item/>
-   </saxon:group>
-  </xsl:element>
- </xsl:template>
-</xsl:stylesheet>

sources

@@ -1,2 +1 @@
-15c882886f67f90ee773cb526b84b4fa  bcel-5.2-src.tar.gz
-2c511b30e00109b501c6f3bd757a1ce1  bcel-jakarta-site2.tar.gz
+SHA512 (bcel-6.10.0-src.tar.gz) = 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14

tests/Sanity/upstream-tests/main.fmf

@@ -0,0 +1,8 @@
+summary: BCEL upstream tests
+description: |
+  Run BCEL upstream tests that are packaged in the SRPM.
+require:
+  - bcel
+  - javapackages-tools
+  - maven
+  - cpio

tests/Sanity/upstream-tests/runtest.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+. /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

tests/main.fmf

@@ -0,0 +1,5 @@
+contact: Mikolaj Izdebski <mizdebsk@redhat.com>
+framework: beakerlib
+test: ./runtest.sh
+tier: 0
+component: bcel