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-rest2ldap-servlet/pom.xml | 5 ++---
opendj-ldap-toolkit/src/main/assembly/descriptor.xml | 11 +++++++++++
opendj-dsml-servlet/pom.xml | 6 +++---
opendj-server-legacy/pom.xml | 3 ---
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml | 3 +++
opendj-bom/pom.xml | 2 +-
pom.xml | 5 +++++
7 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/opendj-bom/pom.xml b/opendj-bom/pom.xml
index be1fe5d..19656dc 100644
--- a/opendj-bom/pom.xml
+++ b/opendj-bom/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock</groupId>
<artifactId>forgerock-parent</artifactId>
- <version>2.0.3</version>
+ <version>2.0.10</version>
<relativePath />
</parent>
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>
diff --git a/opendj-ldap-toolkit/src/main/assembly/descriptor.xml b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml
index ab4fdff..2394d51 100644
--- a/opendj-ldap-toolkit/src/main/assembly/descriptor.xml
+++ b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml
@@ -43,6 +43,17 @@
</includes>
</fileSet>
+ <!-- Get the ForgeRock binary license (if exists) -->
+ <fileSet>
+ <directory>${project.build.directory}/legal-notices</directory>
+ <outputDirectory>legal-notices</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+
<!-- Include CDDLv1_0.txt -->
<fileSet>
<directory>${basedir}/../legal-notices</directory>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index 4d1b239..ab6084f 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -30,9 +30,8 @@
<packaging>war</packaging>
<properties>
- <!-- When released, with the 'binary.license.url' property set,
- this artifact will contain an additional binary license -->
- <include.binary.license>${project.build.directory}/${project.build.finalName}/WEB-INF/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>
</properties>
<dependencies>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 78e6fb0..d8f2043 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -60,9 +60,6 @@
<!-- Other properties -->
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
- <!-- If we release this project, we need to include the Forgerock binary license -->
- <include.binary.license>${project.build.directory}/legal-notices/</include.binary.license>
-
<!-- Additional OSGI import package for this module -->
<opendj.osgi.import.additional>
org.forgerock.opendj.*;provide:=true,
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 3193beb..7e267ab 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -79,6 +79,9 @@
<fileSet>
<directory>${project.build.directory}/legal-notices</directory>
<outputDirectory>legal-notices</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
</fileSet>
<!-- Adds sh in lib/ directory -->
diff --git a/pom.xml b/pom.xml
index 34d0da1..22599fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,11 @@
*
</opendj.osgi.import>
<opendj-copyright-maven-plugin.version>1.0.1</opendj-copyright-maven-plugin.version>
+
+ <!-- ForgeRock build tools and Checkstyle versions (to avoid many checkstyle errors with ForgeRock Parent 2.0.10) -->
+ <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
+ <checkstylePluginVersion>2.9.1</checkstylePluginVersion>
+ <checkstyleVersion>5.5</checkstyleVersion>
</properties>
<inceptionYear>2011</inceptionYear>
--
Gitblit v1.10.0