Accepting request 1114365 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114365
OBS-URL: https://build.opensuse.org/package/show/Java:packages/httpcomponents-core?expand=0&rev=12
This commit is contained in:
Fridrich Strba 2023-09-29 13:23:45 +00:00 committed by Git OBS Bridge
parent 72b0b0c2de
commit 99bc6afce6

View File

@ -29,7 +29,7 @@ Source1: %{name}-build.tar.xz
Patch0: %{name}-java8compat.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: javapackages-local >= 6
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
@ -101,19 +101,6 @@ for module in httpcore httpcore-nio; do
</plugin>" $module
done
for module in httpcore httpcore-nio; do
%pom_xpath_inject "pom:project" "
<groupId>org.apache.httpcomponents</groupId>
<version>%{version}</version>" $module
%pom_remove_parent $module
# adds version "any" if none is specified
%pom_change_dep ::::: ::::: $module
done
# install JARs to httpcomponents/ for compatibility reasons
# several other packages expect to find the JARs there
%{mvn_file} ":{*}" httpcomponents/@1
%build
mkdir -p lib
%if %{with tests}
@ -134,7 +121,7 @@ done
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/httpcomponents
for module in httpcore httpcore-nio; do
install -pm 0644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/httpcomponents/${module}.pom
%{mvn_install_pom} ${module}/pom.xml %{buildroot}%{_mavenpomdir}/httpcomponents/${module}.pom
%add_maven_depmap httpcomponents/${module}.pom httpcomponents/${module}.jar
done
# javadoc