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-man-pages/pom.xml | 104 +++-------------------------------------------------
1 files changed, 6 insertions(+), 98 deletions(-)
diff --git a/opendj-man-pages/pom.xml b/opendj-man-pages/pom.xml
index cddbe12..62f01d0 100644
--- a/opendj-man-pages/pom.xml
+++ b/opendj-man-pages/pom.xml
@@ -18,114 +18,22 @@
<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-man-pages</artifactId>
- <version>4.0.0-SNAPSHOT</version>
-
<name>OpenDJ Man Pages</name>
+ <description>This module contains OpenDJ tools man pages.</description>
<packaging>pom</packaging>
- <description>
- This module contains OpenDJ tools man pages.
- </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-man-pages/browse</url>
- <connection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-man-pages.git</connection>
- <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-man-pages.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
-
- <ciManagement>
- <system>jenkins</system>
- <url>https://ci.forgerock.org/view/OpenDJ/job/OpenDJ%20-%20man-pages%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>
-
- <properties>
- <product.name.lowercase>opendj</product.name.lowercase>
- <forgerock-doc-plugin.version>3.2.0</forgerock-doc-plugin.version>
- <opendj.server.archive.version>4.0.0-SNAPSHOT</opendj.server.archive.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-server-legacy</artifactId>
- <version>${opendj.server.archive.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -134,7 +42,7 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-doc-maven-plugin</artifactId>
- <version>${opendj.server.archive.version}</version>
+ <version>${project.version}</version>
<executions>
<execution>
<id>generate-man-pages</id>
--
Gitblit v1.10.0