From c337e6ca30bfc9c71326aba41cca00230214fb6a Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 30 Oct 2015 18:03:21 +0000
Subject: [PATCH] OPENDJ-2402: Decouple SDK versioning from server versioning in pom files
---
pom.xml | 92 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index c956fe8..cce21fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,9 +102,14 @@
<mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>
<mavenRepoReleases>http://maven.forgerock.org/repo/releases</mavenRepoReleases>
+ <!--
+ | Until final release the SDK and server share the same version. Re-using the
+ | project.version here avoids the need to update it before releasing milestones.
+ -->
+ <opendj-sdk.version>${project.version}</opendj-sdk.version>
<forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
- <i18n-framework.version>1.4.2-SNAPSHOT</i18n-framework.version>
- <forgerock-doc-plugin.version>3.1.0-SNAPSHOT</forgerock-doc-plugin.version>
+ <i18n-framework.version>1.4.2</i18n-framework.version>
+ <forgerock-doc-plugin.version>3.1.0</forgerock-doc-plugin.version>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
@@ -144,6 +149,21 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-copyright-maven-plugin</artifactId>
+ <version>${opendj-sdk.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-doc-maven-plugin</artifactId>
+ <version>${opendj-sdk.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ <plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -248,7 +268,7 @@
<pluginExecutionFilter>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
- <versionRange>[1.0.0-SNAPSHOT,)</versionRange>
+ <versionRange>[1.0.0,)</versionRange>
<goals>
<goal>generate-config</goal>
</goals>
@@ -351,6 +371,7 @@
<dependencyManagement>
<dependencies>
+ <!-- Commons -->
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-bom</artifactId>
@@ -358,24 +379,73 @@
<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>${opendj-sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <version>${opendj-sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <type>test-jar</type>
+ <version>${opendj-sdk.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-grizzly</artifactId>
+ <version>${opendj-sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-rest2ldap</artifactId>
+ <version>${opendj-sdk.version}</version>
+ </dependency>
+
+ <!-- OpenDJ Server -->
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-legacy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-server</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.easytesting</groupId>
@@ -384,6 +454,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>
@@ -421,7 +497,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>
@@ -442,7 +517,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