PR#11: Refactor poms - rpms/objectweb-asm

rpms / objectweb-asm

#11 Refactor poms

Closed a year ago by mkoncek. Opened a year ago by mkoncek.

rpms/ mkoncek/objectweb-asm poms into rawhide

Do not ship helper poms used for build

Marian Koncek • a year ago

da8371f

Refactor poms

Marian Koncek • a year ago

c2d4c97

aggregator.pom ~~parent.pom~~

file renamed

+7 -4

		`@@ -3,10 +3,9 @@`
		`xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>`
		`<modelVersion>4.0.0</modelVersion>`

		`- <groupId>org.ow2.asm</groupId>`
		`- <artifactId>asm-aggregator</artifactId>`
		`- <version></version>`
		`-`
		`+ <groupId>org.fedoraproject.xmvn.objectweb-asm</groupId>`
		`+ <artifactId>aggregator</artifactId>`
		`+ <version>any</version>`
		`<packaging>pom</packaging>`

		`<properties>`
		`@@ -25,6 +24,10 @@`
		`<build>`
		`<pluginManagement>`
		`<plugins>`
		`+ <!-- Run the retrofitter tool which:`
		`+ * downgrades the class bytecode version to 1.5`
		`+ * generates module-info.class files in each .jar`
		`+ -->`
		`<plugin>`
		`<groupId>org.apache.maven.plugins</groupId>`
		`<artifactId>maven-antrun-plugin</artifactId>`

objectweb-asm.spec

file modified

+8 -7

		`@@ -11,7 +11,7 @@`

		`# ./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 @@`
		`%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 '<relativePath>..</relativePath>' ${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`

tools-retrofitter.pom

file modified

+1 -2

		`@@ -3,10 +3,9 @@`
		`xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>`
		`<modelVersion>4.0.0</modelVersion>`

		`- <groupId>org.ow2.asm</groupId>`
		`+ <groupId>org.fedoraproject.xmvn.objectweb-asm</groupId>`
		`<artifactId>tools-retrofitter</artifactId>`
		`<version>any</version>`
		`-`
		`<packaging>jar</packaging>`

		`<dependencies>`