From 970471798de38fe16227d0aaf1a72d48928ee550 Mon Sep 17 00:00:00 2001
From: Erick Gonzalez <erick.gonzalez@dotcms.com>
Date: Wed, 7 Feb 2018 11:52:25 -0600
Subject: [PATCH 1/2] update ReleaseVersion

---
 dotCMS/dependencies.gradle | 2 +-
 dotCMS/gradle.properties   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotCMS/dependencies.gradle b/dotCMS/dependencies.gradle
index 569a4b6a84e8..c19a2d37f82e 100644
--- a/dotCMS/dependencies.gradle
+++ b/dotCMS/dependencies.gradle
@@ -1,7 +1,7 @@
 //noinspection GroovyAssignabilityCheck
 dependencies {
 
-    compile group: 'com.dotcms.enterprise', name: 'ee', version: '4.3.0-SNAPSHOT', changing: true
+    compile group: 'com.dotcms.enterprise', name: 'ee', version: '5.0.0-SNAPSHOT', changing: true
 
     compile group: 'com.dotcms', name: 'ant-tooling', version: '1.3'
     compile 'io.jsonwebtoken:jjwt:0.6.0'
diff --git a/dotCMS/gradle.properties b/dotCMS/gradle.properties
index 147cde14cdff..5be039ae3148 100644
--- a/dotCMS/gradle.properties
+++ b/dotCMS/gradle.properties
@@ -1,4 +1,4 @@
-dotcmsReleaseVersion=4.3.0
+dotcmsReleaseVersion=5.0.0
 coreWebReleaseVersion=latest
 
 tomcatInstallRepo=https://github.com/dotCMS/tomcat.git

From 8f39379d6e636d94563120053838cf126ba5b273 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.sanchez@dotcms.com>
Date: Wed, 7 Feb 2018 11:53:04 -0600
Subject: [PATCH 2/2] #13395 now when copy the unique fields the unique values
 are real unique (#13585)

---
 .../content/elasticsearch/business/ESContentletAPIImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java
index b2749ce9efd4..3dcaf61a8a2e 100644
--- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java
+++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java
@@ -3872,8 +3872,9 @@ public void copyProperties(Contentlet contentlet,Map<String, Object> properties,
                     {
                         if(checkIsUnique && field.isUnique())
                         {
-                            String dataType = (field.getFieldContentlet() != null) ? field.getFieldContentlet().replaceAll("[0-9]*", "") : "";
-                            value = value + " (COPY)";
+                            value = value +
+                                new StringBuilder(" (COPY_")
+                                        .append(System.currentTimeMillis()).append(')').toString();
                         }
                         contentlet.setStringProperty(conVariable, value != null ? (String)value : null);
                     }else if(isFieldTypeBoolean(field)){