From cb0292990dd462d218271daf83542b7c2f6c0d0f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 16 May 2011 13:40:45 +0000
Subject: [PATCH] Factor out i18n code and use commons i18n framework
---
opendj-sdk/opendj3/pom.xml | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/opendj3/pom.xml
index 646fdd1..36a8739 100644
--- a/opendj-sdk/opendj3/pom.xml
+++ b/opendj-sdk/opendj3/pom.xml
@@ -67,13 +67,14 @@
<tag>HEAD</tag>
</scm>
<modules>
- <module>opendj-testng-support</module>
- <module>opendj-maven-plugin</module>
+ <module>opendj-maven-checkstyle</module>
+ <module>opendj-maven-testng</module>
<module>opendj-sdk</module>
<module>opendj-client-tools</module>
<module>opendj-docs</module>
</modules>
<build>
+ <pluginManagement>
<plugins>
<plugin>
<inherited>true</inherited>
@@ -84,14 +85,6 @@
<target>1.6</target>
</configuration>
</plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.opendj</groupId>
- <artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -103,7 +96,7 @@
</property>
<property>
<name>listener</name>
- <value>org.opendj.buildtools.testng.OpenDJTestListener</value>
+ <value>org.opendj.maven.testng.OpenDJTestListener</value>
</property>
</properties>
</configuration>
@@ -141,7 +134,7 @@
<dependencies>
<dependency>
<groupId>org.opendj</groupId>
- <artifactId>opendj-maven-plugin</artifactId>
+ <artifactId>opendj-maven-checkstyle</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -149,8 +142,8 @@
<execution>
<id>process-classes</id>
<configuration>
- <configLocation>org/opendj/buildtools/maven/check-src.xml</configLocation>
- <headerLocation>org/opendj/buildtools/maven/opendj.sourceheader</headerLocation>
+ <configLocation>org/opendj/maven/checkstyle/check-src.xml</configLocation>
+ <headerLocation>org/opendj/maven/checkstyle/opendj.sourceheader</headerLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
@@ -164,8 +157,8 @@
<id>process-test-classes</id>
<configuration>
<sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
- <configLocation>org/opendj/buildtools/maven/check-unit-tests.xml</configLocation>
- <headerLocation>org/opendj/buildtools/maven/opendj.sourceheader</headerLocation>
+ <configLocation>org/opendj/maven/checkstyle/check-unit-tests.xml</configLocation>
+ <headerLocation>org/opendj/maven/checkstyle/opendj.sourceheader</headerLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
@@ -182,23 +175,27 @@
</build>
<repositories>
<repository>
+ <id>forgerock-staging-repository</id>
+ <name>ForgeRock Release Repository</name>
+ <url>http://maven.forgerock.org/repo/releases</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>forgerock-snapshots-repository</id>
+ <name>ForgeRock Snapshot Repository</name>
+ <url>http://maven.forgerock.org/repo/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>glassfish-maven2-repository.dev.java.net</id>
<name>Java.net Maven 2 Repository for GlassFish</name>
<url>http://download.java.net/maven/glassfish/</url>
</repository>
- <repository>
- <id>ForgeRock</id>
- <name>ForgeRock Repository</name>
- <url>http://repo.forgerock.org</url>
- </repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>ForgeRock-Plugin</id>
- <name>ForgeRock Plugin Repository</name>
- <url>http://repo.forgerock.org</url>
- </pluginRepository>
- </pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
--
Gitblit v1.10.0