Skip to content

Commit 06a46cf

Browse files
authored
remove opendj-bom (#23)
* remove opendj-bom * <relativePath>forgerock-parent</relativePath> * fix ${i18n-framework.version}
1 parent 2c2b735 commit 06a46cf

File tree

2 files changed

+56
-125
lines changed

2 files changed

+56
-125
lines changed

opendj-bom/pom.xml

Lines changed: 0 additions & 113 deletions
This file was deleted.

pom.xml

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616
-->
1717
<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">
1818
<modelVersion>4.0.0</modelVersion>
19-
20-
<parent>
21-
<groupId>org.forgerock.opendj</groupId>
22-
<artifactId>opendj-bom</artifactId>
23-
<version>4.2.5-SNAPSHOT</version>
24-
<relativePath>opendj-bom/pom.xml</relativePath>
25-
</parent>
26-
19+
<parent>
20+
<groupId>org.forgerock</groupId>
21+
<artifactId>forgerock-parent</artifactId>
22+
<version>2.0.6</version>
23+
<relativePath>forgerock-parent</relativePath>
24+
</parent>
25+
<groupId>org.forgerock.opendj</groupId>
2726
<artifactId>opendj-parent</artifactId>
28-
27+
<version>4.2.5-SNAPSHOT</version>
2928
<packaging>pom</packaging>
3029

3130
<name>OpenDJ Directory Services Project</name>
@@ -50,7 +49,7 @@
5049
<freemarker.version>2.3.28</freemarker.version>
5150
<grizzly-framework.version>2.4.3</grizzly-framework.version>
5251
<metrics-core.version>3.1.2</metrics-core.version>
53-
52+
<i18n-framework.version>1.4.2</i18n-framework.version>
5453
<!-- OSGi bundles properties -->
5554
<opendj.osgi.import.additional />
5655
<!--
@@ -138,6 +137,53 @@
138137

139138
<dependencyManagement>
140139
<dependencies>
140+
<dependency>
141+
<groupId>org.forgerock.commons</groupId>
142+
<artifactId>commons-bom</artifactId>
143+
<version>21.0.0-SNAPSHOT</version>
144+
<scope>import</scope>
145+
<type>pom</type>
146+
</dependency>
147+
<dependency>
148+
<groupId>org.forgerock.commons</groupId>
149+
<artifactId>i18n-core</artifactId>
150+
<version>${i18n-framework.version}</version>
151+
</dependency>
152+
<dependency>
153+
<groupId>org.forgerock.commons</groupId>
154+
<artifactId>i18n-slf4j</artifactId>
155+
<version>${i18n-framework.version}</version>
156+
</dependency>
157+
<dependency>
158+
<groupId>com.github.stephenc.jcip</groupId>
159+
<artifactId>jcip-annotations</artifactId>
160+
<version>1.0-1</version>
161+
</dependency>
162+
163+
<!-- OpenDJ SDK -->
164+
<dependency>
165+
<groupId>org.forgerock.opendj</groupId>
166+
<artifactId>opendj-core</artifactId>
167+
<version>${project.version}</version>
168+
</dependency>
169+
170+
<dependency>
171+
<groupId>org.forgerock.opendj</groupId>
172+
<artifactId>opendj-cli</artifactId>
173+
<version>${project.version}</version>
174+
</dependency>
175+
176+
<dependency>
177+
<groupId>org.forgerock.opendj</groupId>
178+
<artifactId>opendj-grizzly</artifactId>
179+
<version>${project.version}</version>
180+
</dependency>
181+
182+
<dependency>
183+
<groupId>org.forgerock.opendj</groupId>
184+
<artifactId>opendj-rest2ldap</artifactId>
185+
<version>${project.version}</version>
186+
</dependency>
141187
<!-- Dropwizard metrics-core -->
142188
<dependency>
143189
<groupId>io.dropwizard.metrics</groupId>
@@ -216,8 +262,6 @@
216262
</dependencies>
217263

218264
<modules>
219-
<module>opendj-bom</module>
220-
221265
<module>opendj-core</module>
222266
<module>opendj-doc-maven-plugin</module>
223267
<module>opendj-grizzly</module>

0 commit comments

Comments
 (0)