honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/12984-rpm-module'

This commit is contained in:
David Pilato 2015-08-20 09:43:47 +02:00
parent 7662705f37 dba1b52e81
commit 449dfc8f56
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distribution/pom.xml
View File

@ -33,9 +33,6 @@
<project.licenses.dir>${project.basedir}/../licenses</project.licenses.dir> <project.licenses.dir>${project.basedir}/../licenses</project.licenses.dir>
<project.licenses.check_target>${integ.scratch}</project.licenses.check_target> <project.licenses.check_target>${integ.scratch}</project.licenses.check_target>
<!-- rpmbuild location : default to /usr/bin/rpmbuild -->
<packaging.rpm.rpmbuild>/usr/bin/rpmbuild</packaging.rpm.rpmbuild>
<!-- we expect packaging formats to have integration tests, but not unit tests --> <!-- we expect packaging formats to have integration tests, but not unit tests -->
<skip.unit.tests>true</skip.unit.tests> <skip.unit.tests>true</skip.unit.tests>
</properties> </properties>
@ -172,6 +169,11 @@
</modules> </modules>
<profiles> <profiles>
<!--
We include automatically RPM module when it's available in common locations.
If your rpmbuild is in another location (but in path), run maven with rpm profile:
mvn deploy -Prpm
-->
<profile> <profile>
<id>macos_brew</id> <id>macos_brew</id>
<activation> <activation>
@ -190,7 +192,7 @@
<activation> <activation>
<file> <file>
<!-- Folks having /usr/bin/rpmbuild available will be able to build the rpm module --> <!-- Folks having /usr/bin/rpmbuild available will be able to build the rpm module -->
<exists>${packaging.rpm.rpmbuild}</exists> <exists>/usr/bin/rpmbuild</exists>
</file> </file>
</activation> </activation>
<modules> <modules>