Remove unnecessary fields from parent.pom, rename to aggregator.pom
This commit is contained in:
Marian Koncek
parent
834f46632f
commit
05aa3e9fd9
44
aggregator.pom
Normal file
44
aggregator.pom
Normal file
@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
|
||||
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.fedoraproject.xmvn.aqute-bnd</groupId>
|
||||
<artifactId>aggregator</artifactId>
|
||||
<version>any</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<modules>
|
||||
<module>aQute.libg</module>
|
||||
<module>biz.aQute.bndlib</module>
|
||||
<module>biz.aQute.bnd</module>
|
||||
<module>biz.aQute.bnd.annotation</module>
|
||||
<module>biz.aQute.bnd.ant</module>
|
||||
<module>biz.aQute.bnd.util</module>
|
||||
<module>maven</module>
|
||||
</modules>
|
||||
<build>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/</directory>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
<exclude>**/packageinfo</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>any</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@ -23,7 +23,7 @@ Source0: %{name}-%{version}.tar.gz
|
||||
Source1: generate-tarball.sh
|
||||
|
||||
# Auxiliary parent pom, packager-written
|
||||
Source2: parent.pom
|
||||
Source2: aggregator.pom
|
||||
Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
|
||||
Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom
|
||||
Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom
|
||||
@ -109,7 +109,6 @@ API documentation for %{name}.
|
||||
rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java
|
||||
|
||||
cp %SOURCE2 pom.xml
|
||||
%pom_xpath_set "pom:project/pom:version" "%{version}"
|
||||
sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
|
||||
|
||||
%if %{without bnd_maven_plugin}
|
||||
@ -119,14 +118,14 @@ sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd
|
||||
# libg
|
||||
pushd aQute.libg
|
||||
cp -p %{SOURCE3} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any
|
||||
%pom_add_dep org.osgi:osgi.cmpn
|
||||
popd
|
||||
|
||||
# bnd.annotation
|
||||
pushd biz.aQute.bnd.annotation
|
||||
cp -p %{SOURCE6} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any
|
||||
%pom_add_dep org.osgi:osgi.core
|
||||
%pom_add_dep org.osgi:osgi.cmpn
|
||||
popd
|
||||
@ -134,7 +133,7 @@ popd
|
||||
# bndlib
|
||||
pushd biz.aQute.bndlib
|
||||
cp -p %{SOURCE5} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any
|
||||
%pom_add_dep org.osgi:osgi.cmpn
|
||||
%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
|
||||
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
|
||||
@ -143,14 +142,14 @@ popd
|
||||
# bnd.ant
|
||||
pushd biz.aQute.bnd.ant
|
||||
cp -p %{SOURCE7} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any
|
||||
popd
|
||||
|
||||
# bnd
|
||||
cp -r biz.aQute.bnd.exporters/src/aQute/bnd/exporter biz.aQute.bnd/src/aQute/bnd/
|
||||
pushd biz.aQute.bnd
|
||||
cp -p %{SOURCE4} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any
|
||||
%pom_remove_dep :biz.aQute.resolve
|
||||
%pom_remove_dep :biz.aQute.repository
|
||||
%pom_remove_dep :biz.aQute.bnd.exporters
|
||||
@ -165,7 +164,7 @@ popd
|
||||
# bnd.util
|
||||
pushd biz.aQute.bnd.util
|
||||
cp -p %{SOURCE8} pom.xml
|
||||
%pom_add_parent biz.aQute.bnd:parent:%{version}
|
||||
%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any
|
||||
%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
|
||||
popd
|
||||
|
||||
@ -211,7 +210,7 @@ popd
|
||||
%mvn_package biz.aQute.bnd:biz.aQute.bndlib bndlib
|
||||
%mvn_package biz.aQute.bnd:biz.aQute.bnd.annotation bndlib
|
||||
%mvn_package biz.aQute.bnd:aQute.libg bndlib
|
||||
%mvn_package biz.aQute.bnd:parent __noinstall
|
||||
%mvn_package org.fedoraproject.xmvn.aqute-bnd:aggregator __noinstall
|
||||
%mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall
|
||||
%if %{with bnd_maven_plugin}
|
||||
%mvn_package biz.aQute.bnd:bnd-maven-plugin maven
|
||||
|
||||
203
parent.pom
203
parent.pom
@ -1,203 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
|
||||
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>biz.aQute.bnd</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version></version>
|
||||
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Parent project for bnd tool suite</name>
|
||||
<description>Project information for bnd.</description>
|
||||
<url>http://www.aQute.biz/Code/Bnd</url>
|
||||
|
||||
<organization>
|
||||
<name>aQute SARL</name>
|
||||
<url>http://www.aQute.biz</url>
|
||||
</organization>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache Software License 2.0</name>
|
||||
<url>http://www.opensource.org/licenses/apache2.0.php</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>bnd</id>
|
||||
<name>Peter Kriens</name>
|
||||
<organization>aQute SARL</organization>
|
||||
<roles>
|
||||
<role>Primary Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>bjhargrave</id>
|
||||
<name>BJ Hargrave</name>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>mcculls</id>
|
||||
<name>Stuart McCulloch</name>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>njbartlett</id>
|
||||
<name>Neil Bartlett</name>
|
||||
<organization>Paremus</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>fhuberts</id>
|
||||
<name>Ferry Huberts</name>
|
||||
<organization>Pelagic</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>psoreide</id>
|
||||
<name>PK Søreide</name>
|
||||
<organization>Comactivity AB</organization>
|
||||
</developer>
|
||||
</developers>
|
||||
<contributors>
|
||||
<contributor>
|
||||
<!--<id>derheld42</id>-->
|
||||
<name>Carter Smithhart</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>cchabanois</id>-->
|
||||
<name>Chabanois Cédric</name>
|
||||
<organization>Entropysoft</organization>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>paulbakker</id>-->
|
||||
<name>Paul Bakker</name>
|
||||
<organization>Luminis Technologies</organization>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>djencks</id>-->
|
||||
<name>David Jencks</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>rkrzewski</id>-->
|
||||
<name>Rafał Krzewski</name>
|
||||
<organization>Caltha - Krzewski, Mach, Potempski Sp. J.</organization>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>xfournet</id>-->
|
||||
<name>Xavier Fournet</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>crabbkw</id>-->
|
||||
<name>Casey Crabb</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>david.bosschaert</id>-->
|
||||
<name>David Bosschaert</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>harald.wellmann</id>-->
|
||||
<name>Harald Wellmann</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>janwillem.janssen</id>-->
|
||||
<name>Jan Willem Janssen</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>marcel.offermans</id>-->
|
||||
<name>Marcel Offermans</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>marian.grigoras</id>-->
|
||||
<name>Marian Grigoras</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>markuswolf</id>-->
|
||||
<name>Markus Wolf</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>nicolas.lalevee</id>-->
|
||||
<name>Nicolas Lalevée</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>pierre.labiausse</id>-->
|
||||
<name>Pierre Labiausse</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>raymond.auge</id>-->
|
||||
<name>Raymond Auge</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>timothyjward</id>-->
|
||||
<name>Tim Ward</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>bramk</id>-->
|
||||
<name>Bram de Kruijff</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>tangyong</id>-->
|
||||
<name>Tang Yong</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>gamerson</id>-->
|
||||
<name>Gregory Amerson</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>gnodet</id>-->
|
||||
<name>Guillaume Nodet</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>marcdejonge</id>-->
|
||||
<name>Marc de Jonge</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<!--<id>trespasserw</id>-->
|
||||
<name>Roman Shevchenko</name>
|
||||
</contributor>
|
||||
</contributors>
|
||||
|
||||
<scm>
|
||||
<url>https://github.com/bndtools/bnd</url>
|
||||
<connection>scm:git:git://github.com/bndtools/bnd.git</connection>
|
||||
<developerConnection>scm:git:ssh://github.com/bndtools/bnd.git</developerConnection>
|
||||
</scm>
|
||||
|
||||
<modules>
|
||||
<module>aQute.libg</module>
|
||||
<module>biz.aQute.bndlib</module>
|
||||
<module>biz.aQute.bnd</module>
|
||||
<module>biz.aQute.bnd.annotation</module>
|
||||
<module>biz.aQute.bnd.ant</module>
|
||||
<module>biz.aQute.bnd.util</module>
|
||||
<module>maven</module>
|
||||
</modules>
|
||||
|
||||
<build>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/</directory>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
<exclude>**/packageinfo</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>any</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
Loading…
Reference in New Issue
Block a user