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
---
opendj-rest2ldap-servlet/pom.xml | 3 -
opendj-server/pom.xml | 13 +---
opendj-server-legacy/pom.xml | 38 ++----------
opendj-server-example-plugin/pom.xml | 7 -
opendj-config/pom.xml | 18 ++----
pom.xml | 92 +++++++++++++++++++++++++++---
6 files changed, 100 insertions(+), 71 deletions(-)
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 6c35166..87fd2e6 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -44,13 +44,6 @@
<artifactId>i18n-core</artifactId>
</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.commons</groupId>
<artifactId>i18n-slf4j</artifactId>
</dependency>
@@ -61,18 +54,20 @@
<dependency>
<groupId>org.forgerock</groupId>
<artifactId>forgerock-build-tools</artifactId>
- <version>${forgerock-build-tools.version}</version>
- <scope>test</scope>
</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>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-cli</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- We need to override testNG version to make test works (see OPENDJ-2389) -->
@@ -153,7 +148,6 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
<executions>
<execution>
<id>generate-config</id>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index 10ab484..2f033c2 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -48,17 +48,14 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-rest2ldap</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-grizzly</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/opendj-server-example-plugin/pom.xml b/opendj-server-example-plugin/pom.xml
index 216f4a4..13ab240 100644
--- a/opendj-server-example-plugin/pom.xml
+++ b/opendj-server-example-plugin/pom.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
! Copyright 2014-2015 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>
@@ -33,7 +33,7 @@
</parent>
<artifactId>opendj-server-example-plugin</artifactId>
<name>OpenDJ Server Example Plugin</name>
- <description>
+ <description>
An example OpenDJ Server plugin illustrating how custom components may be developed for OpenDJ.
</description>
<packaging>jar</packaging>
@@ -41,12 +41,10 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-config</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.commons</groupId>
@@ -80,7 +78,6 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
<executions>
<execution>
<id>generate-config</id>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index d4d13e4..836c22f 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -70,10 +70,6 @@
<docGuideAdminUrl>http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/</docGuideAdminUrl>
<locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</locales>
- <!-- Dependencies version properties -->
- <project.version>3.0.0-SNAPSHOT</project.version>
- <i18n.version>1.4.2-SNAPSHOT</i18n.version>
-
<!-- Other properties -->
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
@@ -95,8 +91,12 @@
<!-- ForgeRock libraries -->
<dependency>
<groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-cli</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-rest2ldap</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -107,26 +107,16 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-config</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-server</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</groupId>
<artifactId>forgerock-build-tools</artifactId>
- <version>${forgerock-build-tools.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -188,22 +178,9 @@
</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>
- </dependency>
-
- <dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-core</artifactId>
<type>test-jar</type>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -224,7 +201,7 @@
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-persistit-core</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
@@ -525,7 +502,6 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
<executions>
<execution>
<id>generate-bootstrap-manifest</id>
@@ -1631,7 +1607,6 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-doc-maven-plugin</artifactId>
- <version>${project.version}</version>
<executions>
<execution>
<id>generate-man-pages</id>
@@ -2045,7 +2020,6 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-doc-maven-plugin</artifactId>
- <version>${project.version}</version>
<!--
Configuration reference generation requires
that opendj-config be on the runtime classpath for the plugin.
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index e5bcfaf..25f0625 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
! Copyright 2013-2015 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>
@@ -33,7 +33,7 @@
</parent>
<artifactId>opendj-server</artifactId>
<name>OpenDJ Server</name>
- <description>
+ <description>
OpenDJ LDAP embedded directory server.
</description>
<packaging>jar</packaging>
@@ -51,17 +51,14 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-core</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-config</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.commons</groupId>
@@ -79,19 +76,15 @@
<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</groupId>
<artifactId>forgerock-build-tools</artifactId>
- <version>${forgerock-build-tools.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-cli</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -195,7 +188,7 @@
<link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
</links>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</reporting>
</project>
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