From 4e7cdf4d9033cc5e967b427a76000453d7f15180 Mon Sep 17 00:00:00 2001
From: Bruno Lavit <bruno.lavit@forgerock.com>
Date: Thu, 20 Oct 2016 07:25:57 +0000
Subject: [PATCH] RELENG-70 - New mechanism to get the ForgeRock binary license using ForgeRock parent 2.0.10
---
opendj-dsml-servlet/pom.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 81dc607..ad8286e 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -29,8 +29,8 @@
<packaging>war</packaging>
<properties>
- <!-- Folder to store the ForgeRock binary license. The license url could be specified with the option -Dbinary.license.url on the maven command line -->
- <include.binary.license>${project.basedir}/legal-notices/</include.binary.license>
+ <!-- If the binary-licensing profile is activated, we need the ForgeRock license there -->
+ <forgerock.license.output.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/legal-notices</forgerock.license.output.dir>
<opendj.server.module.name>opendj-server-legacy</opendj.server.module.name>
<opendj.jars.folder>opendj-jars</opendj.jars.folder>
</properties>
@@ -263,7 +263,7 @@
</excludes>
</resource>
- <!-- Include THIRDPARTYREADME.txt and the FR binary license (if exists) -->
+ <!-- Include THIRDPARTYREADME.txt -->
<resource>
<targetPath>WEB-INF/legal-notices</targetPath>
<directory>legal-notices</directory>
--
Gitblit v1.10.0