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
---
pom.xml | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
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