From e228540f39b2b7b44202428bc72d486903bbddaf Mon Sep 17 00:00:00 2001
From: Bruno Lavit <bruno.lavit@forgerock.com>
Date: Mon, 15 Jun 2015 09:38:33 +0000
Subject: [PATCH] OPENDJ-2098: add the Forgerock binary license in the OpenDJ installers
---
opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml | 6 ++++++
opendj-server-legacy/pom.xml | 3 +++
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml | 6 ++++++
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index e088ef3..92de605 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -80,6 +80,9 @@
<!-- Could be removed once migration to new config framework will be done-->
<old.config.files.path>${project.build.directory}/config/admin/defn/org/opends/server/admin/std</old.config.files.path>
+ <!-- If we release this project, we need to include the Forgerock binary license -->
+ <include.binary.license>${project.build.directory}/legal-notices/</include.binary.license>
+
</properties>
<dependencies>
diff --git a/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml b/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml
index 98af248..5e3faea 100644
--- a/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml
+++ b/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml
@@ -48,6 +48,12 @@
</dependencySets>
<fileSets>
+ <!-- Include the Forgerock binary license file if exists -->
+ <fileSet>
+ <directory>${project.build.directory}/legal-notices</directory>
+ <outputDirectory>legal-notices</outputDirectory>
+ </fileSet>
+
<fileSet>
<directory>${jars.dir}/</directory>
<outputDirectory>WEB-INF/lib</outputDirectory>
diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
index 7ea9a15..7e5925c 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -74,6 +74,12 @@
<outputDirectory>legal-notices</outputDirectory>
</fileSet>
+ <!-- Include the Forgerock binary license file if exists -->
+ <fileSet>
+ <directory>${project.build.directory}/legal-notices</directory>
+ <outputDirectory>legal-notices</outputDirectory>
+ </fileSet>
+
<!-- Adds sh in lib/ directory -->
<fileSet>
<directory>${basedir}/resource/bin</directory>
--
Gitblit v1.10.0