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/plexus-languages.spec b/plexus-languages.spec index 0c5e0ac..aaa6bd0 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -18,7 +18,7 @@ Source2: generate-tarball.sh %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) @@ -26,17 +26,13 @@ BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.2.0-15 %description Plexus Languages is a set of Plexus components that maintain shared language features. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -46,7 +42,7 @@ cp %{SOURCE1} . %build # many tests rely on bundled test jars/classes -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -54,7 +50,5 @@ cp %{SOURCE1} . %files -f .mfiles %license LICENSE-2.0.txt -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog