From 10238e9141bfff609d1576840d95a685ad813c46 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 23 Oct 2015 09:18:18 +0000
Subject: [PATCH] OPENDJ-2089 Adapts pom files
---
opendj-sdk/opendj-rest2ldap/pom.xml | 2
opendj-sdk/opendj-copyright-maven-plugin/pom.xml | 29 +++++++++++++-
opendj-sdk/opendj-doc-maven-plugin/pom.xml | 2
opendj-sdk/opendj-ldap-sdk-examples/pom.xml | 2
opendj-sdk/opendj-ldap-toolkit/pom.xml | 2
opendj-sdk/pom.xml | 50 +++----------------------
opendj-sdk/README | 7 +--
opendj-sdk/opendj-core/pom.xml | 2
opendj-sdk/opendj-grizzly/pom.xml | 2
opendj-sdk/opendj-cli/pom.xml | 2
10 files changed, 43 insertions(+), 57 deletions(-)
diff --git a/opendj-sdk/README b/opendj-sdk/README
index 302248e..0deff65 100644
--- a/opendj-sdk/README
+++ b/opendj-sdk/README
@@ -1,8 +1,7 @@
-OpenDJ
+OpenDJ Ldap SDK
-This Maven project contains the OpenDJ product suite, comprising of an open
-source LDAP Directory Server, client tools, and LDAP SDK. All modules are 100%
-Java based and require Java 7.
+This Maven project contains the OpenDJ Ldap Software Development Kit,
+All modules are 100% Java based and require Java 7.
OpenDJ is a downstream build of the OpenDS project, with a different name
to avoid trademark issues.
diff --git a/opendj-sdk/opendj-cli/pom.xml b/opendj-sdk/opendj-cli/pom.xml
index 3d1c4ea..aea6049 100644
--- a/opendj-sdk/opendj-cli/pom.xml
+++ b/opendj-sdk/opendj-cli/pom.xml
@@ -27,7 +27,7 @@
<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>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/pom.xml b/opendj-sdk/opendj-copyright-maven-plugin/pom.xml
index 399afff..7e0c3a2 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/pom.xml
+++ b/opendj-sdk/opendj-copyright-maven-plugin/pom.xml
@@ -1,8 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! If applicable, add the following below this CDDL HEADER, with the
+ ! fields enclosed by brackets "[]" replaced with your own identifying
+ ! information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 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>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/opendj-core/pom.xml b/opendj-sdk/opendj-core/pom.xml
index bd5aac5..14d7a1b 100644
--- a/opendj-sdk/opendj-core/pom.xml
+++ b/opendj-sdk/opendj-core/pom.xml
@@ -27,7 +27,7 @@
<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>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/opendj-doc-maven-plugin/pom.xml b/opendj-sdk/opendj-doc-maven-plugin/pom.xml
index 5ebc2b9..ef44eb6 100644
--- a/opendj-sdk/opendj-doc-maven-plugin/pom.xml
+++ b/opendj-sdk/opendj-doc-maven-plugin/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/opendj-grizzly/pom.xml b/opendj-sdk/opendj-grizzly/pom.xml
index e4adbe0..ca00e5f 100644
--- a/opendj-sdk/opendj-grizzly/pom.xml
+++ b/opendj-sdk/opendj-grizzly/pom.xml
@@ -27,7 +27,7 @@
<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>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/opendj-ldap-sdk-examples/pom.xml b/opendj-sdk/opendj-ldap-sdk-examples/pom.xml
index 62a470e..1161b30 100644
--- a/opendj-sdk/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-sdk/opendj-ldap-sdk-examples/pom.xml
@@ -27,7 +27,7 @@
<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>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/opendj-ldap-toolkit/pom.xml b/opendj-sdk/opendj-ldap-toolkit/pom.xml
index 171d04b..4cdda92 100644
--- a/opendj-sdk/opendj-ldap-toolkit/pom.xml
+++ b/opendj-sdk/opendj-ldap-toolkit/pom.xml
@@ -27,7 +27,7 @@
<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>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj-rest2ldap/pom.xml
index e4367e1..f364325 100644
--- a/opendj-sdk/opendj-rest2ldap/pom.xml
+++ b/opendj-sdk/opendj-rest2ldap/pom.xml
@@ -18,7 +18,7 @@
<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>
<parent>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/opendj-sdk/pom.xml b/opendj-sdk/pom.xml
index b09f9fe..af99191 100644
--- a/opendj-sdk/pom.xml
+++ b/opendj-sdk/pom.xml
@@ -32,14 +32,12 @@
<version>2.0.3</version>
</parent>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-project</artifactId>
+ <artifactId>opendj-sdk</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>OpenDJ Directory Services Project</name>
+ <name>OpenDJ LDAP SDK</name>
<description>
- OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
- platform, providing a high performance, highly available and secure store
- for the identities managed by enterprises.
+ This group module provides a complete LDAP SDK for developing LDAP Directory client and server applications.
</description>
<inceptionYear>2011</inceptionYear>
<url>http://opendj.forgerock.org</url>
@@ -64,9 +62,9 @@
</mailingList>
</mailingLists>
<scm>
- <url>https://stash.forgerock.org/projects/OPENDJ/repos/opendj/browse</url>
- <connection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj.git</connection>
- <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj.git</developerConnection>
+ <url>https://stash.forgerock.org/projects/OPENDJ/repos/opendj-sdk/browse</url>
+ <connection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git</connection>
+ <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git</developerConnection>
</scm>
<ciManagement>
<system>jenkins</system>
@@ -90,21 +88,14 @@
</site>
</distributionManagement>
<modules>
- <module>opendj-maven-plugin</module>
<module>opendj-copyright-maven-plugin</module>
<module>opendj-doc-maven-plugin</module>
<module>opendj-core</module>
<module>opendj-grizzly</module>
- <module>opendj-config</module>
<module>opendj-cli</module>
<module>opendj-ldap-toolkit</module>
<module>opendj-ldap-sdk-examples</module>
<module>opendj-rest2ldap</module>
- <module>opendj-rest2ldap-servlet</module>
- <module>opendj-server</module>
- <module>opendj-server-example-plugin</module>
- <module>opendj-legacy</module>
- <module>opendj-server-legacy</module>
</modules>
<properties>
<mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>
@@ -247,35 +238,6 @@
</instrumentation>
</configuration>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only.
- It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-maven-plugin</artifactId>
- <versionRange>[1.0.0-SNAPSHOT,)</versionRange>
- <goals>
- <goal>generate-config</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <!-- <runOnIncremental>true</runOnIncremental> -->
- <runOnConfiguration>true</runOnConfiguration>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
<!-- This is needed to use annotations in maven plugins with maven 3.0.x -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
Gitblit v1.10.0