diff --git a/.gitignore b/.gitignore index 8eddb0f..5b2eb60 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /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 27f8f67..54856cc 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,5 +1,5 @@ Name: bcel -Version: 6.8.1 +Version: 6.10.0 Release: %autorelease Summary: Byte Code Engineering Library License: Apache-2.0 @@ -9,10 +9,12 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz -BuildRequires: maven-local +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 @@ -30,12 +32,6 @@ 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 @@ -47,7 +43,7 @@ API documentation for %{name}. %mvn_file : %{name} %build -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -56,8 +52,5 @@ API documentation for %{name}. %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 86bfcea..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: f42 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 execute: how: tmt diff --git a/sources b/sources index 7bcd686..2a1c63f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcel-6.8.1-src.tar.gz) = 1a38f4603bfe8692e4fc71a911fbb37ddc30ee5afa270d4b36f0325879a555df2cab34e2abf38645a3c7b780e30dec516a0eac21a0d7e18ff412a5762282360e +SHA512 (bcel-6.10.0-src.tar.gz) = 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14 diff --git a/tests/Sanity/upstream-tests/main.fmf b/tests/Sanity/upstream-tests/main.fmf index c957ccd..a3a52fb 100644 --- a/tests/Sanity/upstream-tests/main.fmf +++ b/tests/Sanity/upstream-tests/main.fmf @@ -5,3 +5,4 @@ require: - bcel - javapackages-tools - maven + - cpio diff --git a/tests/Sanity/upstream-tests/runtest.sh b/tests/Sanity/upstream-tests/runtest.sh index b38cb6c..9c38473 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,BCELifierTestCase" + rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,ConstantPoolModuleAccessTestCase,BCELifierTestCase" rlAssertGrep "BUILD SUCCESS" $rlRun_LOG rlAssertGrep "Failures: 0, Errors: 0" $rlRun_LOG rlPhaseEnd