From 84d90a5d1ca31aee94bb50987be885a3def010c6 Mon Sep 17 00:00:00 2001
From: Bruno Lavit <bruno.lavit@forgerock.com>
Date: Mon, 30 Nov 2015 08:46:14 +0000
Subject: [PATCH] OPENDJ-2481 - Release engineering: add a property to include the FR binary license when we have to release the servlet + update the ressources to build the War file
---
opendj-dsml-servlet/pom.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index f184aee..57cf9e4 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -39,6 +39,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>
</properties>
<dependencies>
@@ -224,7 +226,7 @@
<configuration>
<warName>${product.name}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-DSML</warName>
<webResources>
- <!-- Include CDDLv1_0.txt and binary license file (if exists) -->
+ <!-- Include CDDLv1_0.txt -->
<resource>
<targetPath>WEB-INF/legal-notices</targetPath>
<directory>${basedir}/../legal-notices</directory>
@@ -233,13 +235,10 @@
</excludes>
</resource>
- <!-- Include THIRDPARTYREADME.txt -->
+ <!-- Include THIRDPARTYREADME.txt and the FR binary license (if exists) -->
<resource>
<targetPath>WEB-INF/legal-notices</targetPath>
<directory>legal-notices</directory>
- <includes>
- <include>THIRDPARTYREADME.txt</include>
- </includes>
</resource>
<!-- Add web and sun-web.xml -->
--
Gitblit v1.10.0