From 6e8ba83a8a6ee41092c7a5a8d7b2d0117f150e49 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 08 Jan 2014 10:54:31 +0000
Subject: [PATCH] Change version to 3.0.0 to avoid conflict with 2.x version
---
opendj3-server-dev/PRODUCT | 4 ++--
opendj3-server-dev/pom-maven.xml | 4 ++--
opendj3-server-dev/pom.xml | 7 ++++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/PRODUCT b/opendj3-server-dev/PRODUCT
index a34bf1a..7dafa5f 100644
--- a/opendj3-server-dev/PRODUCT
+++ b/opendj3-server-dev/PRODUCT
@@ -8,10 +8,10 @@
PKG_NAME=opendj
# The major version number for the Directory Server. It must be an integer.
-MAJOR_VERSION=2
+MAJOR_VERSION=3
# The minor version number for the Directory Server. It must be an integer.
-MINOR_VERSION=7
+MINOR_VERSION=0
# The point version number for the Directory Server. It must be an integer.
POINT_VERSION=0
diff --git a/opendj3-server-dev/pom-maven.xml b/opendj3-server-dev/pom-maven.xml
index 5f9d4fc..c3d5a3d 100644
--- a/opendj3-server-dev/pom-maven.xml
+++ b/opendj3-server-dev/pom-maven.xml
@@ -23,7 +23,7 @@
! CDDL HEADER END
!
! Copyright 2013 ForgeRock AS
- !
+ !
-->
<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">
@@ -35,7 +35,7 @@
<version>2.7.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>OpenDJ Directory Server</name>
<description>
OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
diff --git a/opendj3-server-dev/pom.xml b/opendj3-server-dev/pom.xml
index a3d5895..52f2535 100644
--- a/opendj3-server-dev/pom.xml
+++ b/opendj3-server-dev/pom.xml
@@ -23,11 +23,11 @@
! CDDL HEADER END
!
! Copyright 2011-2013 ForgeRock AS
- !
+ !
-->
<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">
-
+
<!-- This is Maven build file is just a hack in order to leverage
Maven's site generation capabilities. It duplicates version information,
and the Ant build is not split into phases: we just do it in one single
@@ -40,6 +40,7 @@
<version>2.7.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Server</name>
<description>
@@ -68,7 +69,7 @@
</notifier>
</notifiers>
</ciManagement>
-
+
<repositories>
<repository>
<id>forgerock-staging-repository</id>
--
Gitblit v1.10.0