From 02cc525d49c32439d15d8961d4f6d90dbc82a56f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 08 Apr 2016 22:42:23 +0000
Subject: [PATCH] Minor: split standard and OEM packaging into separate profiles
---
opendj-packages/opendj-zip/pom.xml | 11 ++++-
opendj-packages/opendj-deb/pom.xml | 19 +++++++--
opendj-packages/opendj-msi/pom.xml | 11 ++++-
opendj-packages/opendj-svr4/pom.xml | 11 ++++-
pom.xml | 7 +++
opendj-packages/opendj-rpm/pom.xml | 19 +++++++--
6 files changed, 61 insertions(+), 17 deletions(-)
diff --git a/opendj-packages/opendj-deb/pom.xml b/opendj-packages/opendj-deb/pom.xml
index c388f4c..cc61bc3 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/opendj-packages/opendj-deb/pom.xml
@@ -25,10 +25,21 @@
<version>4.0.0-SNAPSHOT</version>
</parent>
- <modules>
- <module>opendj-deb-standard</module>
- <module>opendj-deb-oem</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>packages</id>
+ <modules>
+ <module>opendj-deb-standard</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>packages-oem</id>
+ <modules>
+ <module>opendj-deb-oem</module>
+ </modules>
+ </profile>
+ </profiles>
<artifactId>opendj-deb</artifactId>
<name>OpenDJ Debian Packages Parent</name>
diff --git a/opendj-packages/opendj-msi/pom.xml b/opendj-packages/opendj-msi/pom.xml
index 2ac1525..b1b5412 100644
--- a/opendj-packages/opendj-msi/pom.xml
+++ b/opendj-packages/opendj-msi/pom.xml
@@ -32,7 +32,12 @@
This module contains configuration and generic plugin call to build OpenDJ MSI packages.
</description>
- <modules>
- <module>opendj-msi-standard</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>packages</id>
+ <modules>
+ <module>opendj-msi-standard</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/opendj-packages/opendj-rpm/pom.xml b/opendj-packages/opendj-rpm/pom.xml
index c9fa6f0..4807208 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/opendj-packages/opendj-rpm/pom.xml
@@ -28,10 +28,21 @@
<artifactId>opendj-rpm</artifactId>
<name>OpenDJ RPM Packages Parent</name>
- <modules>
- <module>opendj-rpm-standard</module>
- <module>opendj-rpm-oem</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>packages</id>
+ <modules>
+ <module>opendj-rpm-standard</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>packages-oem</id>
+ <modules>
+ <module>opendj-rpm-oem</module>
+ </modules>
+ </profile>
+ </profiles>
<description>
This module contains configuration and generic plugin calls to generate RPM OpenDJ packages.
diff --git a/opendj-packages/opendj-svr4/pom.xml b/opendj-packages/opendj-svr4/pom.xml
index 078b50c..7b2e873 100644
--- a/opendj-packages/opendj-svr4/pom.xml
+++ b/opendj-packages/opendj-svr4/pom.xml
@@ -32,8 +32,13 @@
This module contains configuration and generic plugin call to build OpenDJ SVR4 packages.
</description>
- <modules>
- <module>opendj-svr4-standard</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>packages</id>
+ <modules>
+ <module>opendj-svr4-standard</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/opendj-packages/opendj-zip/pom.xml b/opendj-packages/opendj-zip/pom.xml
index e43f7ee..d993267 100644
--- a/opendj-packages/opendj-zip/pom.xml
+++ b/opendj-packages/opendj-zip/pom.xml
@@ -32,8 +32,13 @@
This module contains configuration and generic plugin call to build OpenDJ ZIP packages.
</description>
- <modules>
- <module>opendj-zip-oem</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>packages-oem</id>
+ <modules>
+ <module>opendj-zip-oem</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index a548cab..93b8d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -551,6 +551,13 @@
</profile>
<profile>
+ <id>packages-oem</id>
+ <modules>
+ <module>opendj-packages</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>precommit</id>
<build>
<plugins>
--
Gitblit v1.10.0