From 45272a6e20ac2d30d2252e4060be65e722c30336 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 23 Feb 2023 11:50:59 +0100 Subject: [PATCH] Refactor poms --- parent.pom => aggregator.pom | 11 +++++++---- objectweb-asm.spec | 15 ++++++++------- tools-retrofitter.pom | 3 +-- 3 files changed, 16 insertions(+), 13 deletions(-) rename parent.pom => aggregator.pom (84%) diff --git a/parent.pom b/aggregator.pom similarity index 84% rename from parent.pom rename to aggregator.pom index 83012ff..f267e26 100644 --- a/parent.pom +++ b/aggregator.pom @@ -3,10 +3,9 @@ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> 4.0.0 - org.ow2.asm - asm-aggregator - - + org.fedoraproject.xmvn.objectweb-asm + aggregator + any pom @@ -25,6 +24,10 @@ + org.apache.maven.plugins maven-antrun-plugin diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4fdf808..0e25897 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -11,7 +11,7 @@ ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -Source1: parent.pom +Source1: aggregator.pom Source2: https://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom Source3: https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom Source4: https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom @@ -63,26 +63,27 @@ This package provides %{summary}. %patch1 -p1 %patch2 -p1 -# A custom parent pom to aggregate the build +# A custom pom to aggregate the build cp -p %{SOURCE1} pom.xml -%pom_xpath_set pom:project/pom:version %{version} cp -p %{SOURCE10} tools/retrofitter/pom.xml # Insert poms into modules for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do cp -p ${RPM_SOURCE_DIR}/${pom}-%{version}.pom ${pom}/pom.xml - %pom_add_dep org.ow2.asm:tools-retrofitter::provided ${pom} + %pom_add_dep org.fedoraproject.xmvn.objectweb-asm:tools-retrofitter::provided ${pom} %pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin ${pom} - %pom_set_parent org.ow2.asm:asm-aggregator:%{version} ${pom} + %pom_set_parent org.fedoraproject.xmvn.objectweb-asm:aggregator:any ${pom} %pom_xpath_inject pom:parent '..' ${pom} done +# Don't ship poms used for build only +%mvn_package :aggregator __noinstall +%mvn_package :tools-retrofitter __noinstall + # Don't ship the test framework to avoid runtime dep on junit %mvn_package :asm-test __noinstall -%mvn_package :tools-retrofitter __noinstall - %build %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 diff --git a/tools-retrofitter.pom b/tools-retrofitter.pom index 5e24dda..bd1f813 100644 --- a/tools-retrofitter.pom +++ b/tools-retrofitter.pom @@ -3,10 +3,9 @@ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> 4.0.0 - org.ow2.asm + org.fedoraproject.xmvn.objectweb-asm tools-retrofitter any - jar