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-bom/pom.xml | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk-bom/pom.xml b/opendj-bom/pom.xml
similarity index 70%
rename from opendj-sdk-bom/pom.xml
rename to opendj-bom/pom.xml
index 7f5d35a..fecfc78 100644
--- a/opendj-sdk-bom/pom.xml
+++ b/opendj-bom/pom.xml
@@ -25,18 +25,17 @@
</parent>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-sdk-bom</artifactId>
+ <artifactId>opendj-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>OpenDJ SDK BOM</name>
+ <name>OpenDJ BOM</name>
<description>
- Provides a list of OpenDJ SDK dependencies which are known to be compatible with each other.
+ Provides a list of OpenDJ dependencies which are known to be compatible with each other.
</description>
<properties>
- <opendj.sdk.version>4.0.0-SNAPSHOT</opendj.sdk.version>
<i18n-framework.version>1.4.2</i18n-framework.version>
</properties>
@@ -69,25 +68,25 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-core</artifactId>
- <version>${opendj.sdk.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-cli</artifactId>
- <version>${opendj.sdk.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-grizzly</artifactId>
- <version>${opendj.sdk.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-rest2ldap</artifactId>
- <version>${opendj.sdk.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Other -->
@@ -98,4 +97,33 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <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>
</project>
--
Gitblit v1.10.0