From fe4a729c18b46801d1ea3f5644f80de76b88362d Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Tue, 06 Mar 2018 11:01:13 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/OpenIdentityPlatform/OpenDJ
---
opendj-packages/opendj-docker/pom.xml | 2
opendj-rest2ldap-servlet/pom.xml | 2
opendj-legacy/pom.xml | 2
opendj-packages/opendj-msi/opendj-msi-standard/pom.xml | 12 +++---
opendj-doc-generated-ref/pom.xml | 2
opendj-packages/opendj-msi/pom.xml | 8 ++--
opendj-packages/opendj-svr4/pom.xml | 2
opendj-rest2ldap/pom.xml | 2
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 2
pom.xml | 2
opendj-ldap-sdk-examples/pom.xml | 2
opendj-server-legacy/pom.xml | 2
opendj-grizzly/pom.xml | 2
opendj-ldap-toolkit/pom.xml | 2
opendj-maven-plugin/pom.xml | 2
opendj-server-example-plugin/pom.xml | 2
opendj-config/pom.xml | 2
opendj-cli/pom.xml | 2
opendj-packages/pom.xml | 2
opendj-doc-maven-plugin/pom.xml | 2
opendj-openidm-account-change-notification-handler/pom.xml | 2
opendj-server/pom.xml | 2
opendj-dsml-servlet/pom.xml | 2
opendj-bom/pom.xml | 2
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml | 2
opendj-packages/opendj-deb/pom.xml | 2
opendj-embedded-server-examples/pom.xml | 2
opendj-core/pom.xml | 2
opendj-packages/opendj-rpm/pom.xml | 2
29 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/opendj-bom/pom.xml b/opendj-bom/pom.xml
index 450604f..62f39d6 100644
--- a/opendj-bom/pom.xml
+++ b/opendj-bom/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-bom</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml
index ce2658f..88b4d57 100644
--- a/opendj-cli/pom.xml
+++ b/opendj-cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-cli</artifactId>
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 752e3c8..3b0aaec 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-config</artifactId>
<name>OpenDJ Configuration API</name>
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index 41fd5bd..fc3af45 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-core</artifactId>
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 0245201..19ca0fa 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-generated-ref</artifactId>
diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml
index dadd519..ebf4d6a 100644
--- a/opendj-doc-maven-plugin/pom.xml
+++ b/opendj-doc-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-maven-plugin</artifactId>
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 1ec78de..e67e786 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-dsml-servlet</artifactId>
diff --git a/opendj-embedded-server-examples/pom.xml b/opendj-embedded-server-examples/pom.xml
index 0cd06e5..8ce4353 100644
--- a/opendj-embedded-server-examples/pom.xml
+++ b/opendj-embedded-server-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-embedded-server-examples</artifactId>
diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml
index 6fbb6a6..97e2309 100644
--- a/opendj-grizzly/pom.xml
+++ b/opendj-grizzly/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-grizzly</artifactId>
diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml
index 2ce6e3b..12e175b 100644
--- a/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-ldap-sdk-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk-examples</artifactId>
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index 1d1194b..8814df5 100644
--- a/opendj-ldap-toolkit/pom.xml
+++ b/opendj-ldap-toolkit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-toolkit</artifactId>
diff --git a/opendj-legacy/pom.xml b/opendj-legacy/pom.xml
index a8e19df..a8d2f01 100644
--- a/opendj-legacy/pom.xml
+++ b/opendj-legacy/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-legacy</artifactId>
<name>OpenDJ Legacy</name>
diff --git a/opendj-maven-plugin/pom.xml b/opendj-maven-plugin/pom.xml
index 09216f3..9650744 100644
--- a/opendj-maven-plugin/pom.xml
+++ b/opendj-maven-plugin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-maven-plugin</artifactId>
diff --git a/opendj-openidm-account-change-notification-handler/pom.xml b/opendj-openidm-account-change-notification-handler/pom.xml
index c479425..5c60f14 100644
--- a/opendj-openidm-account-change-notification-handler/pom.xml
+++ b/opendj-openidm-account-change-notification-handler/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-openidm-account-change-notification-handler</artifactId>
<name>OpenDJ account change notification handler for OpenIDM</name>
diff --git a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
index afce24f..c6f68ff 100644
--- a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
+++ b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-deb</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-deb-standard</artifactId>
diff --git a/opendj-packages/opendj-deb/pom.xml b/opendj-packages/opendj-deb/pom.xml
index bd9b231..7b100e2 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/opendj-packages/opendj-deb/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-docker/pom.xml b/opendj-packages/opendj-docker/pom.xml
index 2b6ebfe..c3d9853 100644
--- a/opendj-packages/opendj-docker/pom.xml
+++ b/opendj-packages/opendj-docker/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
index 7847a6c..6db4143 100644
--- a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
+++ b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-msi</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi-standard</artifactId>
@@ -170,7 +170,7 @@
</goals>
<configuration>
<target>
- <delete dir="${user.home}/.msi" />
+ <delete dir="${user.home}/.msi" />
<mkdir dir="${user.home}/.msi" />
<copy toDir="${user.home}/.msi">
<fileset dir="${package.dir}">
@@ -198,7 +198,7 @@
</exec>
<echo>WineExitStatusCode=${WineExitStatusCode}</echo>
- <exec executable="sh" resultproperty="WineTricksExitStatusCode" failifexecutionfails="false">
+ <exec executable="sh" resultproperty="WineTricksExitStatusCode" failifexecutionfails="false">
<arg value="${project.build.directory}/winetricks/winetricks-LAST.sh" />
<arg value="--unattended" />
<arg value="dotnet40" />
@@ -227,7 +227,7 @@
<arg value="-v" />
</exec>
<echo>------------------- ${exec.candle} ${param.candle} -------------------</echo>
- <exec executable="${exec.candle}" dir="${project.build.directory}/msi" resultproperty="candleStatusCode" >
+ <exec executable="${exec.candle}" dir="${project.build.directory}/msi" resultproperty="candleStatusCode">
<arg value="${param.candle}" />
<arg value="-nologo" />
<arg value="-out" /> <arg value="build/" />
@@ -240,7 +240,7 @@
<arg value="build/payload.wxs" />
</exec>
<echo>------------------- ${exec.light} ${param.light} -------------------</echo>
- <exec executable="${exec.light}" dir="${project.build.directory}/msi" resultproperty="lightStatusCode" >
+ <exec executable="${exec.light}" dir="${project.build.directory}/msi" resultproperty="lightStatusCode">
<arg value="${param.light}" />
<arg value="-nologo" />
<arg value="-ext" /> <arg value="WixUIExtension" />
@@ -250,7 +250,7 @@
<arg value="build/payload.wixobj" />
</exec>
<echo>lightStatusCode=${lightStatusCode}</echo>
- <delete dir="${user.home}/.msi" />
+ <delete dir="${user.home}/.msi" />
<attachartifact file="${project.build.directory}/${product.name.lowercase}-${project.version}.msi" />
</target>
diff --git a/opendj-packages/opendj-msi/pom.xml b/opendj-packages/opendj-msi/pom.xml
index dd69dcf..9b1f19b 100644
--- a/opendj-packages/opendj-msi/pom.xml
+++ b/opendj-packages/opendj-msi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi</artifactId>
@@ -85,9 +85,9 @@
<module>opendj-msi-standard</module>
</modules>
<properties>
- <exec.heat>${project.build.directory}/wix/heat.exe</exec.heat><param.heat></param.heat>
- <exec.candle>${project.build.directory}/wix/candle.exe</exec.candle><param.candle></param.candle>
- <exec.light>${project.build.directory}/wix/light.exe</exec.light><param.light></param.light>
+ <exec.heat>${project.build.directory}/wix/heat.exe</exec.heat><param.heat />
+ <exec.candle>${project.build.directory}/wix/candle.exe</exec.candle><param.candle />
+ <exec.light>${project.build.directory}/wix/light.exe</exec.light><param.light />
</properties>
</profile>
</profiles>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index f9cbf9e..3a398be 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
+++ b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-rpm</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-rpm-standard</artifactId>
diff --git a/opendj-packages/opendj-rpm/pom.xml b/opendj-packages/opendj-rpm/pom.xml
index 63be743..5b32229 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/opendj-packages/opendj-rpm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/opendj-packages/opendj-svr4/pom.xml b/opendj-packages/opendj-svr4/pom.xml
index 97bde90..53727e8 100644
--- a/opendj-packages/opendj-svr4/pom.xml
+++ b/opendj-packages/opendj-svr4/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-svr4</artifactId>
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 9bef25e..9001621 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-packages</artifactId>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index bb33ff8..e62d3e3 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap-servlet</artifactId>
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index 4c60987..75725dc 100644
--- a/opendj-rest2ldap/pom.xml
+++ b/opendj-rest2ldap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap</artifactId>
diff --git a/opendj-server-example-plugin/pom.xml b/opendj-server-example-plugin/pom.xml
index f5d390a..e613ca1 100644
--- a/opendj-server-example-plugin/pom.xml
+++ b/opendj-server-example-plugin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-example-plugin</artifactId>
<name>OpenDJ Server Example Plugin</name>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 67f7339..69a2c91 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-legacy</artifactId>
<packaging>jar</packaging>
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index b89cc24..5af9652 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
<name>OpenDJ Server NG</name>
diff --git a/pom.xml b/pom.xml
index b5476da..10fe39f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-bom</artifactId>
- <version>4.1.5-SNAPSHOT</version>
+ <version>4.1.6-SNAPSHOT</version>
<relativePath>opendj-bom/pom.xml</relativePath>
</parent>
--
Gitblit v1.10.0