From db7299c7c2f1b6324012a6ae39ee2da0e33f13bf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 14 Oct 2013 08:36:55 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-175: Decouple OpenDJ LDAP SDK from Grizzly
---
opendj3/opendj-rest2ldap-servlet/pom.xml | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/opendj3/opendj-rest2ldap-servlet/pom.xml b/opendj3/opendj-rest2ldap-servlet/pom.xml
index 4792587..31ca702 100644
--- a/opendj3/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj3/opendj-rest2ldap-servlet/pom.xml
@@ -38,6 +38,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-grizzly</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<!-- Required for compilation -->
<groupId>org.forgerock.commons</groupId>
<artifactId>json-resource-servlet</artifactId>
@@ -90,28 +96,23 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
+ <!-- include opendj-grizzly and its dependencies in war -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
<executions>
<execution>
- <id>copy</id>
+ <id>copy-grizzly</id>
<phase>package</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-grizzly</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeArtifactIds>opendj-grizzly</includeArtifactIds>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
@@ -148,5 +149,34 @@
<version>9.0.4.v20130625</version>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.6,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
--
Gitblit v1.10.0