From 33ebabfeaf6ac35ccfa1cf3106872f93cb7985a8 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Fri, 19 Oct 2018 16:21:42 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into vharseko-master
---
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 | 2
opendj-doc-generated-ref/pom.xml | 2
opendj-packages/opendj-msi/pom.xml | 2
opendj-packages/opendj-svr4/pom.xml | 2
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfiguratorTest.java | 7 +++
opendj-rest2ldap/pom.xml | 2
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 2
pom.xml | 8 ---
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
README.md | 1
opendj-openidm-account-change-notification-handler/pom.xml | 2
opendj-server/pom.xml | 2
opendj-dsml-servlet/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
30 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/README.md b/README.md
index d679a69..e6618da 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,7 @@
```
## Support and Mailing List Information
+* OpenDJ Community Wiki: https://github.com/OpenIdentityPlatform/OpenDJ/wiki
* OpenDJ Community Mailing List: open-identity-platform-opendj@googlegroups.com
* OpenDJ Community Archive: https://groups.google.com/d/forum/open-identity-platform-opendj
* OpenDJ Community on Gitter: https://gitter.im/OpenIdentityPlatform/OpenDJ
diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml
index 0afb31d..cdd924b 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-cli</artifactId>
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index b54110e..ec62b17 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 8921523..0d0a4aa 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-core</artifactId>
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 2d3af62..fa7af1d 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 0e9bb01..1c48fc7 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-maven-plugin</artifactId>
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 649f7d5..e97893b 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 424e3b2..bd37f74 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-embedded-server-examples</artifactId>
diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml
index e2530b6..d4a85b4 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-grizzly</artifactId>
diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml
index 57770ca..d10af94 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk-examples</artifactId>
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index 2406464..af57a48 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-toolkit</artifactId>
diff --git a/opendj-legacy/pom.xml b/opendj-legacy/pom.xml
index cd40b17..74f2ae5 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 4eb36e7..4aec15d 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 1aa6faa..a4bce2f 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 07f647d..27e6602 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 6d62398..8e60392 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-docker/pom.xml b/opendj-packages/opendj-docker/pom.xml
index f94d176..b6bfe86 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 0ebdcbb..8fe86b2 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi-standard</artifactId>
diff --git a/opendj-packages/opendj-msi/pom.xml b/opendj-packages/opendj-msi/pom.xml
index 03fe4a6..b304578 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi</artifactId>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index 66f125d..c6142de 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 1d4f895..f3275e3 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/opendj-packages/opendj-svr4/pom.xml b/opendj-packages/opendj-svr4/pom.xml
index dd5b626..6a2c2d0 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-svr4</artifactId>
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 37888b5..2a12239 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-packages</artifactId>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index e38bb1a..e3f044e 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap-servlet</artifactId>
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index 7d04dec..5c2b24b 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap</artifactId>
diff --git a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfiguratorTest.java b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfiguratorTest.java
index f948f30..08539cb 100644
--- a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfiguratorTest.java
+++ b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfiguratorTest.java
@@ -26,6 +26,7 @@
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
+import java.net.URISyntaxException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
@@ -471,7 +472,11 @@
}
private static Path getPathToClass(Class<?> clazz) {
- return Paths.get(clazz.getProtectionDomain().getCodeSource().getLocation().getPath());
+ try {
+ return Paths.get(clazz.getProtectionDomain().getCodeSource().getLocation().toURI());
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
}
private static Path getPathToMavenModule(String moduleName) {
diff --git a/opendj-server-example-plugin/pom.xml b/opendj-server-example-plugin/pom.xml
index 101bcc7..7a2297d 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-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 37b331b..5241e77 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-legacy</artifactId>
<packaging>jar</packaging>
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index 3c2e54f..51de14b 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.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
<name>OpenDJ Server NG</name>
diff --git a/pom.xml b/pom.xml
index 0ec562a..8fccd6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,15 +17,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.forgerock</groupId>
- <artifactId>forgerock-parent</artifactId>
- <version>2.0.6</version>
- <relativePath>../forgerock-parent</relativePath>
- </parent>
<groupId>org.forgerock</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.2.4-SNAPSHOT</version>
+ <version>4.2.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Services Project</name>
--
Gitblit v1.10.0