diff --git a/plexus-containers.spec b/plexus-containers.spec index eae5fa0..0999ed9 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -63,12 +63,6 @@ Group: Development/Libraries/Java %package container-default Summary: Default Container from %{name} 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 %{summary}. @@ -128,9 +122,7 @@ mkdir -p plexus-component-annotations/src/test/java %build for i in plexus-component-annotations plexus-container-default; do pushd ${i} - %pom_remove_parent . - %pom_xpath_inject "pom:project" "org.codehaus.plexus%{version}" . - ant \ + %{ant} \ %if %{without tests} -Dtest.skip=true \ %endif @@ -151,7 +143,7 @@ ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexu # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} 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 %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 diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index 54915f0..cd88f46 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -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-plugin-api plexus-%{comp_name} -%pom_remove_parent plexus-%{comp_name} -%pom_xpath_inject "pom:project" " - org.codehaus.plexus - %{version} -" plexus-%{comp_name} %pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name} %build @@ -158,7 +153,7 @@ install -dm 0755 %{buildroot}%{_javadir} install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom 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 # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}