From 93096165396aead9474544c10e0264bdd41d717f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Dec 2013 08:59:46 +0000
Subject: [PATCH] Added "prepare-release" build target, made b2.6 depend on the latest from b2.6-sdk
---
opendj-sdk/opends/build.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
opendj-sdk/opends/ivy.xml | 8 +++++++-
2 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index a76587b..7a706fd 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -270,6 +270,18 @@
description="Perform all processing needed for weekly builds.">
</target>
+ <target name="prepare-release" depends="check-no-snapshot-dependencies"
+ description="Performs all the checks to prepare a release.">
+ <echo>
+Previous checks succeeded.
+
+Please:
+1- Check the archive has no build number
+2- Check the archive contains the license
+3- Run the tests
+4- Check that documentation refers to forgerock.com instead of forgerock.org
+ </echo>
+ </target>
@@ -2830,10 +2842,36 @@
<ivy:retrieve pattern="${lib.dir}/[type]/[artifact].[ext]"/>
</target>
+ <property name="snapshots.dir" value="${lib.dir}/snapshots" />
+ <target name="resolve-snapshots-separately" depends="install-ivy">
+ <ivy:retrieve type="jar,bundle" pattern="${lib.dir}/[artifact]-[revision].[ext]">
+ <firstmatchmapper>
+ <globmapper from="${lib.dir}/*-SNAPSHOT.jar" to="${snapshots.dir}/*-SNAPSHOT.jar" />
+ <globmapper from="${lib.dir}/*" to="${lib.dir}/releases/*" />
+ </firstmatchmapper>
+ </ivy:retrieve>
+ </target>
+
+ <fileset dir="${snapshots.dir}" id="snapshots.dir.ref" erroronmissingdir="false">
+ <include name="**"/>
+ </fileset>
+ <target name="check-no-snapshot-dependencies" depends="cleanlib,resolve-snapshots-separately">
+ <fail message="The project must not depend on snapshot dependencies. Found: ${toString:snapshots.dir.ref}">
+ <condition>
+ <resourcecount refid="snapshots.dir.ref" when="greater" count="0" />
+ </condition>
+ </fail>
+ <antcall target="cleanlib" />
+ <echo message="OK." />
+ </target>
+
<target name="cleanlib" description="--> clean the lib directory">
- <delete>
+ <delete includeemptydirs="true">
<fileset dir="${lib.dir}">
- <include name="**/*.jar" />
+ <include name="**" />
+ <exclude name="opendj_service.exe" />
+ <exclude name="winlauncher.exe" />
+ <exclude name="launcher_administrator.exe" />
</fileset>
</delete>
</target>
diff --git a/opendj-sdk/opends/ivy.xml b/opendj-sdk/opends/ivy.xml
index 4c829fa..2238626 100644
--- a/opendj-sdk/opends/ivy.xml
+++ b/opendj-sdk/opends/ivy.xml
@@ -36,7 +36,13 @@
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
- <info organisation="org.forgerock" module="opendj"/>
+
+ <info organisation="org.forgerock" module="opendj" branch="b2.6">
+ <license name="CDDL v1.0" url="http://forgerock.org/license/CDDLv1.0.html" />
+ <ivyauthor name="ForgeRock AS" url="http://forgerock.com" />
+ <description homepage="http://opendj.forgerock.org/" />
+ </info>
+
<dependencies>
<!-- compile + runtime libs -->
--
Gitblit v1.10.0