RELENG-70 - New mechanism to get the ForgeRock binary license using ForgeRo...

Bruno Lavit

19.25.2016 4e7cdf4d9033cc5e967b427a76000453d7f15180

RELENG-70 - New mechanism to get the ForgeRock binary license using ForgeRock parent 2.0.10

 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>


 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>

 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>

 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>

 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,

 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 -->

 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>