Accepting request 1114379 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114379
OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=41
This commit is contained in:
Fridrich Strba 2023-09-29 13:30:04 +00:00 committed by Git OBS Bridge
parent dbc7f9f0ec
commit ee1ff49487
2 changed files with 3 additions and 16 deletions

View File

@ -63,12 +63,6 @@ Group: Development/Libraries/Java
%package container-default %package container-default
Summary: Default Container from %{name} Summary: Default Container from %{name}
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: mvn(com.google.guava:guava)
Requires: mvn(org.apache.xbean:xbean-reflect)
Requires: mvn(org.codehaus.plexus:plexus-classworlds)
Requires: mvn(org.codehaus.plexus:plexus-utils)
Requires: mvn(org.ow2.asm:asm)
Requires: mvn(org.ow2.asm:asm-commons)
%description container-default %description container-default
%{summary}. %{summary}.
@ -128,9 +122,7 @@ mkdir -p plexus-component-annotations/src/test/java
%build %build
for i in plexus-component-annotations plexus-container-default; do for i in plexus-component-annotations plexus-container-default; do
pushd ${i} pushd ${i}
%pom_remove_parent . %{ant} \
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" .
ant \
%if %{without tests} %if %{without tests}
-Dtest.skip=true \ -Dtest.skip=true \
%endif %endif
@ -151,7 +143,7 @@ ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexu
# poms # poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
for i in plexus-component-annotations plexus-container-default; do for i in plexus-component-annotations plexus-container-default; do
install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
done done
%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations %add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations
%add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api %add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api

View File

@ -135,11 +135,6 @@ rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven
%pom_remove_dep :maven-model plexus-%{comp_name} %pom_remove_dep :maven-model plexus-%{comp_name}
%pom_remove_dep :maven-plugin-api plexus-%{comp_name} %pom_remove_dep :maven-plugin-api plexus-%{comp_name}
%pom_remove_parent plexus-%{comp_name}
%pom_xpath_inject "pom:project" "
<groupId>org.codehaus.plexus</groupId>
<version>%{version}</version>
" plexus-%{comp_name}
%pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name} %pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name}
%build %build
@ -158,7 +153,7 @@ install -dm 0755 %{buildroot}%{_javadir}
install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir} install -dm 0755 %{buildroot}%{_mavenpomdir}
install -pm 0644 plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %{mvn_install_pom} plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar %add_maven_depmap %{name}.pom %{name}.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}