From 06a46cf01789cbbe075acdb1789d5c7e8d4bb0b7 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Sun, 21 Oct 2018 06:28:50 +0000
Subject: [PATCH] remove opendj-bom (#23)
---
pom.xml | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0fe237e..ef473da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,16 +16,15 @@
-->
<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.opendj</groupId>
- <artifactId>opendj-bom</artifactId>
- <version>4.2.5-SNAPSHOT</version>
- <relativePath>opendj-bom/pom.xml</relativePath>
- </parent>
-
+ <parent>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-parent</artifactId>
+ <version>2.0.6</version>
+ <relativePath>forgerock-parent</relativePath>
+ </parent>
+ <groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
-
+ <version>4.2.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Services Project</name>
@@ -50,7 +49,7 @@
<freemarker.version>2.3.28</freemarker.version>
<grizzly-framework.version>2.4.3</grizzly-framework.version>
<metrics-core.version>3.1.2</metrics-core.version>
-
+ <i18n-framework.version>1.4.2</i18n-framework.version>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
<!--
@@ -138,6 +137,53 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>commons-bom</artifactId>
+ <version>21.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-core</artifactId>
+ <version>${i18n-framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-slf4j</artifactId>
+ <version>${i18n-framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0-1</version>
+ </dependency>
+
+ <!-- OpenDJ SDK -->
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-grizzly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-rest2ldap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Dropwizard metrics-core -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -216,8 +262,6 @@
</dependencies>
<modules>
- <module>opendj-bom</module>
-
<module>opendj-core</module>
<module>opendj-doc-maven-plugin</module>
<module>opendj-grizzly</module>
--
Gitblit v1.10.0