From 8f09c8bbeadb8aa3046c76f01d56ad672d7323b1 Mon Sep 17 00:00:00 2001
From: sameeram <mgjaye@gmail.com>
Date: Wed, 6 May 2015 17:34:42 +0530
Subject: [PATCH] Migrated product-es to carbon 4.4.0

---
 .../utils/ESServerExtensionForWait.java       |  4 +--
 .../ArtifactUploadClientTestCase.java         |  7 ++++
 pom.xml                                       | 36 +++++++++----------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/es/integration/common/utils/ESServerExtensionForWait.java b/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/es/integration/common/utils/ESServerExtensionForWait.java
index d50aa30e..19834e63 100644
--- a/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/es/integration/common/utils/ESServerExtensionForWait.java
+++ b/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/es/integration/common/utils/ESServerExtensionForWait.java
@@ -25,7 +25,7 @@
 public class ESServerExtensionForWait extends ExecutionListenerExtension {
 
     private static final Log LOG = LogFactory.getLog(ESServerExtensionForWait.class);
-    private static final long WAIT_TIME = 3000;
+    private static final long WAIT_TIME = 10000;
     private static final int MAX_ATTEMPT_COUNT = 10;
 
     /**
@@ -88,4 +88,4 @@ private static void waitTillIndexingCompletes() throws IOException, InterruptedE
             //Waiting before the next check for the registry index completion...
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/integration/tests-integration/tests/src/test/java/org/wso2/es/integration/ArtifactUploadClientTestCase.java b/modules/integration/tests-integration/tests/src/test/java/org/wso2/es/integration/ArtifactUploadClientTestCase.java
index f3259de8..455040eb 100644
--- a/modules/integration/tests-integration/tests/src/test/java/org/wso2/es/integration/ArtifactUploadClientTestCase.java
+++ b/modules/integration/tests-integration/tests/src/test/java/org/wso2/es/integration/ArtifactUploadClientTestCase.java
@@ -84,7 +84,14 @@ public void publisherTest() throws Exception {
 		writer = new StringWriter();
 		IOUtils.copy(errorIn, writer, "utf-8");
 		String errorString = writer.toString();
+		log.info("Result of asset client execution ");
 		log.info(consoleMsg);
+		//If the execution fails we need to know the reason for the failure
+		if(errorString.length() > 0){
+		  log.error("Error in executing asset client: ");
+		  log.error(errorString);
+		}
+		
 		Assert.assertEquals("Assets not uploaded successfully", 0, errorString.length());
 	}
 
diff --git a/pom.xml b/pom.xml
index 20fd8f15..80408967 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,11 +75,11 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven.compilerplugin.version}</version>
-                    <!--<configuration>
+                    <configuration>
                         <encoding>UTF-8</encoding>
                         <source>1.7</source>
                         <target>1.7</target>
-                    </configuration>-->
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>
@@ -600,21 +600,21 @@
         <project.scm.id>github-scm</project.scm.id>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <carbon.kernel.version>4.3.0</carbon.kernel.version>
-        <carbon.social.version>1.2.1</carbon.social.version>
-        <carbon.store.version>2.0.1</carbon.store.version>
+        <carbon.kernel.version>4.4.0</carbon.kernel.version>
+        <carbon.social.version>1.3.0-SNAPSHOT</carbon.social.version>
+        <carbon.store.version>2.1.0-SNAPSHOT</carbon.store.version>
         <product.es.version>2.0.0-SNAPSHOT</product.es.version>
 
         <test.framework.version>4.3.1</test.framework.version>
         <automation.utils.version>4.3.0</automation.utils.version>
 
         <!--repo versions-->
-        <carbon.commons.version>4.3.4</carbon.commons.version>
-        <carbon.registry.version>4.3.0</carbon.registry.version>
-        <carbon.governance.version>4.3.0</carbon.governance.version>
-        <carbon.deployment.version>4.3.1</carbon.deployment.version>
-        <carbon.identity.version>4.3.2</carbon.identity.version>
-        <carbon.multitenancy.version>4.3.4</carbon.multitenancy.version>
+        <carbon.commons.version>4.4.0</carbon.commons.version>
+        <carbon.registry.version>4.4.1</carbon.registry.version>
+        <carbon.governance.version>4.4.0</carbon.governance.version>
+        <carbon.deployment.version>4.4.0</carbon.deployment.version>
+        <carbon.identity.version>4.4.0</carbon.identity.version>
+        <carbon.multitenancy.version>4.4.0</carbon.multitenancy.version>
 
         <operadriver.version>0.8.1</operadriver.version>
         <selenium.version>2.40.0</selenium.version>
@@ -647,17 +647,17 @@
         <el.api.version>2.2</el.api.version>
         <h2.wso2.version>1.2.140.wso2v3</h2.wso2.version>
 
-        <jaggery.feature.version>0.9.0</jaggery.feature.version>
+        <jaggery.feature.version>0.10.1</jaggery.feature.version>
         <caramel.feature.version>1.0.1</caramel.feature.version>
         <handlebars.feature.version>1.0.0</handlebars.feature.version>
         <markdown.feature.version>1.0.0</markdown.feature.version>
-        <carbon.feature.version>1.2.2</carbon.feature.version>
-        <process.feature.version>1.2.2</process.feature.version>
-        <uuid.feature.version>1.2.2</uuid.feature.version>
-        <sso.feature.version>1.2.2</sso.feature.version>
-        <jaggery-test.feature.version>1.2.2</jaggery-test.feature.version>
+        <carbon.feature.version>1.3.0</carbon.feature.version>
+        <process.feature.version>1.3.0</process.feature.version>
+        <uuid.feature.version>1.3.0</uuid.feature.version>
+        <sso.feature.version>1.3.0</sso.feature.version>
+        <jaggery-test.feature.version>1.3.0</jaggery-test.feature.version>
         <slf4j.wso2.version>1.5.10.wso2v1</slf4j.wso2.version>
-        <axis2-transports.wso2.version>1.1.0-wso2v11</axis2-transports.wso2.version>
+        <axis2-transports.wso2.version>1.1.0-wso2v12</axis2-transports.wso2.version>
         <sso.hostobjects.version>1.0.1</sso.hostobjects.version>
         <httpcomponents-httpclient.wso2.version>4.1.1-wso2v1</httpcomponents-httpclient.wso2.version>
         <httpcomponents-httpcore.wso2.version>4.1.0-wso2v1</httpcomponents-httpcore.wso2.version>