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)
---
/dev/null | 113 ----------------------------
pom.xml | 68 ++++++++++++++---
2 files changed, 56 insertions(+), 125 deletions(-)
diff --git a/opendj-bom/pom.xml b/opendj-bom/pom.xml
deleted file mode 100644
index 28ca0ca..0000000
--- a/opendj-bom/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- The contents of this file are subject to the terms of the Common Development and
- Distribution License (the License). You may not use this file except in compliance with the
- License.
-
- You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
- specific language governing permission and limitations under the License.
-
- When distributing Covered Software, include this CDDL Header Notice in each file and include
- the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
- Header, with the fields enclosed by brackets [] replaced by your own identifying
- information: "Portions Copyright [year] [name of copyright owner]".
-
- Copyright 2011-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.6</version>
- <relativePath>../forgerock-parent</relativePath>
- </parent>
-
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-bom</artifactId>
- <version>4.2.5-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <name>OpenDJ BOM</name>
- <description>
- Provides a list of OpenDJ dependencies which are known to be compatible with each other.
- </description>
-
- <properties>
- <i18n-framework.version>1.4.2</i18n-framework.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- ForgeRock BOM -->
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>commons-bom</artifactId>
- <version>21.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <!-- I18N framework -->
- <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>
-
-
- <!-- 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>
-
- <!-- Other -->
- <dependency>
- <groupId>com.github.stephenc.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- <version>1.0-1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <repositories>
- <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>
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