From 1e62bcce71e1b04ac12ec4ba67a2fa1ec84cf67e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 23 Oct 2015 13:33:14 +0000
Subject: [PATCH] OPENDJ-2089 Fix licenses

---
 opendj-rest2ldap-servlet/pom.xml |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index 7d745cf..63526ca 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -78,15 +78,25 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-          <webResources> 
+          <webResources>
+            <!-- Include CDDLv1_0.txt -->
             <resource>
               <targetPath>WEB-INF/legal-notices</targetPath>
               <directory>../legal-notices</directory>
-              <excludes>
-                <!-- The web-app does not include the documentation -->
-                <exclude>CC-BY-NC-ND.txt</exclude>
-              </excludes>
+              <includes>
+                <include>CDDLv1_0.txt</include>
+              </includes>
             </resource>
+
+            <!-- Include THIRDPARTYREADME.txt -->
+            <resource>
+              <targetPath>WEB-INF/legal-notices</targetPath>
+              <directory>legal-notices</directory>
+              <includes>
+                <include>THIRDPARTYREADME.txt</include>
+              </includes>
+            </resource>
+
             <resource>
               <targetPath>/</targetPath>
               <directory>src/main/webapp/</directory>

--
Gitblit v1.10.0