Merge feature/generic-user-popup into master : Revert pom's version

Author: rtouzi

calendar-common/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-common</artifactId>
   <packaging>jar</packaging>

calendar-component-create/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-component-create</artifactId>
   <packaging>jar</packaging>

calendar-extension/calendar-extension-config/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar-extension</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-extension-config</artifactId>
   <packaging>jar</packaging>

calendar-extension/calendar-extension-webapp/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar-extension</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-extension-webapp</artifactId>
   <packaging>war</packaging>

calendar-extension/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-extension</artifactId>
   <packaging>pom</packaging>

calendar-injector/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-injector</artifactId>
   <name>eXo Calendar Data Injector</name>

calendar-resources/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-resources</artifactId>
   <packaging>war</packaging>

calendar-service/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-service</artifactId>
   <packaging>jar</packaging>

calendar-statistics/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-statistics</artifactId>
   <name>eXo Calendar Common Statistics</name>

calendar-webapp/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-webapp</artifactId>
   <packaging>war</packaging>

calendar-webservice/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>calendar</artifactId>
     <groupId>org.exoplatform.calendar</groupId>
-    <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>calendar-webservice</artifactId>
   <packaging>jar</packaging>

pom.xml

@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.exoplatform.calendar</groupId>
   <artifactId>calendar</artifactId>
-  <version>4.1.x-calendar-generic-user-popup-SNAPSHOT</version>
+  <version>4.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>eXo Calendar</name>
   <description>eXo Calendar application</description>
@@ -52,8 +52,8 @@
     <org.gatein.wci.version>2.3.0.Final</org.gatein.wci.version>
     <org.gatein.portal.version>3.5.7.Final-SNAPSHOT</org.gatein.portal.version>
     <!-- Platform Project Dependencies -->
-    <org.exoplatform.commons.version>4.1.x-commons-generic-user-popup-SNAPSHOT</org.exoplatform.commons.version>
-    <org.exoplatform.social.version>4.1.x-social-generic-user-popup-SNAPSHOT</org.exoplatform.social.version>
+    <org.exoplatform.commons.version>4.1.0-SNAPSHOT</org.exoplatform.commons.version>
+    <org.exoplatform.social.version>4.1.0-SNAPSHOT</org.exoplatform.social.version>
     <org.exoplatform.platform-ui.version>4.1.0-SNAPSHOT</org.exoplatform.platform-ui.version>
     <!-- Platform Project 3rd party Dependencies -->
     <org.exoplatform.doc.doc-style.version>4.1.0-SNAPSHOT</org.exoplatform.doc.doc-style.version>