From b178cdd5f0048bf62de46b8b76ae838212329935f1ceafe042cbfb793e20fb71 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 9 Apr 2019 17:19:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=19 --- plexus-containers.changes | 6 ++++++ plexus-containers.spec | 16 ++-------------- plexus-metadata-generator.changes | 7 +++++++ plexus-metadata-generator.spec | 7 ++++++- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/plexus-containers.changes b/plexus-containers.changes index 1ecdb5e..42a2b38 100644 --- a/plexus-containers.changes +++ b/plexus-containers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 9 17:10:35 UTC 2019 - Fridrich Strba + +- Remove references to parent poms since we are not building with + Maven. + ------------------------------------------------------------------- Fri Mar 22 21:34:55 UTC 2019 - Fridrich Strba diff --git a/plexus-containers.spec b/plexus-containers.spec index b3e7b7b..dcc06b6 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -38,12 +38,10 @@ BuildRequires: fdupes BuildRequires: guava20 BuildRequires: javapackages-local BuildRequires: junit -BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: plexus-classworlds BuildRequires: plexus-utils BuildRequires: xbean BuildConflicts: java-devel >= 9 -Requires: mvn(org.codehaus.plexus:plexus:pom:) BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -61,7 +59,6 @@ application server which is like a J2EE application server. Summary: Javadoc component from %{name} Group: Development/Libraries/Java Requires: mvn(com.sun:tools) -Requires: mvn(org.codehaus.plexus:plexus-containers:pom:) %description component-javadoc %{summary}. @@ -69,7 +66,6 @@ Requires: mvn(org.codehaus.plexus:plexus-containers:pom:) %package component-annotations Summary: Component API from %{name} Group: Development/Libraries/Java -Requires: mvn(org.codehaus.plexus:plexus-containers:pom:) %description component-annotations %{summary}. @@ -80,7 +76,6 @@ Group: Development/Libraries/Java Requires: mvn(com.google.guava:guava:20.0) Requires: mvn(org.apache.xbean:xbean-reflect) Requires: mvn(org.codehaus.plexus:plexus-classworlds) -Requires: mvn(org.codehaus.plexus:plexus-containers:pom:) Requires: mvn(org.codehaus.plexus:plexus-utils) Requires: mvn(org.ow2.asm:asm) Requires: mvn(org.ow2.asm:asm-commons) @@ -150,12 +145,11 @@ mkdir -p plexus-component-annotations/src/test/java # integration tests fix sed -i "s|2.3| %{javadoc_plugin_version}|" plexus-component-javadoc/src/it/basic/pom.xml -# plexus-component-api has been merged into plexus-container-default -# %{mvn_alias} ":plexus-container-default" "org.codehaus.plexus:containers-component-api" - %build for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do pushd ${i} + %pom_remove_parent . + %pom_xpath_inject "pom:project" "org.codehaus.plexus%{version}" . ant \ %if %{without tests} -Dtest.skip=true \ @@ -176,11 +170,9 @@ ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexu # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-containers.pom for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom done -%add_maven_depmap %{name}/plexus-containers.pom %add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations %add_maven_depmap %{name}/plexus-component-javadoc.pom %{name}/plexus-component-javadoc.jar -f component-javadoc %add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api @@ -192,10 +184,6 @@ for i in plexus-component-annotations plexus-component-javadoc plexus-container- done %fdupes -s %{buildroot}%{_javadocdir} -# plexus-containers pom goes into main package -%files -f .mfiles -%license LICENSE-2.0.txt LICENSE.MIT - %files component-annotations -f .mfiles-component-annotations %license LICENSE-2.0.txt LICENSE.MIT %{_javadir}/plexus diff --git a/plexus-metadata-generator.changes b/plexus-metadata-generator.changes index 9cc2e96..e623bcd 100644 --- a/plexus-metadata-generator.changes +++ b/plexus-metadata-generator.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 9 17:17:04 UTC 2019 - Fridrich Strba + +- Remove reference to parent pom, since we are not building with + Maven. +- Clean the classpath of the script to include only neede jars + ------------------------------------------------------------------- Sat Mar 23 08:40:02 UTC 2019 - Jan Engelhardt diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index cc78660..eade9b9 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -146,6 +146,11 @@ rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven %pom_remove_dep :maven-project plexus-%{comp_name} %pom_remove_dep :maven-plugin-annotations 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 @@ -171,7 +176,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}:objectweb-asm/asm:objectweb-asm/asm-commons:plexus/classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava20/guava-20.0:xbean/xbean-reflect %{name} +%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava20/guava-20.0:xbean/xbean-reflect %{name} %files -f .mfiles %license LICENSE-2.0.txt LICENSE.MIT