From 36cea8ae49727013e8ef9832db47904e43094f34 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 30 Oct 2015 15:10:56 +0000
Subject: [PATCH] OPENDJ-2402: Decouple SDK versioning from server versioning in pom files
---
opendj-sdk/pom.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/pom.xml b/opendj-sdk/pom.xml
index f506492..8c6612c 100644
--- a/opendj-sdk/pom.xml
+++ b/opendj-sdk/pom.xml
@@ -160,6 +160,18 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-copyright-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-doc-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+
+ <plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -353,6 +365,7 @@
<dependencyManagement>
<dependencies>
+ <!-- Commons -->
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-bom</artifactId>
@@ -360,19 +373,52 @@
<scope>import</scope>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-build-tools</artifactId>
+ <version>${forgerock-build-tools.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- I18N framework -->
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>i18n-core</artifactId>
<version>${i18n-framework.version}</version>
- <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>i18n-slf4j</artifactId>
<version>${i18n-framework.version}</version>
- <scope>compile</scope>
+ </dependency>
+
+ <!-- OpenDJ SDK -->
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </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>
</dependencies>
</dependencyManagement>
@@ -386,6 +432,12 @@
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
@@ -426,7 +478,6 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-copyright-maven-plugin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
<executions>
<execution>
<id>check-copyright</id>
@@ -447,7 +498,6 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-copyright-maven-plugin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
<executions>
<execution>
<id>check-copyright</id>
--
Gitblit v1.10.0