diff --git a/.gitignore b/.gitignore index 431bc7c..9d5548f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /apache-30-source-release.zip /apache-31-source-release.zip /apache-33-source-release.zip +/apache-35-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 71a0eb7..dbb56e7 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-parent -Version: 33 +Version: 35 Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 @@ -14,8 +14,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif %if %{without bootstrap} @@ -30,12 +29,13 @@ This package contains the parent pom file for apache projects. %prep %autosetup -p1 -C +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-site-plugin docs %pom_remove_plugin :maven-scm-publish-plugin docs %build -%mvn_build +%mvn_build -j %install %mvn_install 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 9ec533f..e50d149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-33-source-release.zip) = a819eb75f147baa19661ebb7794d4d711f760bb7fc04f66cfefd0f8c57fa24aa8cf4f4d597c4c665ce8604e6941fa519540ccabd3647134390e023cbd671eabe +SHA512 (apache-35-source-release.zip) = 7dcbfa0eacd43e66da1c12274bf558fb2618d3fae0831de6b0309e8df539afc07080eb1963174a0a6cc4d0d81ae8d2a01f147780f7ca44a3caa94d3ffd364b61