From 42934fa3c06b68b009d6113e6ce17b88354fd336 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 27 Oct 2015 12:20:21 +0000
Subject: [PATCH] OPENDJ-2275 Code cleanup
---
opendj-server/pom.xml | 2 +-
opendj-server-legacy/pom.xml | 2 +-
opendj-config/pom.xml | 2 +-
pom.xml | 16 +++++++---------
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 8b2e7c4..6fd803f 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.forgerock</groupId>
<artifactId>forgerock-build-tools</artifactId>
- <version>${forgerockBuildToolsVersion}</version>
+ <version>${forgerock-build-tools.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 4f50918..f6bb8a3 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.forgerock</groupId>
<artifactId>forgerock-build-tools</artifactId>
- <version>${forgerockBuildToolsVersion}</version>
+ <version>${forgerock-build-tools.version}</version>
<scope>test</scope>
</dependency>
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index f1164b0..e5bcfaf 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.forgerock</groupId>
<artifactId>forgerock-build-tools</artifactId>
- <version>${forgerockBuildToolsVersion}</version>
+ <version>${forgerock-build-tools.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4634788..09f85e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,13 +102,12 @@
<mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>
<mavenRepoReleases>http://maven.forgerock.org/repo/releases</mavenRepoReleases>
- <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
- <i18nFrameworkVersion>1.4.2-SNAPSHOT</i18nFrameworkVersion>
- <grizzlyFrameworkVersion>2.3.14</grizzlyFrameworkVersion>
+ <forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
+ <i18n-framework.version>1.4.2-SNAPSHOT</i18n-framework.version>
<slf4jVersion>1.7.5</slf4jVersion>
<forgerockRestVersion>3.0.0-SNAPSHOT</forgerockRestVersion>
<forgerockHttpVersion>0.0.1-SNAPSHOT</forgerockHttpVersion>
- <frDocPluginVersion>3.1.0-SNAPSHOT</frDocPluginVersion>
+ <forgerock-doc-plugin.version>3.1.0-SNAPSHOT</forgerock-doc-plugin.version>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
@@ -226,7 +225,7 @@
<plugin>
<groupId>org.forgerock.commons</groupId>
<artifactId>i18n-maven-plugin</artifactId>
- <version>${i18nFrameworkVersion}</version>
+ <version>${i18n-framework.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -291,7 +290,7 @@
<plugin>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-doc-maven-plugin</artifactId>
- <version>${frDocPluginVersion}</version>
+ <version>${forgerock-doc-plugin.version}</version>
<configuration>
<projectName>OpenDJ</projectName>
<projectVersion>${project.version}</projectVersion>
@@ -357,13 +356,13 @@
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>i18n-core</artifactId>
- <version>${i18nFrameworkVersion}</version>
+ <version>${i18n-framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>i18n-slf4j</artifactId>
- <version>${i18nFrameworkVersion}</version>
+ <version>${i18n-framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -463,7 +462,6 @@
</goals>
<configuration>
<!-- We need to accept the second part of the following regular expression for submodules:
- ! * opendj-rest2ldap
! * opendj-rest2ldap-servlet
! * opendj-legacy
!
--
Gitblit v1.10.0