From e6c513bb9c6a39c8f03b05bdc9ecdc1f23a543b1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 07 Apr 2016 14:51:26 +0000
Subject: [PATCH] OPENDJ-2768 merge OpenDJ SDK, packaging, and manual pages sources with server
---
opendj-packages/pom.xml | 166 ++++++++++++++++---------------------------------------
1 files changed, 48 insertions(+), 118 deletions(-)
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index dacb962..b720f62 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -12,151 +12,81 @@
Header, with the fields enclosed by brackets [] replaced by your own identifying
information: "Portions Copyright [year] [name of copyright owner]".
- Copyright 2015 ForgeRock AS.
+ Copyright 2015-2016 ForgeRock AS.
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.forgerock</groupId>
- <artifactId>forgerock-parent</artifactId>
- <version>2.0.4</version>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.0.0-SNAPSHOT</version>
-
<name>OpenDJ Packages</name>
-
- <packaging>pom</packaging>
-
<description>
This module contains sub-modules which generates OEM OpenDJ version, deb and rpm OpenDJ packages.
</description>
- <inceptionYear>2015</inceptionYear>
- <url>http://opendj.forgerock.org</url>
-
- <issueManagement>
- <system>Jira</system>
- <url>https://bugster.forgerock.org/jira/browse/OPENDJ</url>
- </issueManagement>
-
- <mailingLists>
- <mailingList>
- <name>OpenDJ Users Mailing List</name>
- <archive>http://lists.forgerock.org/pipermail/opendj/</archive>
- <subscribe>https://lists.forgerock.org/mailman/listinfo/opendj/</subscribe>
- <unsubscribe>https://lists.forgerock.org/mailman/listinfo/opendj/</unsubscribe>
- <post>opendj@forgerock.org</post>
- </mailingList>
-
- <mailingList>
- <name>OpenDJ Developers Mailing List</name>
- <archive>http://lists.forgerock.org/pipermail/opendj-dev/</archive>
- <subscribe>https://lists.forgerock.org/mailman/listinfo/opendj-dev/</subscribe>
- <unsubscribe>https://lists.forgerock.org/mailman/listinfo/opendj-dev/</unsubscribe>
- <post>opendj-dev@forgerock.org</post>
- </mailingList>
- </mailingLists>
-
- <scm>
- <url>https://stash.forgerock.org/projects/OPENDJ/repos/opendj-packages/browse</url>
- <connection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-packages.git</connection>
- <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-packages.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
-
- <ciManagement>
- <system>jenkins</system>
- <url>https://ci.forgerock.org/view/OpenDJ/job/OpenDJ%20-%20packages%20-%20postcommit</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <sendOnError>true</sendOnError>
- <sendOnFailure>true</sendOnFailure>
- <sendOnSuccess>false</sendOnSuccess>
- <sendOnWarning>false</sendOnWarning>
- <address>opendj-dev@forgerock.org</address>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <repositories>
- <repository>
- <id>forgerock-staging-repository</id>
- <name>ForgeRock Release Repository</name>
- <url>http://maven.forgerock.org/repo/releases</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>forgerock-snapshots-repository</id>
- <name>ForgeRock Snapshot Repository</name>
- <url>http://maven.forgerock.org/repo/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
-
- <repository>
- <id>jvnet-nexus-snapshots</id>
- <url>https://maven.java.net/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
-
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <packaging>pom</packaging>
<properties>
- <product.name>OpenDJ</product.name>
- <product.name.lowercase>opendj</product.name.lowercase>
<legal.folder>legal-notices</legal.folder>
<lib.folder>lib</lib.folder>
<!-- Location of the opendj service file for linux based packages. -->
<sysv.file.location />
- <opendj.server.archive.version>4.0.0-SNAPSHOT</opendj.server.archive.version>
</properties>
<modules>
<module>opendj-zip</module>
- <module>opendj-deb</module>
- <module>opendj-rpm</module>
- <module>opendj-svr4</module>
- <module>opendj-msi</module>
</modules>
+ <profiles>
+ <profile>
+ <id>opendj-deb</id>
+ <activation>
+ <os><family>Linux</family></os>
+ </activation>
+ <modules>
+ <module>opendj-deb</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>opendj-rpm</id>
+ <activation>
+ <file><exists>/usr/bin/rpm</exists></file>
+ </activation>
+ <modules>
+ <module>opendj-rpm</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>opendj-svr4</id>
+ <activation>
+ <os><family>SunOS</family></os>
+ </activation>
+ <modules>
+ <module>opendj-svr4</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>opendj-msi</id>
+ <activation>
+ <os><family>Windows</family></os>
+ </activation>
+ <modules>
+ <module>opendj-msi</module>
+ </modules>
+ </profile>
+ </profiles>
+
<build>
<pluginManagement>
<plugins>
- <!--
- | Parse version to generate properties:
- | * parsedVersion.majorVersion
- | * parsedVersion.majorVersion
- | * parsedVersion.incrementalVersion
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>parse-product-version</id>
- <phase>package</phase>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Unpack files from OpenDJ standard archive -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -173,7 +103,7 @@
<artifactItem>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-server-legacy</artifactId>
- <version>${opendj.server.archive.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
--
Gitblit v1.10.0